[bugfix] Fixed idempotency on site service graph. (#286)

CiscoDevNet · Aug 6, 2024 · b48e05c · b48e05c
1 parent c84c00b
commit b48e05c
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 36 deletions.
diff --git a/mso/resource_mso_schema_site_contract_service_graph.go b/mso/resource_mso_schema_site_contract_service_graph.go
@@ -52,6 +52,7 @@ func resourceMSOSchemaSiteContractServiceGraph() *schema.Resource {
 				Type:         schema.TypeString,
 				Optional:     true,
 				ForceNew:     true,
+				Computed:     true,
 				ValidateFunc: validation.StringLenBetween(1, 1000),
 			},
 			"service_graph_template_name": &schema.Schema{

diff --git a/mso/resource_mso_schema_site_service_graph.go b/mso/resource_mso_schema_site_service_graph.go
@@ -111,44 +111,52 @@ func resourceMSOSchemaSiteServiceGraph() *schema.Resource {
 				return err
 			}
 
-			sgCont, _, err := getTemplateServiceGraphCont(cont, templateName.(string), graphName.(string))
-			if strings.Contains(fmt.Sprint(err), "No Template found") {
-				// The function getTemplateServiceGraphCont() is not required when the template is attched to physical site.
-				return nil
-			} else if err != nil {
-				log.Printf("graphcont err %v", err)
-				return err
-			} else {
-				/* The function getTemplateServiceGraphCont() is required when the template is attached to cloud sites.
-				provider_connector_type is applicable only for cloud sites. */
-				var templateServiceNodeList []string
-				serviceNodes := sgCont.S("serviceNodes").Data().([]interface{})
-				for _, val := range serviceNodes {
-					serviceNodeValues := val.(map[string]interface{})
-					nodeId := models.StripQuotes(serviceNodeValues["serviceNodeTypeId"].(string))
-
-					nodeType, err := getNodeNameFromId(msoClient, nodeId)
-					if err != nil {
-						return err
-					}
-
-					templateServiceNodeList = append(templateServiceNodeList, nodeType)
-				}
-
-				/* Loop trough the templateServiceNodeList and validate the site level user input(provider_connector_type)
-				to verify it's value for nodetype 'other' and 'firewall'. */
-				_, siteServiceNodes := diff.GetChange("service_node")
-
-				for i, val := range siteServiceNodes.([]interface{}) {
-					serviceNode := val.(map[string]interface{})
-					if templateServiceNodeList[i] == "other" && !valueInSliceofStrings(serviceNode["provider_connector_type"].(string), []string{"none", "redir"}) {
-						return fmt.Errorf("The expected value for service_node.%d.provider_connector_type have to be one of [none, redir] when template's service node type is other, got %s.", i, serviceNode["provider_connector_type"])
-					} else if templateServiceNodeList[i] == "firewall" && !valueInSliceofStrings(serviceNode["provider_connector_type"].(string), []string{"none", "redir", "snat", "dnat", "snat_dnat"}) {
-						return fmt.Errorf("The expected value for service_node.%d.provider_connector_type have to be one of [none, redir, snat, dnat, snat_dnat] when template's service node type is firewall, got %s.", i, serviceNode["provider_connector_type"])
+			_, serviceNode := diff.GetChange("service_node")
+			if len(serviceNode.([]interface{})) != 0 {
+				for _, node := range serviceNode.([]interface{}) {
+					serviceNodeMap := node.(map[string]interface{})
+					if !valueInSliceofStrings(serviceNodeMap["provider_connector_type"].(string), []string{"none", "redir"}) { // If provider_connector_type is not none, then validate the user input.
+						sgCont, _, err := getTemplateServiceGraphCont(cont, templateName.(string), graphName.(string))
+						if strings.Contains(fmt.Sprint(err), "No Template found") {
+							// The function getTemplateServiceGraphCont() is not required when the template is attached to physical site.
+							return nil
+						} else if err != nil {
+							return err
+						} else {
+							/* The function getTemplateServiceGraphCont() is required when the template is attached to cloud sites.
+							provider_connector_type is applicable only for cloud sites. */
+							var templateServiceNodeList []string
+							serviceNodes := sgCont.S("serviceNodes").Data().([]interface{})
+							for _, val := range serviceNodes {
+								serviceNodeValues := val.(map[string]interface{})
+								nodeId := models.StripQuotes(serviceNodeValues["serviceNodeTypeId"].(string))
+
+								nodeType, err := getNodeNameFromId(msoClient, nodeId)
+								if err != nil {
+									return err
+								}
+
+								templateServiceNodeList = append(templateServiceNodeList, nodeType)
+							}
+
+							/* Loop trough the templateServiceNodeList and validate the site level user input(provider_connector_type)
+							to verify it's value for nodetype 'other' and 'firewall'. */
+							_, siteServiceNodes := diff.GetChange("service_node")
+
+							for i, val := range siteServiceNodes.([]interface{}) {
+								serviceNode := val.(map[string]interface{})
+								if templateServiceNodeList[i] == "other" && !valueInSliceofStrings(serviceNode["provider_connector_type"].(string), []string{"none", "redir"}) {
+									return fmt.Errorf("The expected value for service_node.%d.provider_connector_type have to be one of [none, redir] when template's service node type is other, got %s.", i, serviceNode["provider_connector_type"])
+								} else if templateServiceNodeList[i] == "firewall" && !valueInSliceofStrings(serviceNode["provider_connector_type"].(string), []string{"none", "redir", "snat", "dnat", "snat_dnat"}) {
+									return fmt.Errorf("The expected value for service_node.%d.provider_connector_type have to be one of [none, redir, snat, dnat, snat_dnat] when template's service node type is firewall, got %s.", i, serviceNode["provider_connector_type"])
+								}
+							}
+							return nil
+						}
 					}
 				}
-				return nil
 			}
+			return nil
 		},
 	}
 }

diff --git a/mso/resource_mso_schema_template_contract.go b/mso/resource_mso_schema_template_contract.go
@@ -524,7 +524,11 @@ func resourceMSOTemplateContractRead(d *schema.ResourceData, m interface{}) erro
 	if err != nil {
 		return errorForObjectNotFound(err, d.Id(), schemaCont, d)
 	}
-	setContractFromSchema(d, schemaCont, schemaId, templateName, contractName)
+	err = setContractFromSchema(d, schemaCont, schemaId, templateName, contractName)
+	if err != nil {
+		d.SetId("")
+		log.Printf("[DEBUG] Resetting Id due to setContractFromSchema returning '%s'", err)
+	}
 	log.Printf("[DEBUG] %s: Read finished successfully", d.Id())
 	return nil
 }