Updated with newer version of aci-go-client

Author: anvitha-jain

aci/data_source_aci_vmmctrlrp.go

@@ -9,127 +9,101 @@ import (
 
 func dataSourceAciVMMController() *schema.Resource {
 	return &schema.Resource{
-
-		Read: dataSourceAciVMMControllerRead,
-
+		Read:          dataSourceAciVMMControllerRead,
 		SchemaVersion: 1,
-
-		Schema: AppendBaseAttrSchema(map[string]*schema.Schema{
-			"vmm_domain_dn": &schema.Schema{
+		Schema: AppendBaseAttrSchema(AppendNameAliasAttrSchema(map[string]*schema.Schema{
+			"vmm_domain_dn": {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-
-			"name": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
-			},
-
-			"annotation": &schema.Schema{
+			"annotation": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"dvs_version": &schema.Schema{
+			"dvs_version": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"host_or_ip": &schema.Schema{
+			"host_or_ip": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"inventory_trig_st": &schema.Schema{
+			"inventory_trig_st": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"mode": &schema.Schema{
+			"mode": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"msft_config_err_msg": &schema.Schema{
+			"msft_config_err_msg": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"msft_config_issues": &schema.Schema{
-				Type:     schema.TypeString,
+			"msft_config_issues": {
+				Type:     schema.TypeList,
 				Optional: true,
 				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
 			},
-
-			"n1kv_stats_mode": &schema.Schema{
+			"n1kv_stats_mode": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"name_alias": &schema.Schema{
+			"name": {
 				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
+				Required: true,
 			},
-
-			"port": &schema.Schema{
+			"port": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"root_cont_name": &schema.Schema{
+			"root_cont_name": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"scope": &schema.Schema{
+			"scope": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"seq_num": &schema.Schema{
+			"seq_num": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"stats_mode": &schema.Schema{
+			"stats_mode": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"vxlan_depl_pref": &schema.Schema{
+			"vxlan_depl_pref": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-		}),
+		})),
 	}
 }
 
 func dataSourceAciVMMControllerRead(d *schema.ResourceData, m interface{}) error {
 	aciClient := m.(*client.Client)
-
 	name := d.Get("name").(string)
-
-	rn := fmt.Sprintf("ctrlr-%s", name)
 	VMMDomainDn := d.Get("vmm_domain_dn").(string)
-
+	rn := fmt.Sprintf("ctrlr-%s", name)
 	dn := fmt.Sprintf("%s/%s", VMMDomainDn, rn)
-
 	vmmCtrlrP, err := getRemoteVMMController(aciClient, dn)
-
 	if err != nil {
 		return err
 	}

aci/data_source_aci_vmmusraccp.go

@@ -1,86 +1,51 @@
 package aci
 
-
 import (
 	"fmt"
+
 	"github.com/ciscoecosystem/aci-go-client/client"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 )
 
 func dataSourceAciVMMCredential() *schema.Resource {
 	return &schema.Resource{
-
-		Read:   dataSourceAciVMMCredentialRead,
-
+		Read:          dataSourceAciVMMCredentialRead,
 		SchemaVersion: 1,
-
-		Schema: AppendBaseAttrSchema(map[string]*schema.Schema{
-			"vmm_domain_dn": &schema.Schema{
+		Schema: AppendBaseAttrSchema(AppendNameAliasAttrSchema(map[string]*schema.Schema{
+			"vmm_domain_dn": {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-
-
-			"name": &schema.Schema{
-				Type: schema.TypeString,
-				Required: true,
-			},
-
-
-
-
-			"annotation": &schema.Schema{
+			"annotation": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-
-
-			"name_alias": &schema.Schema{
+			"name": {
 				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
+				Required: true,
 			},
-
-
-
-			"pwd": &schema.Schema{
+			"pwd": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-
-
-			"usr": &schema.Schema{
+			"usr": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-
-            }),
-    }
+		})),
+	}
 }
 
-
-
 func dataSourceAciVMMCredentialRead(d *schema.ResourceData, m interface{}) error {
 	aciClient := m.(*client.Client)
-
 	name := d.Get("name").(string)
-
-
-    rn := fmt.Sprintf("usracc-%s",name)
-    VMMDomainDn := d.Get("vmm_domain_dn").(string)
-
-    dn := fmt.Sprintf("%s/%s",VMMDomainDn,rn)
-
-
-
+	VMMDomainDn := d.Get("vmm_domain_dn").(string)
+	rn := fmt.Sprintf("usracc-%s", name)
+	dn := fmt.Sprintf("%s/%s", VMMDomainDn, rn)
 	vmmUsrAccP, err := getRemoteVMMCredential(aciClient, dn)
-
 	if err != nil {
 		return err
 	}

aci/data_source_aci_vmmvswitchpolicycont.go

@@ -9,42 +9,28 @@ import (
 
 func dataSourceAciVSwitchPolicyGroup() *schema.Resource {
 	return &schema.Resource{
-
-		Read: dataSourceAciVSwitchPolicyGroupRead,
-
+		Read:          dataSourceAciVSwitchPolicyGroupRead,
 		SchemaVersion: 1,
-
-		Schema: AppendBaseAttrSchema(map[string]*schema.Schema{
-			"vmm_domain_dn": &schema.Schema{
+		Schema: AppendBaseAttrSchema(AppendNameAliasAttrSchema(map[string]*schema.Schema{
+			"vmm_domain_dn": {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-
-			"annotation": &schema.Schema{
+			"annotation": {
 				Type:     schema.TypeString,
 				Optional: true,
 				Computed: true,
 			},
-
-			"name_alias": &schema.Schema{
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
-		}),
+		})),
 	}
 }
 
 func dataSourceAciVSwitchPolicyGroupRead(d *schema.ResourceData, m interface{}) error {
 	aciClient := m.(*client.Client)
-
-	rn := fmt.Sprintf("vswitchpolcont")
 	VMMDomainDn := d.Get("vmm_domain_dn").(string)
-
+	rn := fmt.Sprintf("vswitchpolcont")
 	dn := fmt.Sprintf("%s/%s", VMMDomainDn, rn)
-
 	vmmVSwitchPolicyCont, err := getRemoteVSwitchPolicyGroup(aciClient, dn)
-
 	if err != nil {
 		return err
 	}