Resolving GitHub issues: #359, #370 (PR #434)

Author: AshuSoni-crest

aci/resource_aci_bgppeerp.go

@@ -306,7 +306,6 @@ func resourceAciBgpPeerConnectivityProfileCreate(d *schema.ResourceData, m inter
 	if err != nil {
 		return err
 	}
-
 	PeerConnectivityProfileDn := bgpPeerP.DistinguishedName
 	bgpLocalAsnPAttr := models.LocalAutonomousSystemProfileAttributes{}
 

aci/resource_aci_infranodep.go

@@ -3,6 +3,8 @@ package aci
 import (
 	"fmt"
 	"log"
+	"reflect"
+	"sort"
 	"strings"
 
 	"github.com/ciscoecosystem/aci-go-client/client"
@@ -628,7 +630,15 @@ func resourceAciLeafProfileRead(d *schema.ResourceData, m interface{}) error {
 		d.Set("relation_infra_rs_acc_card_p", make([]string, 0, 1))
 
 	} else {
-		d.Set("relation_infra_rs_acc_card_p", infraRsAccCardPData)
+		if _, ok := d.GetOk("relation_infra_rs_acc_card_p"); ok {
+			relationParamList := toStringList(d.Get("relation_infra_rs_acc_card_p").(*schema.Set).List())
+			infraRsAccCardPDataList := toStringList(infraRsAccCardPData.(*schema.Set).List())
+			sort.Strings(relationParamList)
+			sort.Strings(infraRsAccCardPDataList)
+			if !reflect.DeepEqual(relationParamList, infraRsAccCardPDataList) {
+				d.Set("relation_infra_rs_acc_card_p", make([]string, 0, 1))
+			}
+		}
 	}
 
 	infraRsAccPortPData, err := aciClient.ReadRelationinfraRsAccPortPFromLeafProfile(dn)
@@ -637,7 +647,15 @@ func resourceAciLeafProfileRead(d *schema.ResourceData, m interface{}) error {
 		d.Set("relation_infra_rs_acc_port_p", make([]string, 0, 1))
 
 	} else {
-		d.Set("relation_infra_rs_acc_port_p", infraRsAccPortPData)
+		if _, ok := d.GetOk("relation_infra_rs_acc_port_p"); ok {
+			relationParamList := toStringList(d.Get("relation_infra_rs_acc_port_p").(*schema.Set).List())
+			infraRsAccPortPDataList := toStringList(infraRsAccPortPData.(*schema.Set).List())
+			sort.Strings(relationParamList)
+			sort.Strings(infraRsAccPortPDataList)
+			if !reflect.DeepEqual(relationParamList, infraRsAccPortPDataList) {
+				d.Set("relation_infra_rs_acc_port_p", make([]string, 0, 1))
+			}
+		}
 	}
 
 	log.Printf("[DEBUG] %s: Read finished successfully", d.Id())

aci/resource_aci_infraspines.go

@@ -282,7 +282,12 @@ func resourceAciSwitchSpineAssociationRead(d *schema.ResourceData, m interface{}
 		d.Set("relation_infra_rs_spine_acc_node_p_grp", "")
 
 	} else {
-		d.Set("relation_infra_rs_spine_acc_node_p_grp", infraRsSpineAccNodePGrpData)
+		if _, ok := d.GetOk("relation_infra_rs_spine_acc_node_p_grp"); ok {
+			tfName := d.Get("relation_infra_rs_spine_acc_node_p_grp").(string)
+			if tfName != infraRsSpineAccNodePGrpData {
+				d.Set("relation_infra_rs_spine_acc_node_p_grp", "")
+			}
+		}
 	}
 
 	log.Printf("[DEBUG] %s: Read finished successfully", d.Id())

aci/resource_aci_l3extrspathl3outatt.go

@@ -117,9 +117,6 @@ func resourceAciL3outPathAttachment() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					"inherit",
-				}, false),
 			},
 
 			"target_dscp": &schema.Schema{

go.mod

@@ -3,7 +3,7 @@ module github.com/terraform-providers/terraform-provider-aci
 go 1.12
 
 require (
-	github.com/ciscoecosystem/aci-go-client v1.11.0
+	github.com/ciscoecosystem/aci-go-client v1.11.2
 	github.com/ghodss/yaml v1.0.0
 	github.com/hashicorp/terraform v0.12.5
 	github.com/hashicorp/terraform-plugin-sdk v1.14.0

go.sum

@@ -72,6 +72,8 @@ github.com/chzyer/readline v0.0.0-20161106042343-c914be64f07d/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/ciscoecosystem/aci-go-client v1.11.0 h1:q3Uif50ZVLPLg2c9i0DV7b4xc3+9npenlzMKCm5es0g=
 github.com/ciscoecosystem/aci-go-client v1.11.0/go.mod h1:fhY7vWysK655g3Yp5Fz4Zje/JN4+moRe8RjwiRy0amQ=
+github.com/ciscoecosystem/aci-go-client v1.11.2 h1:niqmOIinZ70vxU4jFgURkk12afNot7sOq0Vn3FnWVCM=
+github.com/ciscoecosystem/aci-go-client v1.11.2/go.mod h1:fhY7vWysK655g3Yp5Fz4Zje/JN4+moRe8RjwiRy0amQ=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.0/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=

vendor/github.com/ciscoecosystem/aci-go-client/client/infraSpineS_service.go

@@ -58,7 +58,7 @@ github.com/bgentry/go-netrc/netrc
 github.com/bgentry/speakeasy
 # github.com/blang/semver v3.5.1+incompatible
 github.com/blang/semver
-# github.com/ciscoecosystem/aci-go-client v1.11.0
+# github.com/ciscoecosystem/aci-go-client v1.11.2
 github.com/ciscoecosystem/aci-go-client/client
 github.com/ciscoecosystem/aci-go-client/container
 github.com/ciscoecosystem/aci-go-client/models

vendor/modules.txt

@@ -59,7 +59,7 @@ resource "aci_l3out_path_attachment" "example" {
 - `mode` - (Optional) BGP Domain mode.  
   Allowed values: "native", "regular", "untagged". Default value: "regular".
 - `mtu` - (Optional) The maximum transmit unit of the external network.
-  Allowed value: "inherit".
+  Default value: "inherit".
 
 - `target_dscp` - (Optional) The target differentiated service code point (DSCP) of the path attached to the layer 3 outside profile. Default value: "unspecified".
   Allowed values: "AF11", "AF12", "AF13", "AF21", "AF22", "AF23", "AF31", "AF32", "AF33", "AF41", "AF42", "AF43", "CS0", "CS1", "CS2", "CS3", "CS4", "CS5", "CS6", "CS7", "EF", "VA", "unspecified". Default value: "unspecified".