Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[minor_changes] Fixes error generation for site service graph. #284

Merged
merged 1 commit into from
Jul 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions mso/resource_mso_schema_site_service_graph.go
Original file line number Diff line number Diff line change
@@ -112,38 +112,43 @@ func resourceMSOSchemaSiteServiceGraph() *schema.Resource {
}

sgCont, _, err := getTemplateServiceGraphCont(cont, templateName.(string), graphName.(string))
if err != nil {
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
}

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
} 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)
}

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"])
/* 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
},
}
}