Changes to docs, examples and names of ESG files (#717)

Co-authored-by: Lionel Hercot <lhercot@cisco.com>
CiscoDevNet · Nov 9, 2021 · f305774 · f305774
1 parent 12aa6af
commit f305774
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 53 deletions.
diff --git a/aci/data_source_aci_fvepselector.go b/aci/data_source_aci_fvepselector.go
@@ -18,15 +18,9 @@ func dataSourceAciEndpointSecurityGroupSelector() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-			"annotation": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
 			"match_expression": {
 				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
+				Required: true,
 			},
 			"name": {
 				Type:     schema.TypeString,

diff --git a/aci/resource_aci_fvesg.go b/aci/resource_aci_fvesg.go
@@ -32,15 +32,6 @@ func resourceAciEndpointSecurityGroup() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"flood_on_encap": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					"disabled",
-					"enabled",
-				}, false),
-			},
 			"match_t": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -75,21 +66,6 @@ func resourceAciEndpointSecurityGroup() *schema.Resource {
 					"include",
 				}, false),
 			},
-			"prio": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					"level1",
-					"level2",
-					"level3",
-					"level4",
-					"level5",
-					"level6",
-					"unspecified",
-				}, false),
-			},
-
 			"relation_fv_rs_cons": {
 				Type:        schema.TypeSet,
 				Optional:    true,

diff --git a/examples/aci_endpoint_security_group/aci_endpoint_security_group.tf b/examples/aci_endpoint_security_group/aci_endpoint_security_group.tf
@@ -7,12 +7,12 @@ resource "aci_application_profile" "terraform_ap" {
 resource "aci_endpoint_security_group" "terraform_esg" {
   application_profile_dn      = aci_application_profile.terraform_ap.id
   name                        = "tf_esg"
+  relation_fv_rs_scope        = aci_vrf.vrf.id
   relation_fv_rs_prov         = [aci_contract.rs_prov_contract.id]
   relation_fv_rs_cons         = [aci_contract.rs_cons_contract.id]
   relation_fv_rs_intra_epg    = [aci_contract.intra_epg_contract.id]
   relation_fv_rs_cons_if      = [aci_contract.exported_contract.id]
   relation_fv_rs_cust_qos_pol = aci_rest.rest_qos_custom_pol.id
-  relation_fv_rs_scope        = aci_vrf.vrf.id
   relation_fv_rs_prot_by      = [aci_rest.rest_taboo_con.id]
 }
 
@@ -21,11 +21,9 @@ resource "aci_endpoint_security_group" "terraform_inherit_esg" {
   application_profile_dn       = aci_application_profile.terraform_ap.id
   name                         = "tf_inherit_esg"
   description                  = "create relation sec_inherited"
-  flood_on_encap               = "disabled"
   match_t                      = "None"
   pc_enf_pref                  = "unenforced"
   pref_gr_memb                 = "exclude"
-  prio                         = "unspecified"
   relation_fv_rs_sec_inherited = [aci_endpoint_security_group.terraform_esg.id]
 }
 

diff --git a/website/aci.erb b/website/aci.erb
@@ -154,14 +154,14 @@
                       <li<%= sidebar_current("docs-aci-data-source-end_point_retention_policy") %>>
                         <a href="/docs/providers/aci/d/end_point_retention_policy.html">aci_end_point_retention_policy</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-data-source-end_point_security_group") %>>
-                        <a href="/docs/providers/aci/d/end_point_security_group.html">aci_end_point_security_group</a>
+                      <li<%= sidebar_current("docs-aci-data-source-endpoint_security_group") %>>
+                        <a href="/docs/providers/aci/d/endpoint_security_group.html">aci_endpoint_security_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-endpoint_security_group_epg_selector") %>>
                         <a href="/docs/providers/aci/d/endpoint_security_group_epg_selector.html">aci_endpoint_security_group_epg_selector</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-data-source-end_point_security_group_selector") %>>
-                        <a href="/docs/providers/aci/d/end_point_security_group_selector.html">aci_end_point_security_group_selector</a>
+                      <li<%= sidebar_current("docs-aci-data-source-endpoint_security_group_selector") %>>
+                        <a href="/docs/providers/aci/d/endpoint_security_group_selector.html">aci_endpoint_security_group_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-data-source-epg_to_contract") %>>
                         <a href="/docs/providers/aci/d/epg_to_contract.html">aci_epg_to_contract</a>
@@ -596,14 +596,14 @@
                       <li<%= sidebar_current("docs-aci-resource-end_point_retention_policy") %>>
                         <a href="/docs/providers/aci/r/end_point_retention_policy.html">aci_end_point_retention_policy</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-resource-end_point_security_group") %>>
-                        <a href="/docs/providers/aci/r/end_point_security_group.html">aci_end_point_security_group</a>
+                      <li<%= sidebar_current("docs-aci-resource-endpoint_security_group") %>>
+                        <a href="/docs/providers/aci/r/endpoint_security_group.html">aci_endpoint_security_group</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-endpoint_security_group_epg_selector") %>>
                         <a href="/docs/providers/aci/r/endpoint_security_group_epg_selector.html">aci_endpoint_security_group_epg_selector</a>
                       </li>
-                      <li<%= sidebar_current("docs-aci-resource-end_point_security_group_selector") %>>
-                        <a href="/docs/providers/aci/r/end_point_security_group_selector.html">aci_end_point_security_group_selector</a>
+                      <li<%= sidebar_current("docs-aci-resource-endpoint_security_group_selector") %>>
+                        <a href="/docs/providers/aci/r/endpoint_security_group_selector.html">aci_endpoint_security_group_selector</a>
                       </li>
                       <li<%= sidebar_current("docs-aci-resource-epg_to_contract") %>>
                         <a href="/docs/providers/aci/r/epg_to_contract.html">aci_epg_to_contract</a>

diff --git a/.../d/end_point_security_group.html.markdown → ...s/d/endpoint_security_group.html.markdown b/.../d/end_point_security_group.html.markdown → ...s/d/endpoint_security_group.html.markdown
diff --git a/...int_security_group_selector.html.markdown → ...int_security_group_selector.html.markdown b/...int_security_group_selector.html.markdown → ...int_security_group_selector.html.markdown
@@ -31,13 +31,12 @@ data "aci_endpoint_security_group_selector" "example" {
 ## Argument Reference ##
 
 * `endpoint_security_group_dn` - (Required) Distinguished name of parent Endpoint Security Group object.
-* `match_expression` - (Optional) Expression used to define matching tags.
+* `match_expression` - (Required) Expression used to define matching tags.
 
 ## Attribute Reference ##
 
 * `id` - Attribute id set to the Dn of the Endpoint Security Group Selector.
-* `name` - (Optional) Name of object Endpoint Security Group Selector.
 * `annotation` - (Optional) Annotation of object Endpoint Security Group Selector.
 * `description` - (Optional) Description of object Endpoint Security Group Selector.
+* `name` - (Optional) Name of object Endpoint Security Group Selector.
 * `name_alias` - (Optional) Name Alias of object Endpoint Security Group Selector.
-* `match_expression` - (Optional) Expression used to define matching tagTags.
diff --git a/.../r/end_point_security_group.html.markdown → ...s/r/endpoint_security_group.html.markdown b/.../r/end_point_security_group.html.markdown → ...s/r/endpoint_security_group.html.markdown
@@ -28,11 +28,11 @@ resource "aci_endpoint_security_group" "example" {
   description = "from terraform"
   annotation = "orchestrator:terraform"
   name_alias = "example"
-  flood_on_encap = "disabled"
   match_t = "AtleastOne"
   pc_enf_pref = "unenforced"
   pref_gr_memb = "exclude"
-  prio = "unspecified"
+
+  relation_fv_rs_scope = aci_vrf.example.id
 
   relation_fv_rs_cons {
     prio = "unspecified"
@@ -54,8 +54,6 @@ resource "aci_endpoint_security_group" "example" {
     target_dn = aci_contract.example.id
   }
 
-  relation_fv_rs_scope = aci_vrf.example.id
-
   relation_fv_rs_sec_inherited = [aci_application_epg.example.id]
 }
 ```
@@ -67,13 +65,13 @@ resource "aci_endpoint_security_group" "example" {
 - `annotation` - (Optional) Annotation of object Endpoint Security Group.
 - `description` - (Optional) Description of object Endpoint Security Group.
 - `name_alias` - (Optional) Name alias of object Endpoint Security Group.
-- `flood_on_encap` - (Optional) Handles L2 Multicast/Broadcast and Link-Layer traffic at EPG level. It represents Control at EPG level and decides if the traffic L2 Multicast/Broadcast and Link Local Layer should be flooded only on ENCAP, or based on bridge-domain settings. Allowed values are "disabled", "enabled", and default value is "disabled". Type: String.
 - `match_t` - (Optional) Provider Label Match Criteria. Allowed values are "All", "AtleastOne", "AtmostOne", "None", and default value is "AtleastOne". Type: String.
 - `pc_enf_pref` - (Optional) The preferred policy control enforcement. Allowed values are "enforced", "unenforced", and default value is "unenforced". Type: String.
 - `pref_gr_memb` - (Optional) Preferred Group Member parameter is used to determine
   if EPg is part of a group that allows
   a contract for communication. Allowed values are "exclude", "include", and default value is "exclude". Type: String.
-- `prio` - (Optional) QoS priority class identifier. Allowed values are "level1", "level2", "level3", "level4", "level5", "level6", "unspecified", and default value is "unspecified". Type: String.
+
+- `relation_fv_rs_scope` - (Required) Represents the relation to a VRF (class fvCtx). Type: String.
 
 - `relation_fv_rs_cons` - (Optional) A block representing the relation to a Contract Consumer (class vzBrCP). The Consumer contract profile information. Type: Block.
 
@@ -95,8 +93,6 @@ resource "aci_endpoint_security_group" "example" {
   - `prio` - (Optional) The system class determines the quality of service and priority for the consumer traffic. Allowed values are "level1", "level2", "level3", "level4", "level5", "level6", "unspecified", and default value is "unspecified". Type: String.
   - `target_dn` - (Required) The distinguished name of the target contract. Type: String.
 
-- `relation_fv_rs_scope` - (Optional) Represents the relation to a Private Network (class fvCtx). Type: String.
-
 - `relation_fv_rs_sec_inherited` - (Optional) Represents the relation to a Security inheritance (class fvEPg). It represents that the EPg is inheriting security configuration from another EPg. Type: List.
 
 ## Importing

diff --git a/...int_security_group_selector.html.markdown → ...int_security_group_selector.html.markdown b/...int_security_group_selector.html.markdown → ...int_security_group_selector.html.markdown