Fix for removing fabric name in policy and other additional fixes in vpc pair, network and fabric resources.

Author: akabhask

docs/resources/policy.md

@@ -14,7 +14,6 @@ Resource to configure policies on a switch
 
 ```terraform
 resource "ndfc_policy" "test_resource_policy_1" {
-  fabric_name          = "CML"
   is_policy_group      = false
   deploy               = true
   entity_name          = "Switch"
@@ -42,7 +41,6 @@ resource "ndfc_policy" "test_resource_policy_1" {
 - `device_serial_number` (String) Serial number of the device
 - `entity_name` (String) Policy Name
 - `entity_type` (String) Type of the entity
-- `fabric_name` (String) Name of the fabric
 - `template_name` (String) Name of the template
 
 ### Optional

examples/resources/ndfc_policy/resource.tf

@@ -1,6 +1,5 @@
 
 resource "ndfc_policy" "test_resource_policy_1" {
-  fabric_name          = "CML"
   is_policy_group      = false
   deploy               = true
   entity_name          = "Switch"

generator/defs/policy.yaml

@@ -6,7 +6,7 @@ resource:
   description: "Resource to configure policies on a switch"
   import_id:
     - "POLICY-26910"
-  import_desc: 
+  import_desc:
     - "Policy-ID"
   attributes:
     - model_name: id
@@ -21,14 +21,6 @@ resource:
       description: "Policy ID"
       computed: true
       use_state: true
-    - model_name: fabricName
-      tf_name: fabric_name
-      type: String
-      description: "Name of the fabric"
-      mandatory: true
-      payload_hide: true
-      tf_requires_replace: true
-      example: "CML"
     - model_name: policyGroup
       tf_name: is_policy_group
       type: Bool

internal/provider/ndfc/api/vpc_pair_api.go

@@ -19,25 +19,22 @@ const urlVpcPair = "/lan-fabric/rest/vpcpair"
 const urlVpcPairGet = urlVpcPair + "?serialNumber=%s"
 const urlVpcPairRecmd = urlVpcPair + "/recommendation?serialNumber=%s&useVirtualPeerlink=%t"
 
-
 type VpcPairAPI struct {
 	NDFCAPICommon
-	mutex           *sync.Mutex
-	CheckStatus     map[string]bool
-	FabricName      string
-	VirtualPeerLink bool
-	VpcPairID       string
+	mutex              *sync.Mutex
+	GetRecommendations bool
+	FabricName         string
+	VirtualPeerLink    bool
+	VpcPairID          string
 }
 
 func (c *VpcPairAPI) GetLock() *sync.Mutex {
 	return c.mutex
 }
 
 func (c *VpcPairAPI) GetUrl() string {
-	if c.CheckStatus["recommendations"] {
+	if c.GetRecommendations {
 		return fmt.Sprintf(urlVpcPairRecmd, c.VpcPairID, c.VirtualPeerLink)
-	} else if c.CheckStatus["switchesByFabric"] {
-		return fmt.Sprintf(UrlSwitchesByFabric, c.FabricName)
 	} else {
 		return fmt.Sprintf(urlVpcPairGet, c.VpcPairID)
 	}

internal/provider/ndfc/fabric_common.go

@@ -47,7 +47,7 @@ func (c *NDFC) RscReadFabric(ctx context.Context, dg *diag.Diagnostics, tf resou
 	payload, err := fabricApi.Get()
 	if len(payload) == 0 {
 		if err == nil {
-			err = fmt.Errorf("payload empty from NDFC")
+			err = fmt.Errorf("fabric not found in NDFC")
 		}
 		tflog.Error(ctx, "RscReadFabric: Failed to get fabric")
 		dg.AddError("Failed to get fabric", fmt.Sprintf("Error: %q", err.Error()))
@@ -97,19 +97,19 @@ func (c *NDFC) RscCreateFabric(ctx context.Context, dg *diag.Diagnostics, tf res
 func (c *NDFC) RscUpdateFabric(ctx context.Context, dg *diag.Diagnostics, tf resource_fabric_common.FabricModel, fabricType string) {
 	tflog.Info(ctx, "Update Fabric")
 	ndfcFabricModel := tf.GetModelData()
+	fabricName := ndfcFabricModel.FabricName
+	deploy := ndfcFabricModel.Deploy
 	fabricApi, payload := c.RscGetFabricApiDetails(ctx, dg, ndfcFabricModel, fabricType)
 	if dg.HasError() {
 		return
 	}
-	fabricApi.FabricName = ndfcFabricModel.FabricName
+	fabricApi.FabricName = fabricName
 	res, err := fabricApi.Put(payload)
 	if err != nil {
 		tflog.Error(ctx, "RscUpdateFabric: PUT failed with payload %s", map[string]interface{}{"Payload": payload})
 		dg.AddError("Failed to update fabric", fmt.Sprintf("Error: %q %q", err.Error(), res.String()))
 		return
 	}
-	fabricName := ndfcFabricModel.FabricName
-	deploy := ndfcFabricModel.Deploy
 	c.RscDeployFabric(ctx, dg, fabricName, deploy)
 	if dg.HasError() {
 		return
@@ -175,10 +175,7 @@ func (c NDFC) RscGetFabricApiDetails(ctx context.Context, dg *diag.Diagnostics,
 }
 func (c *NDFC) RscDeployFabric(ctx context.Context, dg *diag.Diagnostics, fabricName string, deploy bool) {
 	if deploy {
-		fabricApi := api.NewFabricAPI(c.GetLock(ResourceFabrics), &c.apiClient)
-		fabricApi.FabricName = fabricName
-		fabricApi.GetSwitchesInFabric = true
-		payload, err := fabricApi.Get()
+        payload, err := c.GetSwitchesInFabric(ctx, fabricName)
 		tflog.Debug(ctx, fmt.Sprintf("RscDeployFabric: payload %s", string(payload)))
 		if len(payload) == 0 || string(payload) == "[]" {
 			if err == nil {
@@ -195,7 +192,29 @@ func (c *NDFC) RscDeployFabric(ctx context.Context, dg *diag.Diagnostics, fabric
 		c.DeployConfiguration(ctx, dg, fabricName, nil)
 	}
 }
-func (c NDFC) DSGetFabricBulk(ctx context.Context, dg *diag.Diagnostics) *datasource_fabric.FabricModel {
+func (c *NDFC) GetSwitchesInFabric(ctx context.Context, fabricName string) ([]byte, error) {
+	fabricApi := api.NewFabricAPI(c.GetLock(ResourceFabrics), &c.apiClient)
+	fabricApi.FabricName = fabricName
+	fabricApi.GetSwitchesInFabric = true
+	return fabricApi.Get()
+}
+func (c *NDFC) GetFabricName(ctx context.Context, serialNumber string) (string) {
+	fabricApi := api.NewFabricAPI(c.GetLock(ResourceFabrics), &c.apiClient)
+	fabricApi.Serialnumber = serialNumber
+	payload, err := fabricApi.Get()
+	if err != nil {
+		tflog.Error(ctx, fmt.Sprintf("GetFabricName: Failed to get fabric name for serial number %s", serialNumber))
+		return ""
+	}
+	var FabricNamePayload resource_fabric_common.NdfcFabricNamePayload
+	err = json.Unmarshal(payload, &FabricNamePayload)
+	if err != nil {
+		return ""
+	}
+	return FabricNamePayload.FabricName
+
+}
+func (c *NDFC) DSGetFabricBulk(ctx context.Context, dg *diag.Diagnostics) *datasource_fabric.FabricModel {
 	tflog.Debug(ctx, "DSGetFabricBulk entry")
 	fabricApi := api.NewFabricAPI(c.GetLock(ResourceFabrics), &c.apiClient)
 	res, err := fabricApi.Get()
@@ -227,4 +246,4 @@ func (c NDFC) DSGetFabricBulk(ctx context.Context, dg *diag.Diagnostics) *dataso
 		tflog.Debug(ctx, "datasource_vrf_bulk: SetModelData OK")
 	}
 	return data
-}
+}

internal/provider/ndfc/ndfc_global_deploy.go

@@ -33,11 +33,7 @@ func (c NDFC) SaveConfiguration(ctx context.Context, diags *diag.Diagnostics, fa
 	_, err := saveApi.Post([]byte{})
 	if err != nil {
 		diags.AddError("Config Save failed", err.Error())
-		//saveApi.Preview = false
-		//time.Sleep(3 * time.Second)
-		//res, _ := saveApi.Get()
-		// TODO determine which error should be returned
-		///diags.AddError("Deploy Errors:", string(res))
+		return
 	}
 }
 

internal/provider/ndfc/net_attach_private.go

@@ -467,13 +467,9 @@ func processPortListOrder(portList *types.CSVString, order []string) {
 	}
 }
 
-func (c NDFC) createVpcPairMap(ctx context.Context, FabricName string) map[string]string {
+func (c NDFC) createVpcPairMap(ctx context.Context, fabricName string) map[string]string {
 
-	api := api.NewVpcPairAPI(c.GetLock(ResourceVpcPair), &c.apiClient)
-	api.CheckStatus = make(map[string]bool)
-	api.CheckStatus["switchesByFabric"] = true
-	api.FabricName = FabricName
-	payload, err := api.Get()
+	payload, err := c.GetSwitchesInFabric(ctx, fabricName)
 	if err != nil || string(payload) == "[]" || payload == nil {
 		tflog.Debug(ctx, "createVpcPairMap: Failed to get switchesByFabric")
 		return nil

internal/provider/ndfc/policy.go

@@ -72,7 +72,6 @@ func (c *NDFC) RscCreatePolicy(ctx context.Context, dg *diag.Diagnostics, model
 	}
 	model.SetModelData(newModel)
 	model.Deploy = types.BoolValue(inData.Deploy)
-	model.FabricName = types.StringValue(inData.FabricName)
 }
 
 func getPolicyIdFromResponse(res *gjson.Result) string {
@@ -81,7 +80,6 @@ func getPolicyIdFromResponse(res *gjson.Result) string {
 
 func (c *NDFC) RscReadPolicy(ctx context.Context, dg *diag.Diagnostics, model *resource_policy.PolicyModel) {
 
-	FabricName := model.FabricName.ValueString()
 	Deploy := model.Deploy.ValueBool()
 	if model.IsPolicyGroup.ValueBool() {
 		tflog.Error(ctx, "Policy group is not supported")
@@ -97,7 +95,6 @@ func (c *NDFC) RscReadPolicy(ctx context.Context, dg *diag.Diagnostics, model *r
 		return
 	}
 	data.Deploy = Deploy
-	data.FabricName = FabricName
 	model.SetModelData(data)
 
 }
@@ -174,14 +171,14 @@ func (c *NDFC) RscUpdatePolicy(ctx context.Context, dg *diag.Diagnostics, model
 
 	model.SetModelData(newModel)
 	model.Deploy = types.BoolValue(policyData.Deploy)
-	model.FabricName = types.StringValue(policyData.FabricName)
 }
 
 func (c *NDFC) RscDeletePolicy(ctx context.Context, dg *diag.Diagnostics, model *resource_policy.PolicyModel) {
 
 	policyID := model.PolicyId.ValueString()
-	FabricName := model.FabricName.ValueString()
-	tflog.Debug(ctx, fmt.Sprintf("Before Deploying configuration for Fabric: %s", FabricName))
+	serialNumber := model.GetModelData().DeviceSerialNumber
+	fabricName := c.GetFabricName(ctx, serialNumber)
+	tflog.Debug(ctx, fmt.Sprintf("Before Deploying configuration for Fabric: %s", fabricName))
 	tflog.Debug(ctx, fmt.Sprintf("RscDeletePolicy: Deleting policy ID %s", policyID))
 
 	if model.IsPolicyGroup.ValueBool() {
@@ -213,7 +210,7 @@ func (c *NDFC) RscDeletePolicy(ctx context.Context, dg *diag.Diagnostics, model
 	}
 	// Incase of delete, policyID is made as FabricName:SerialNumber for switch deploy
 	// This avoids additional parameters to be passed to delete and also policyID is not used in delete
-	policyID = FabricName + ":" + model.GetModelData().DeviceSerialNumber
+	policyID = fabricName + ":" + serialNumber
 	c.RscDeployPolicy(ctx, dg, policyID)
 	if dg.HasError() {
 		tflog.Error(ctx, "Failed to switch deploy")
@@ -250,7 +247,6 @@ func (c *NDFC) RscDeployPolicy(ctx context.Context, dg *diag.Diagnostics, policy
 		FabricName := parts[0]
 		serialNumber := parts[1]
 		switchSerialNumber := []string{serialNumber}
-
 		tflog.Debug(ctx, fmt.Sprintf("Deploying configuration for Fabric: %s, Serial Numbers: %s", FabricName, serialNumber))
 		c.DeployConfiguration(ctx, dg, FabricName, switchSerialNumber)
 		return

internal/provider/ndfc/vpc_pair.go

@@ -148,7 +148,7 @@ func (c *NDFC) RscUpdateVpcPair(ctx context.Context, dg *diag.Diagnostics, tf *r
 	// Convert NDFC model to the json data
 	payload, err := json.Marshal(nfdcVpcPairModel)
 	if err != nil {
-		tflog.Error(ctx, "RscCreateOrUpdate: RscCreateOrUpdate: Failed to marshal vPC Pair data")
+		tflog.Error(ctx, "RscUpdateVpcPair: Failed to marshal vPC Pair data")
 		dg.AddError("Failed to marshal vPC Pair data", fmt.Sprintf("Error %v", err))
 		return
 	}
@@ -157,14 +157,15 @@ func (c *NDFC) RscUpdateVpcPair(ctx context.Context, dg *diag.Diagnostics, tf *r
 	api := api.NewVpcPairAPI(c.GetLock(ResourceVpcPair), &c.apiClient)
 	res, err := api.Put(payload)
 	if err != nil {
-		tflog.Error(ctx, "RscCreateOrUpdate: Failed to update vPC Pair")
+		tflog.Error(ctx, "RscUpdateVpcPair: Failed to update vPC Pair")
 		dg.AddError("Failed to update vPC Pair", fmt.Sprintf("Error %v: %v", err, res.String()))
 		return
 	}
 	// Check if the vPC Pair is present after update
 	nfdcVpcPairModel = c.rscGetVpcPair(ctx, tf)
 	if nfdcVpcPairModel == nil {
-		dg.AddError("Failed to create vPC Pair", "vPC Pair data empty in NDFC")
+		tflog.Error(ctx, "RscUpdateVpcPair: Failed to get vPC Pair after update")
+		dg.AddError("Failed to update vPC Pair", "vPC Pair data empty in NDFC")
 		return
 	}
 	fabricName := nfdcVpcPairModel.PeerOneSwitchDetails.FabricName
@@ -241,23 +242,22 @@ func (c *NDFC) rscCheckVpcPairRecommendations(ctx context.Context,
 	recmdList := []resource_vpc_pair.NDFCVpcPairRecommendations{}
 
 	api.VpcPairID = nfdcVpcPairModel.SerialNumbers[0]
-	api.CheckStatus = make(map[string]bool)
-	api.CheckStatus["recommendations"] = true
+	api.GetRecommendations = true
 	api.VirtualPeerLink = *nfdcVpcPairModel.UseVirtualPeerlink
-
 	payload, err := api.Get()
-	api.CheckStatus["recommendations"] = false
 	if err != nil {
 		tflog.Error(ctx, "RscVpcPairRecommendations: Failed to get recommendations")
 		err = fmt.Errorf("failed to get recommendations")
 		return err
 	}
-
+	tflog.Debug(ctx, fmt.Sprintf("Recommendations payload: %s", payload))
+	api.GetRecommendations = false
 	err = json.Unmarshal(payload, &recmdList)
 	if err != nil {
 		tflog.Error(ctx, "RscVpcPairRecommendations: Failed to unmarshal recommendations data")
 		return err
 	}
+	tflog.Debug(ctx, fmt.Sprintf("Recommendations: %v", recmdList))
 	for _, rec := range recmdList {
 		log.Printf("SerialNumber %v, Recmd %v, RecReason %v", rec.SerialNumber, rec.Recommended, rec.RecommendationReason)
 		if rec.SerialNumber == nfdcVpcPairModel.SerialNumbers[1] {
@@ -266,6 +266,7 @@ func (c *NDFC) rscCheckVpcPairRecommendations(ctx context.Context,
 				return nil
 			} else {
 				if rec.RecommendationReason == "Switches are not connected" {
+					tflog.Debug(ctx, "NDFC Recommendation not met, but it is a transient error")
 					// This is a transient error, it will be really known when config apply is done.
 					return nil
 				} else {
@@ -290,6 +291,7 @@ func (c *NDFC) RscImportVpcPairs(ctx context.Context,
 		return
 	}
 	tf.SerialNumbers, err = types.SetValue(types.StringType, []attr.Value{types.StringValue(idSplit[0]), types.StringValue(idSplit[1])})
+	tflog.Debug(ctx, fmt.Sprintf("SerialNumbers %v", tf.SerialNumbers))
 	if err != nil {
 		dg.AddError("Import state failed", "Failed to set serial numbers")
 		return
@@ -299,6 +301,7 @@ func (c *NDFC) RscImportVpcPairs(ctx context.Context,
 		dg.AddError("Unable to get vpcPair", "vPC Pair data empty in NDFC")
 		return
 	}
+	tflog.Debug(ctx, fmt.Sprintf("vPC Pair model: %v", vpcPairModel))
 	rscCreateModelId(tf, vpcPairModel)
 }
 
@@ -310,6 +313,8 @@ func (c *NDFC) RscDeployVpcPair(ctx context.Context, dg *diag.Diagnostics, tf *r
 
 	ndfcVpcPairModel := tf.GetModelData()
 	serialNumbers := ndfcVpcPairModel.SerialNumbers
+	tflog.Debug(ctx, fmt.Sprintf("RscDeployVpcPair: Deploying vPC Pair with serial numbers: %v", serialNumbers))
+	tflog.Debug(ctx, "Performing config save and deploy for vPC Pair")
 	c.SaveConfiguration(ctx, dg, fabricName)
 	if dg.HasError() {
 		return

internal/provider/resources/resource_fabric_common/resource_custom_codec.go

@@ -18,13 +18,26 @@ type FabricModel interface {
 	GetModelData() *NDFCFabricCommonModel
 	SetModelData(*NDFCFabricCommonModel) diag.Diagnostics
 }
-
 type NdfcFabricPayload struct {
 	FabricName        string                `json:"fabricName,omitempty"`
 	FabricType        string                `json:"templateName,omitempty"`
 	NdfcFabricNvPairs NDFCFabricCommonModel `json:"nvPairs,omitempty"`
 }
+type NdfcFabricNamePayload struct {
+	FabricName string `json:"fabricName,omitempty"`
+}
+type CustomNdfcFabricNamePayload NdfcFabricNamePayload
 type CustomNdfcFabricPayload NdfcFabricPayload
+
+func (m *NdfcFabricNamePayload) UnmarshalJSON(data []byte) error {
+	var customModel CustomNdfcFabricNamePayload
+	err := json.Unmarshal(data, &customModel)
+	if err != nil {
+		return err
+	}
+	m.FabricName = customModel.FabricName
+	return nil
+}
 func (m *NdfcFabricPayload) UnmarshalJSON(data []byte) error {
 	var customModel CustomNdfcFabricPayload
 	err := json.Unmarshal(data, &customModel)