[bugfix] Fix aci_bulk_epg_to_static_path idempotency and default valu…

…es when optional attributes not provided.
CiscoDevNet · Aug 3, 2022 · 32d9622 · 32d9622
1 parent 6da8f21
commit 32d9622
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/aci/resource_aci_fvrsbulkpathatt.go b/aci/resource_aci_fvrsbulkpathatt.go
@@ -50,30 +50,31 @@ func resourceAciBulkStaticPath() *schema.Resource {
 						"description": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
+							Default:  "",
 						},
 						"deployment_immediacy": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: true,
 							ValidateFunc: validation.StringInSlice([]string{
 								"immediate",
 								"lazy",
 							}, false),
+							Default: "lazy",
 						},
 						"mode": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: true,
 							ValidateFunc: validation.StringInSlice([]string{
 								"regular",
 								"native",
 								"untagged",
 							}, false),
+							Default: "regular",
 						},
 						"primary_encap": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
-							Computed: true,
+							Default:  "unknown",
 						},
 					},
 				},
@@ -232,10 +233,14 @@ func staticPathPayload(staticPathList []interface{}, status string) []interface{
 			staticPathContent["descr"] = descr
 		}
 		if immediacy, ok := staticPath["deployment_immediacy"]; ok {
-			staticPathContent["instrImedcy"] = immediacy
+			if immediacy != "" {
+				staticPathContent["instrImedcy"] = immediacy
+			}
 		}
 		if mode, ok := staticPath["mode"]; ok {
-			staticPathContent["mode"] = mode
+			if mode != "" {
+				staticPathContent["mode"] = mode
+			}
 		}
 		if primaryEncap, ok := staticPath["primary_encap"]; ok {
 			staticPathContent["primaryEncap"] = primaryEncap

diff --git a/examples/aci_bulk_epg_to_static_path/main.tf b/examples/aci_bulk_epg_to_static_path/main.tf
@@ -33,18 +33,13 @@ resource "aci_bulk_epg_to_static_path" "example" {
   static_path {
     interface_dn         = "topology/pod-1/paths-129/pathep-[eth1/5]"
     encap                = "vlan-1000"
-    description          = "this is desc for bulk static path"
-    deployment_immediacy = "lazy"
-    mode                 = "untagged"
-    primary_encap        = "vlan-700"
   }
   static_path {
     interface_dn         = "topology/pod-1/paths-129/pathep-[eth1/6]"
     encap                = "vlan-1001"
     description          = "this is updated desc for another bulk static path"
     deployment_immediacy = "immediate"
     mode                 = "regular"
-    primary_encap        = "vlan-800"
   }
   static_path {
     interface_dn         = "topology/pod-1/paths-129/pathep-[eth1/7]"
@@ -60,6 +55,5 @@ resource "aci_bulk_epg_to_static_path" "example" {
     description          = "this is desc for fourth bulk static path"
     deployment_immediacy = "lazy"
     mode                 = "native"
-    primary_encap        = "vlan-100"
   }
 }
diff --git a/website/docs/r/bulk_epg_to_static_path.html.markdown b/website/docs/r/bulk_epg_to_static_path.html.markdown
@@ -60,7 +60,7 @@ resource "aci_bulk_epg_to_static_path" "example" {
   * `encap` - (Required) Encapsulation to use for the Static Path (for example: vlan-100). Type: String.
   * `deployment_immediacy` - (Optional) Deployment immediacy of the Static Path. Allowed values: "immediate", "lazy". Default value: "lazy". Type: String.
   * `mode` - (Optional) Mode of the static association of the interface. Allowed values: "regular", "native", "untagged". Default value: "regular". Type: String.
-  * `primary_encap` - (Optional) Primary encapsulation for the Static Path object (used for micro-segmentation). Type: String.
+  * `primary_encap` - (Optional) Primary encapsulation for the Static Path object (used for micro-segmentation). Allowed values: "vlan-xxx" or "unknown". Default value: "unknown". Type: String.
 
 ## Attribute Reference