#504 added inline block for dhcpRsProv with addr attribute inside aci_dhcp_relay_policy

Author: AshuSoni-crest

aci/resource_aci_dhcprelayp.go

@@ -3,8 +3,6 @@ package aci
 import (
 	"fmt"
 	"log"
-	"reflect"
-	"sort"
 
 	"github.com/ciscoecosystem/aci-go-client/client"
 	"github.com/ciscoecosystem/aci-go-client/models"
@@ -72,9 +70,19 @@ func resourceAciDHCPRelayPolicy() *schema.Resource {
 
 			"relation_dhcp_rs_prov": &schema.Schema{
 				Type:     schema.TypeSet,
-				Elem:     &schema.Schema{Type: schema.TypeString},
 				Optional: true,
-				Set:      schema.HashString,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"tdn": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+						"addr": {
+							Type:     schema.TypeString,
+							Required: true,
+						},
+					},
+				},
 			},
 		}),
 	}
@@ -171,9 +179,10 @@ func resourceAciDHCPRelayPolicyCreate(d *schema.ResourceData, m interface{}) err
 	checkDns := make([]string, 0, 1)
 
 	if relationTodhcpRsProv, ok := d.GetOk("relation_dhcp_rs_prov"); ok {
-		relationParamList := toStringList(relationTodhcpRsProv.(*schema.Set).List())
+		relationParamList := relationTodhcpRsProv.(*schema.Set).List()
 		for _, relationParam := range relationParamList {
-			checkDns = append(checkDns, relationParam)
+			paramMap := relationParam.(map[string]interface{})
+			checkDns = append(checkDns, paramMap["tdn"].(string))
 		}
 	}
 
