Merge pull request #6 from CiscoDevNet/destroy-child

delete method of child resources updated
CiscoDevNet · Dec 23, 2020 · fde4816 · fde4816
2 parents 88d9447 + ec91aa1
commit fde4816
Show file tree

Hide file tree

Showing 16 changed files with 164 additions and 62 deletions.
diff --git a/mso/resource_mso_schema_site_anp_epg_domain.go b/mso/resource_mso_schema_site_anp_epg_domain.go
@@ -783,7 +783,8 @@ func resourceMSOSchemaSiteAnpEpgDomainDelete(d *schema.ResourceData, m interface
 		return err
 	}
 	if index == -1 {
-		fmt.Errorf("The given Anp Epg Domain is not found")
+		d.SetId("")
+		return nil
 	}
 	indexs := strconv.Itoa(index)
 

diff --git a/mso/resource_mso_schema_site_anp_epg_selector.go b/mso/resource_mso_schema_site_anp_epg_selector.go
@@ -414,7 +414,8 @@ func resourceSchemaSiteApnEpgSelectorDelete(d *schema.ResourceData, m interface{
 		return err
 	}
 	if indexGet == -1 {
-		return fmt.Errorf("No selectors found")
+		d.SetId("")
+		return nil
 	}
 
 	path := fmt.Sprintf("/sites/%s-%s/anps/%s/epgs/%s/selectors/%v", siteID, template, anpName, epgName, indexGet)

diff --git a/mso/resource_mso_schema_site_anp_epg_static_leaf.go b/mso/resource_mso_schema_site_anp_epg_static_leaf.go
@@ -387,7 +387,8 @@ func resourceMSOSchemaSiteAnpEpgStaticleafDelete(d *schema.ResourceData, m inter
 	}
 
 	if index == -1 {
-		return fmt.Errorf("The given staticLeaf is not found")
+		d.SetId("")
+		return nil
 	}
 
 	indexs := strconv.Itoa(index)

diff --git a/mso/resource_mso_schema_site_anp_epg_static_port.go b/mso/resource_mso_schema_site_anp_epg_static_port.go
@@ -574,7 +574,6 @@ func resourceMSOSchemaSiteAnpEpgStaticPortDelete(d *schema.ResourceData, m inter
 	if err != nil {
 		return fmt.Errorf("No Sites found")
 	}
-	found := false
 
 	var pathType, pod, leaf, path, deploymentImmediacy, mode, fex string
 	var vlan, microsegvlan int
@@ -670,7 +669,6 @@ func resourceMSOSchemaSiteAnpEpgStaticPortDelete(d *schema.ResourceData, m inter
 									if err != nil {
 										return err
 									}
-									found = true
 									break
 								}
 							}
@@ -681,9 +679,6 @@ func resourceMSOSchemaSiteAnpEpgStaticPortDelete(d *schema.ResourceData, m inter
 			}
 		}
 	}
-	if !found {
-		return fmt.Errorf("The specified parameters to delete the static port entry not found")
-	}
 	d.SetId("")
 	return resourceMSOSchemaSiteAnpEpgStaticPortRead(d, m)
 }
diff --git a/mso/resource_mso_schema_site_bd_l3out.go b/mso/resource_mso_schema_site_bd_l3out.go
@@ -180,7 +180,8 @@ func resourceMSOSchemaSiteBdL3outDelete(d *schema.ResourceData, m interface{}) e
 		return err
 	}
 	if index == -1 {
-		fmt.Errorf("The given Anp Epg Domain is not found")
+		d.SetId("")
+		return nil
 	}
 	indexs := strconv.Itoa(index)
 

diff --git a/mso/resource_mso_schema_site_external_epg_selector.go b/mso/resource_mso_schema_site_external_epg_selector.go
@@ -278,7 +278,8 @@ func resourceMSOSchemaSiteExternalEpgSelectorDelete(d *schema.ResourceData, m in
 		return err
 	}
 	if index == -1 {
-		return fmt.Errorf("No Selector found")
+		d.SetId("")
+		return nil
 	}
 
 	path := fmt.Sprintf("/sites/%s-%s/externalEpgs/%s/subnets/%v", siteID, templateName, extrEpgName, index)

