Skip to content

Commit a4b71e9

Browse files
anvitha-jainlhercot
authored andcommitted
Made changes based on PR comments
1 parent 99e7396 commit a4b71e9

File tree

6 files changed

+40
-46
lines changed

6 files changed

+40
-46
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ If you want to work on the provider, you'll first need [Go](http://www.golang.or
9090

9191
To compile the provider, run `make build`. This will build the provider with sanity checks present in scripts directory and put the provider binary in `$GOPATH/bin` directory.
9292

93-
<strong>Important: </strong>To successfully use the provider you need to use the below configuration just before setting up the provider with your cisco aci credentials.
93+
<strong>Important: </strong>To successfully use the provider you need to have the below configuration in your Terraform plan.
9494

9595
```hcl
9696
terraform {

examples/epg/contract.tf

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,37 @@ resource "aci_tenant" "tenant_for_contract" {
33
description = "This tenant is created by terraform ACI provider"
44
}
55

6+
resource "aci_l4_l7_service_graph_template" "rest_abs_graph" {
7+
tenant_dn = aci_tenant.tenant_for_contract.id
8+
name = "testgraph"
9+
}
10+
611
resource "aci_contract" "rs_prov_contract" {
712
tenant_dn = aci_tenant.tenant_for_contract.id
813
name = "rs_prov_contract"
914
description = "This contract is created by terraform ACI provider"
1015
scope = "context"
1116
target_dscp = "VA"
1217
prio = "unspecified"
13-
relation_vz_rs_graph_att = aci_rest.rest_abs_graph.id # Relation to vnsAbsGraph class. Cardinality - N_TO_ONE
18+
relation_vz_rs_graph_att = aci_l4_l7_service_graph_template.rest_abs_graph.id
1419
}
20+
1521
resource "aci_contract" "rs_cons_contract" {
1622
tenant_dn = aci_tenant.tenant_for_contract.id
1723
name = "rs_cons_contract"
1824
description = "This contract is created by terraform ACI provider"
1925
scope = "context"
2026
target_dscp = "VA"
2127
prio = "unspecified"
22-
relation_vz_rs_graph_att = aci_rest.rest_abs_graph.id # Relation to vnsAbsGraph class. Cardinality - N_TO_ONE
28+
relation_vz_rs_graph_att = aci_l4_l7_service_graph_template.rest_abs_graph.id
2329
}
30+
2431
resource "aci_contract" "intra_epg_contract" {
2532
tenant_dn = aci_tenant.tenant_for_contract.id
2633
name = "intra_epg_contract"
2734
description = "This contract is created by terraform ACI provider"
2835
scope = "context"
2936
target_dscp = "VA"
3037
prio = "unspecified"
31-
relation_vz_rs_graph_att = aci_rest.rest_abs_graph.id # Relation to vnsAbsGraph class. Cardinality - N_TO_ONE
38+
relation_vz_rs_graph_att = aci_l4_l7_service_graph_template.rest_abs_graph.id
3239
}

examples/epg/epg.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@ resource "aci_application_epg" "demoepg" {
2929
prio = "unspecified"
3030
relation_fv_rs_bd = aci_bridge_domain.bd_for_rel.id # Relation to fvBD class. Cardinality - N_TO_ONE.
3131
relation_fv_rs_cust_qos_pol = aci_rest.rest_qos_custom_pol.id # Relation to qosCustomPol class. Cardinality - N_TO_ONE.
32-
// relation_fv_rs_fc_path_att = ["testfabric"] # Relation to fabricPathEp class. Cardinality - N_TO_M.
33-
3432
relation_fv_rs_prov = [aci_contract.rs_prov_contract.id] # Relation to vzBrCP class. Cardinality - N_TO_M.
35-
3633
relation_fv_rs_cons_if = [aci_rest.rest_vz_cons_if.id] # Relation to vzCPIf class. Cardinality - N_TO_M.
3734
relation_fv_rs_sec_inherited = [aci_application_epg.inherit_epg.id] # Relation to fvEPg class. Cardinality - N_TO_M.
38-
// relation_fv_rs_node_att = ["testnodeatt"] # Relation to fabricNode class. Cardinality - N_TO_M.
3935
relation_fv_rs_dpp_pol = aci_rest.rest_qos_dpp_pol.id # Relation to qosDppPol class. Cardinality - N_TO_ONE.ye
4036
relation_fv_rs_cons = [aci_contract.rs_cons_contract.id] # Relation to vzBrCP class. Cardinality - N_TO_M.
4137
relation_fv_rs_trust_ctrl = aci_rest.rest_trust_ctrl_pol.id # Relation to fhsTrustCtrlPol class. Cardinality - N_TO_ONE.

examples/epg/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ terraform {
77
}
88

99
provider "aci" {
10-
username = ""
11-
password = ""
12-
url = ""
10+
username = "" # <APIC username>
11+
password = "" # <APIC pwd>
12+
url = "" # <cloud APIC URL>
1313
insecure = true
1414
}
1515

examples/epg/rest.tf

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,3 @@ resource "aci_rest" "rest_taboo_con" {
5656
"name" = "testcon"
5757
}
5858
}
59-
60-
resource "aci_rest" "rest_abs_graph" {
61-
path = "api/node/mo/${aci_tenant.tenant_for_contract.id}/AbsGraph-testgraph.json"
62-
class_name = "vnsAbsGraph"
63-
64-
content = {
65-
"name" = "testgraph"
66-
}
67-
}

website/docs/r/application_epg.html.markdown

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,37 +46,37 @@ Manages ACI Application EPG
4646
* `prio` - (Optional) qos priority class id. Allowed values are "unspecified", "level1", "level2", "level3", "level4", "level5" and "level6". Default is "unspecified.
4747
* `shutdown` - (Optional) shutdown for object application_epg. Allowed values are "yes" and "no". Default is "no".
4848

49-
* `relation_fv_rs_bd` - (Required) Relation to Bridge domain associated with EPG (class fvBD). Cardinality - N_TO_ONE. Type - String.
50-
51-
* `relation_fv_rs_cust_qos_pol` - (Optional) Relation to custom Quality of Service traffic policy name (class qosCustomPol). Cardinality - N_TO_ONE. Type - String.
49+
* `relation_fv_rs_bd` - (Required) Relation to Bridge domain associated with EPG (Point to class fvBD). Cardinality - N_TO_ONE. Type - String.
50+
51+
* `relation_fv_rs_cust_qos_pol` - (Optional) Relation to custom Quality of Service traffic policy name (Point to class qosCustomPol). Cardinality - N_TO_ONE. Type - String.
5252
<!-- tenant -> policies -> protocol -> Custom QoS -->
53-
54-
* `relation_fv_rs_fc_path_att` - (Optional) Relation to deploy Fibre Channel(paths) (class fabricPathEp). Cardinality - N_TO_M. Type - Set of String.
55-
56-
* `relation_fv_rs_prov` - (Optional) Relation to Provided Contract(class vzBrCP). Cardinality - N_TO_M. Type - Set of String.
57-
58-
* `relation_fv_rs_cons_if` - (Optional) Relation to imported contract (class vzCPIf). Cardinality - N_TO_M. Type - Set of String.
59-
60-
* `relation_fv_rs_sec_inherited` - (Optional) Relation represents that the EPg is inheriting security configuration from another EPg (class fvEPg). Cardinality - N_TO_M. Type - Set of String.
61-
62-
* `relation_fv_rs_node_att` - (Optional) Relation between EPG and fabricNode (class fabricNode). Cardinality - N_TO_M. Type - Set of String.
53+
54+
* `relation_fv_rs_fc_path_att` - (Optional) Relation to Fibre Channel (Paths)(Point to class fabricPathEp). Cardinality - N_TO_M. Type - Set of String.
55+
56+
* `relation_fv_rs_prov` - (Optional) Relation to Provided Contract (Point to class vzBrCP). Cardinality - N_TO_M. Type - Set of String.
57+
58+
* `relation_fv_rs_cons_if` - (Optional) Relation to Imported Contract (Point to class vzCPIf). Cardinality - N_TO_M. Type - Set of String.
59+
60+
* `relation_fv_rs_sec_inherited` - (Optional) Relation represents that the EPG is inheriting security configuration from another EPG (Point to class fvEPg). Cardinality - N_TO_M. Type - Set of String.
61+
62+
* `relation_fv_rs_node_att` - (Optional) Relation used to define a Static Leaf binding (Point to class fabricNode). Cardinality - N_TO_M. Type - Set of String.
6363
<!-- tenant -> Application Profile -> EPG ->Static Leaf -->
64-
65-
* `relation_fv_rs_dpp_pol` - (Optional) Relation to define a Data Plane Policing policy (class qosDppPol). Cardinality - N_TO_ONE. Type - String.
64+
65+
* `relation_fv_rs_dpp_pol` - (Optional) Relation to define a Data Plane Policing policy (Point to class qosDppPol). Cardinality - N_TO_ONE. Type - String.
6666
<!-- tenant -> policies -> protocol -> Data Plane Policing -->
67-
68-
* `relation_fv_rs_cons` - (Optional) Relation to Consumed Contract (class vzBrCP). Cardinality - N_TO_M. Type - Set of String.
69-
70-
* `relation_fv_rs_trust_ctrl` - (Optional) Relation to First Hop Security trust control (class fhsTrustCtrlPol). Cardinality - N_TO_ONE. Type - String.
67+
68+
* `relation_fv_rs_cons` - (Optional) Relation to Consumed Contract (Point to class vzBrCP). Cardinality - N_TO_M. Type - Set of String.
69+
70+
* `relation_fv_rs_trust_ctrl` - (Optional) Relation to First Hop Security trust control (Point to class fhsTrustCtrlPol). Cardinality - N_TO_ONE. Type - String.
7171
<!-- tenant -> policies -> protocol -> First Hop Security -->
72-
73-
* `relation_fv_rs_prot_by` - (Optional) Relation to Taboo Contract (class vzTaboo). Cardinality - N_TO_M. Type - Set of String.
74-
75-
* `relation_fv_rs_aepg_mon_pol` - (Optional) Relation to create a container for monitoring policies associated with the tenant. This allows you to apply tenant-specific policies (class monEPGPol). Cardinality - N_TO_ONE. Type - String.
72+
73+
* `relation_fv_rs_prot_by` - (Optional) Relation to Taboo Contract (Point to class vzTaboo). Cardinality - N_TO_M. Type - Set of String.
74+
75+
* `relation_fv_rs_aepg_mon_pol` - (Optional) Relation to create a container for monitoring policies associated with the tenant. This allows you to apply tenant-specific policies (Point to class monEPGPol). Cardinality - N_TO_ONE. Type - String.
7676
<!-- tenant -> policies -> Monitoring -->
77-
78-
* `relation_fv_rs_intra_epg` - (Optional) Relation to Intra EPG Contract (class vzBrCP). Cardinality - N_TO_M. Type - Set of String.
79-
77+
78+
* `relation_fv_rs_intra_epg` - (Optional) Relation to Intra EPG Contract (Point to class vzBrCP). Cardinality - N_TO_M. Type - Set of String.
79+
8080

8181

8282
## Attribute Reference

0 commit comments

Comments
 (0)