Fix for vPC interfaces - change in order of serial numbers causes failures in resource

Author: akabhask

internal/provider/ndfc/interface.go

@@ -95,8 +95,20 @@ func (c NDFC) RscGetInterfaces(ctx context.Context, dg *diag.Diagnostics, in res
 				}
 				key, ok := keyMap[ifList[i].SerialNumber+":"+ifList[i].InterfaceName]
 				if !ok {
-					tflog.Error(ctx, fmt.Sprintf("Key not found: %s", ifList[i].SerialNumber+":"+ifList[i].InterfaceName))
-					continue
+					if strings.Contains(ifList[i].SerialNumber, "~") {
+						serialNumber := strings.Split(ifList[i].SerialNumber, "~")
+						newSerialNumber := serialNumber[1] + "~" + serialNumber[0]
+						key, ok = keyMap[newSerialNumber+":"+ifList[i].InterfaceName]
+						if !ok {
+							tflog.Error(ctx, fmt.Sprintf("Key not found: %s",
+								ifList[i].SerialNumber+":"+ifList[i].InterfaceName))
+							continue
+						}
+					} else {
+						tflog.Error(ctx, fmt.Sprintf("Key not found: %s",
+							ifList[i].SerialNumber+":"+ifList[i].InterfaceName))
+						continue
+					}
 				}
 
 				log.Printf("Found entry: key %s entry %s:%s", key, ifList[i].SerialNumber, ifList[i].InterfaceName)

internal/provider/ndfc/interfaces_vpc.go

@@ -52,8 +52,8 @@ func (i *NDFCVPCInterface) DeleteInterface(ctx context.Context, dg *diag.Diagnos
 	intfPayload := resource_interface_common.NDFCInterfacesDeploy{}
 
 	//ifDeployPayload := resource_interface_common.NDFCInterfacesDeploy{}
-
-	for _, intf := range inData.Interfaces {
+	interfaces := i.GetInterface(ctx, dg, inData.SerialNumber, inData.Policy)
+	for _, intf := range interfaces {
 		intfPayload = append(intfPayload, resource_interface_common.NDFCInterfaceDeploy{IfName: intf.InterfaceName,
 			SerialNumber: intf.SerialNumber})
 		tflog.Debug(ctx, fmt.Sprintf("NDFCVPCInterface: Deleting interface: %s:%s", intf.SerialNumber, intf.InterfaceName))