diff --git a/mso/resource_mso_schema_site_vrf_region_cidr.go b/mso/resource_mso_schema_site_vrf_region_cidr.go
@@ -239,7 +239,8 @@ func resourceMSOSchemaSiteVrfRegionCidrDelete(d *schema.ResourceData, m interfac
 		return err
 	}
 	if index == -1 {
-		return fmt.Errorf("The given Vrf Region Cidr is not found")
+		d.SetId("")
+		return nil
 	}
 	indexs := strconv.Itoa(index)
 

diff --git a/mso/resource_mso_schema_site_vrf_region_cidr_subnet.go b/mso/resource_mso_schema_site_vrf_region_cidr_subnet.go
@@ -503,6 +503,11 @@ func resourceMSOSchemaSiteVrfRegionCidrSubnetDelete(d *schema.ResourceData, m in
 		}
 	}
 
+	if index == -1 {
+		d.SetId("")
+		return nil
+	}
+
 	path := fmt.Sprintf("/sites/%s-%s/vrfs/%s/regions/%s/cidrs/%v/subnets/%v", siteId, templateName, vrfName, regionName, cindex, index)
 	vrfRegionStruct := models.NewSchemaSiteVrfRegionCidrSubnet("remove", path, ip, zone, usage)
 

diff --git a/mso/resource_mso_schema_template_anp_epg_contract.go b/mso/resource_mso_schema_template_anp_epg_contract.go
@@ -301,7 +301,8 @@ func resourceMSOTemplateAnpEpgContractDelete(d *schema.ResourceData, m interface
 		return err
 	}
 	if index == -1 {
-		fmt.Errorf("The given contract id is not found")
+		d.SetId("")
+		return nil
 	}
 	indexs := strconv.Itoa(index)
 

diff --git a/mso/resource_mso_schema_template_anp_epg_subnet.go b/mso/resource_mso_schema_template_anp_epg_subnet.go
@@ -325,7 +325,8 @@ func resourceMSOSchemaTemplateAnpEpgSubnetDelete(d *schema.ResourceData, m inter
 		return err
 	}
 	if index == -1 {
-		fmt.Errorf("The given subnet ip is not found")
+		d.SetId("")
+		return nil
 	}
 	indexs := strconv.Itoa(index)
 	schemaTemplateAnpEpgSubnetApp := models.NewSchemaTemplateAnpEpgSubnet("remove", "/templates/"+template+"/anps/"+anpName+"/epgs/"+epgName+"/subnets/"+indexs, "", "", false)

diff --git a/mso/resource_mso_schema_template_bd_subnet.go b/mso/resource_mso_schema_template_bd_subnet.go
@@ -347,7 +347,6 @@ func resourceMSOTemplateBDSubnetDelete(d *schema.ResourceData, m interface{}) er
 		return fmt.Errorf("No Template found")
 	}
 	stateTemplate := d.Get("template_name").(string)
-	found := false
 	stateBD := d.Get("bd_name")
 	stateIP := d.Get("ip")
 	for i := 0; i < count; i++ {
@@ -389,17 +388,13 @@ func resourceMSOTemplateBDSubnetDelete(d *schema.ResourceData, m interface{}) er
 							if err != nil {
 								return err
 							}
-							found = true
 							break
 						}
 					}
 				}
 			}
 		}
 	}
-	if !found {
-		return fmt.Errorf("The specified parameters are incorrect for delete operation")
-	}
 	d.SetId("")
 	return nil
 }