@@ -185,9 +194,10 @@ func resourceAciDHCPRelayPolicyCreate(d *schema.ResourceData, m interface{}) err
 	d.Partial(false)
 
 	if relationTodhcpRsProv, ok := d.GetOk("relation_dhcp_rs_prov"); ok {
-		relationParamList := toStringList(relationTodhcpRsProv.(*schema.Set).List())
+		relationParamList := relationTodhcpRsProv.(*schema.Set).List()
 		for _, relationParam := range relationParamList {
-			err = aciClient.CreateRelationdhcpRsProvFromDHCPRelayPolicy(dhcpRelayP.DistinguishedName, relationParam)
+			paramMap := relationParam.(map[string]interface{})
+			err = aciClient.CreateRelationdhcpRsProvFromDHCPRelayPolicy(dhcpRelayP.DistinguishedName, paramMap["tdn"].(string), paramMap["addr"].(string))
 
 			if err != nil {
 				return err
@@ -247,13 +257,11 @@ func resourceAciDHCPRelayPolicyUpdate(d *schema.ResourceData, m interface{}) err
 	checkDns := make([]string, 0, 1)
 
 	if d.HasChange("relation_dhcp_rs_prov") {
-		oldRel, newRel := d.GetChange("relation_dhcp_rs_prov")
-		oldRelSet := oldRel.(*schema.Set)
-		newRelSet := newRel.(*schema.Set)
-		relToCreate := toStringList(newRelSet.Difference(oldRelSet).List())
-
-		for _, relDn := range relToCreate {
-			checkDns = append(checkDns, relDn)
+		newRel := d.Get("relation_dhcp_rs_prov")
+		newRelList := newRel.(*schema.Set).List()
+		for _, relationParam := range newRelList {
+			paramMap := relationParam.(map[string]interface{})
+			checkDns = append(checkDns, paramMap["tdn"].(string))
 		}
 	}
 
@@ -266,21 +274,21 @@ func resourceAciDHCPRelayPolicyUpdate(d *schema.ResourceData, m interface{}) err
 
 	if d.HasChange("relation_dhcp_rs_prov") {
 		oldRel, newRel := d.GetChange("relation_dhcp_rs_prov")
-		oldRelSet := oldRel.(*schema.Set)
-		newRelSet := newRel.(*schema.Set)
-		relToDelete := toStringList(oldRelSet.Difference(newRelSet).List())
-		relToCreate := toStringList(newRelSet.Difference(oldRelSet).List())
+		oldRelList := oldRel.(*schema.Set).List()
+		newRelList := newRel.(*schema.Set).List()
 
-		for _, relDn := range relToDelete {
-			err = aciClient.DeleteRelationdhcpRsProvFromDHCPRelayPolicy(dhcpRelayP.DistinguishedName, relDn)
+		for _, relationParam := range oldRelList {
+			paramMap := relationParam.(map[string]interface{})
+			err = aciClient.DeleteRelationdhcpRsProvFromDHCPRelayPolicy(dhcpRelayP.DistinguishedName, paramMap["tdn"].(string))
 			if err != nil {
 				return err
 			}
 
 		}
 
-		for _, relDn := range relToCreate {
-			err = aciClient.CreateRelationdhcpRsProvFromDHCPRelayPolicy(dhcpRelayP.DistinguishedName, relDn)
+		for _, relationParam := range newRelList {
+			paramMap := relationParam.(map[string]interface{})
+			err = aciClient.CreateRelationdhcpRsProvFromDHCPRelayPolicy(dhcpRelayP.DistinguishedName, paramMap["tdn"].(string), paramMap["addr"].(string))
 			if err != nil {
 				return err
 			}
@@ -317,18 +325,18 @@ func resourceAciDHCPRelayPolicyRead(d *schema.ResourceData, m interface{}) error
 
 	if err != nil {
 		log.Printf("[DEBUG] Error while reading relation dhcpRsProv %v", err)
-		d.Set("relation_dhcp_rs_prov", make([]string, 0, 1))
+		d.Set("relation_dhcp_rs_prov", make([]map[string]string, 0))
 
 	} else {
-		if _, ok := d.GetOk("relation_dhcp_rs_prov"); ok {
-			relationParamList := toStringList(d.Get("relation_dhcp_rs_prov").(*schema.Set).List())
-			dhcpRsProvDataList := toStringList(dhcpRsProvData.(*schema.Set).List())
-			sort.Strings(relationParamList)
-			sort.Strings(dhcpRsProvDataList)
-			if !reflect.DeepEqual(relationParamList, dhcpRsProvDataList) {
-				d.Set("relation_dhcp_rs_prov", make([]string, 0, 1))
-			}
+		dhcpRsProvMap := dhcpRsProvData.([]map[string]string)
+		st := make([]map[string]string, 0)
+		for _, dhcpRsProvObj := range dhcpRsProvMap {
+			obj := make(map[string]string, 0)
+			obj["addr"] = dhcpRsProvObj["addr"]
+			obj["tdn"] = dhcpRsProvObj["tDn"]
+			st = append(st, obj)
 		}
+		d.Set("relation_dhcp_rs_prov", st)
 	}
 
 	log.Printf("[DEBUG] %s: Read finished successfully", d.Id())

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.3
+	github.com/ciscoecosystem/aci-go-client v1.11.5
 	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

@@ -70,8 +70,8 @@ github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXH
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20161106042343-c914be64f07d/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/ciscoecosystem/aci-go-client v1.11.3 h1:fYbmBY35dHz3i12R6ZRaSX1mLW5PuOBpEbPdSMWxH18=
-github.com/ciscoecosystem/aci-go-client v1.11.3/go.mod h1:fhY7vWysK655g3Yp5Fz4Zje/JN4+moRe8RjwiRy0amQ=
+github.com/ciscoecosystem/aci-go-client v1.11.5 h1:QCyNbXpdAl3uDCWu+JNOaQQxd3ZGgJZvV0gbvW5Yy4U=
+github.com/ciscoecosystem/aci-go-client v1.11.5/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/dhcpRelayP_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.3
+# github.com/ciscoecosystem/aci-go-client v1.11.5
 github.com/ciscoecosystem/aci-go-client/client
 github.com/ciscoecosystem/aci-go-client/container
 github.com/ciscoecosystem/aci-go-client/models

vendor/modules.txt

@@ -5,46 +5,51 @@ sidebar_current: "docs-aci-resource-dhcp_relay_policy"
 description: |-
   Manages ACI DHCP Relay Policy
 ---
-
 # aci_dhcp_relay_policy
-
 Manages ACI DHCP Relay Policy.
-
 ## Example Usage
-
 ```hcl
 resource "aci_dhcp_relay_policy" "example" {
 
-  tenant_dn  = "${aci_tenant.example.id}"
-
-  name  = "name_example"
+  tenant_dn   = aci_tenant.example.id
+  name        = "name_example"
   annotation  = "annotation_example"
-  mode  = "visible"
+  description = "from terraform"
+  mode        = "visible"
   name_alias  = "alias_example"
-  owner  = "infra"
+  owner       = "infra"
+
+  relation_dhcp_rs_prov {
+    addr = "10.20.30.40"
+    tdn     = aci_application_epg.example.id
+  }
+
+  relation_dhcp_rs_prov {
+    addr = "10.20.30.41"
+    tdn     = aci_l2out_extepg.example.id
+  }
 }
 ```
 
 ## Argument Reference
-
 - `tenant_dn` - (Required) Distinguished name of parent Tenant object.
 - `name` - (Required) Name of Object DHCP Relay Policy.
 - `annotation` - (Optional) Annotation for object DHCP Relay Policy.
+- `description` - (Optional) Description for object DHCP Relay Policy.
 - `mode` - (Optional) DHCP relay policy mode. Allowed Values are "visible" and "not-visible". Default Value is "visible".
 - `name_alias` - (Optional) Name alias for object DHCP Relay Policy.
 - `owner` - (Optional) Owner of the target relay servers. Allowed values are "infra" and "tenant". Default value is "infra".
 
 - `relation_dhcp_rs_prov` - (Optional) List of relation to class fvEPg. Cardinality - N_TO_M. Type - Set of String.
+- `relation_dhcp_rs_prov.tdn` - (Required) target Dn of the class fvEPg.
+- `relation_dhcp_rs_prov.addr` - (Required) IP address for relation dhcpRsProv.
 
 ## Attribute Reference
 
 The only attribute that this resource exports is the `id`, which is set to the Dn of the DHCP Relay Policy.
-
 ## Importing
-
 An existing DHCP Relay Policy can be [imported][docs-import] into this resource via its Dn, via the following command:
 [docs-import]: https://www.terraform.io/docs/import/index.html
-
 ```
 terraform import aci_dhcp_relay_policy.example <Dn>
-```
+```