Fix for duplicate export rule deletion

Author: vivakeram

mocks/mock_storage_drivers/mock_ontap/mock_api.go

@@ -58,7 +58,7 @@ type OntapAPI interface {
 	ExportPolicyExists(ctx context.Context, policyName string) (bool, error)
 	ExportRuleCreate(ctx context.Context, policyName, desiredPolicyRule, nasProtocol string) error
 	ExportRuleDestroy(ctx context.Context, policyName string, ruleIndex int) error
-	ExportRuleList(ctx context.Context, policyName string) (map[string]int, error)
+	ExportRuleList(ctx context.Context, policyName string) (map[int]string, error)
 
 	FlexgroupCreate(ctx context.Context, volume Volume) error
 	FlexgroupExists(ctx context.Context, volumeName string) (bool, error)

mocks/mock_utils/mock_fcp/mock_fcp_client.go

@@ -1222,13 +1222,13 @@ func (d OntapAPIREST) ExportPolicyExists(ctx context.Context, policyName string)
 	return true, nil
 }
 
-func (d OntapAPIREST) ExportRuleList(ctx context.Context, policyName string) (map[string]int, error) {
+func (d OntapAPIREST) ExportRuleList(ctx context.Context, policyName string) (map[int]string, error) {
 	ruleListResponse, err := d.api.ExportRuleList(ctx, policyName)
 	if err != nil {
 		return nil, fmt.Errorf("error listing export policy rules; %v", err)
 	}
 
-	rules := make(map[string]int)
+	rules := make(map[int]string)
 	if ruleListResponse != nil &&
 		ruleListResponse.Payload != nil &&
 		ruleListResponse.Payload.NumRecords != nil &&
@@ -1238,7 +1238,13 @@ func (d OntapAPIREST) ExportRuleList(ctx context.Context, policyName string) (ma
 		for _, rule := range exportRuleList {
 			for _, client := range rule.ExportRuleInlineClients {
 				if client.Match != nil && rule.Index != nil {
-					rules[*client.Match] = int(*rule.Index)
+					index := int(*rule.Index)
+					match := *client.Match
+					if existing, ok := rules[index]; ok && existing != "" {
+						rules[index] = fmt.Sprintf("%s,%s", existing, match)
+					} else {
+						rules[index] = match
+					}
 				}
 			}
 		}