diff --git a/mso/resource_mso_schema_template_contract_filter.go b/mso/resource_mso_schema_template_contract_filter.go
@@ -537,7 +537,6 @@ func resourceMSOTemplateContractFilterDelete(d *schema.ResourceData, m interface
 	indexf := 0
 	indexfp := 0
 	indexfc := 0
-	found := false
 	cont, err := msoClient.GetViaURL(fmt.Sprintf("api/v1/schemas/%s", schemaID))
 	if err != nil {
 		return err
@@ -604,7 +603,6 @@ func resourceMSOTemplateContractFilterDelete(d *schema.ResourceData, m interface
 									filRef := filterCont.S("filterRef").Data()
 									split := strings.Split(filRef.(string), "/")
 									if split[6] == filterName && split[4] == filterTemplate && split[2] == filterId {
-										found = true
 										paths := fmt.Sprintf("/templates/%s/contracts/%s/filterRelationships/%v", templateName, contractName, k)
 										contract := models.NewTemplateContractFilterRelationShip("remove", paths, filterRefMap, directives)
 										_, err1 := msoClient.PatchbyID(fmt.Sprintf("api/v1/schemas/%s", schemaID), contract)
@@ -628,7 +626,6 @@ func resourceMSOTemplateContractFilterDelete(d *schema.ResourceData, m interface
 									filRef := filterCont.S("filterRef").Data()
 									split := strings.Split(filRef.(string), "/")
 									if split[6] == filterName && split[4] == filterTemplate && split[2] == filterId {
-										found = true
 
 										paths := fmt.Sprintf("/templates/%s/contracts/%s/filterRelationshipsProviderToConsumer/%v", templateName, contractName, k)
 										contract := models.NewTemplateContractFilterRelationShip("remove", paths, filterRefMap, directives)
@@ -656,7 +653,6 @@ func resourceMSOTemplateContractFilterDelete(d *schema.ResourceData, m interface
 									filRef := filterCont.S("filterRef").Data()
 									split := strings.Split(filRef.(string), "/")
 									if split[6] == filterName && split[4] == filterTemplate && split[2] == filterId {
-										found = true
 										paths := fmt.Sprintf("/templates/%s/contracts/%s/filterRelationshipsConsumerToProvider/%v", templateName, contractName, k)
 										contract := models.NewTemplateContractFilterRelationShip("remove", paths, filterRefMap, directives)
 										_, err1 := msoClient.PatchbyID(fmt.Sprintf("api/v1/schemas/%s", schemaID), contract)
@@ -677,9 +673,6 @@ func resourceMSOTemplateContractFilterDelete(d *schema.ResourceData, m interface
 			}
 		}
 	}
-	if !found {
-		return fmt.Errorf("Unable to find given Contract Filter")
-	}
 	return resourceMSOTemplateContractFilterRead(d, m)
 
 }
diff --git a/mso/resource_mso_schema_template_external_epg_contract.go b/mso/resource_mso_schema_template_external_epg_contract.go
@@ -252,6 +252,11 @@ func resourceMSOTemplateExternalEpgContractDelete(d *schema.ResourceData, m inte
 		return err
 	}
 
+	if index == -1 {
+		d.SetId("")
+		return nil
+	}
+
 	indexs := strconv.Itoa(index)
 
 	path := fmt.Sprintf("/templates/%s/externalEpgs/%s/contractRelationships/%s", templateName, epgName, indexs)
@@ -265,7 +270,6 @@ func resourceMSOTemplateExternalEpgContractDelete(d *schema.ResourceData, m inte
 	return nil
 }
 func fetchIndexs(cont *container.Container, templateName, epgName, contractName string) (int, error) {
-	found := false
 	index := -1
 	count, err := cont.ArrayCount("templates")
 	if err != nil {
@@ -304,7 +308,6 @@ func fetchIndexs(cont *container.Container, templateName, epgName, contractName
 						re := regexp.MustCompile("/schemas/(.*)/templates/(.*)/contracts/(.*)")
 						split := re.FindStringSubmatch(contractRef)
 						if contractName == fmt.Sprintf("%s", split[3]) {
-							found = true
 							index = k
 							break
 						}
@@ -313,9 +316,6 @@ func fetchIndexs(cont *container.Container, templateName, epgName, contractName
 			}
 		}
 	}
-	if !found {
-		return index, fmt.Errorf("Unable to Find the external Epg Contract")
-	}
 
 	return index, nil
 }
diff --git a/mso/resource_mso_schema_template_external_epg_subnet.go b/mso/resource_mso_schema_template_external_epg_subnet.go
@@ -266,7 +266,8 @@ func resourceMSOTemplateExtenalepgSubnetDelete(d *schema.ResourceData, m interfa
 		return err
 	}
 	if index == -1 {
-		fmt.Errorf("The given subnet ip is not found")
+		d.SetId("")
+		return nil
 	}
 	indexs := strconv.Itoa(index)