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.

Sign up for GitHub

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

Ensure ordered list when preferred edges are set #829

Merged
merged 1 commit into from
Jan 26, 2023
Merged

Ensure ordered list when preferred edges are set #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions nsxt/gateway_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func getPolicyLocaleServiceSchema(isTier1 bool) *schema.Schema {
ValidateFunc: validatePolicyPath(),
},
"preferred_edge_paths": {
Type: schema.TypeSet,
Type: schema.TypeList,
Description: "Paths of specific edge nodes",
Optional: true,
Elem: getElemPolicyPathSchema(),
Expand Down Expand Up @@ -300,7 +300,7 @@ func initGatewayLocaleServices(d *schema.ResourceData, connector *client.RestCon
for _, service := range services {
cfg := service.(map[string]interface{})
edgeClusterPath := cfg["edge_cluster_path"].(string)
edgeNodes := interface2StringList(cfg["preferred_edge_paths"].(*schema.Set).List())
edgeNodes := interfaceListToStringList(cfg["preferred_edge_paths"].([]interface{}))
path := cfg["path"].(string)

var serviceID string
Expand Down
5 changes: 5 additions & 0 deletions nsxt/resource_nsxt_policy_tier0_gateway_gm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ data "nsxt_policy_edge_cluster" "ec_site2" {
data "nsxt_policy_edge_node" "en_site1" {
edge_cluster_path = data.nsxt_policy_edge_cluster.ec_site1.path
member_index = 0
}

data "nsxt_policy_edge_node" "en_site2" {
edge_cluster_path = data.nsxt_policy_edge_cluster.ec_site1.path
member_index = 1
}`, getTestSiteName(), getTestAnotherSiteName())
}

Expand Down
6 changes: 4 additions & 2 deletions nsxt/resource_nsxt_policy_tier1_gateway_gm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ func TestAccResourceNsxtPolicyTier1Gateway_globalManagerWithQos(t *testing.T) {
resource.TestCheckResourceAttr(testResourceName, "route_advertisement_types.#", "2"),
resource.TestCheckResourceAttr(testResourceName, "route_advertisement_rule.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "locale_service.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "locale_service.0.preferred_edge_paths.#", "2"),
resource.TestCheckResourceAttr(testResourceName, "intersite_config.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "intersite_config.0.transit_subnet", testAccGmGatewayIntersiteSubnet),
resource.TestCheckResourceAttrSet(testResourceName, "intersite_config.0.primary_site_path"),
Expand Down Expand Up @@ -163,6 +164,7 @@ func TestAccResourceNsxtPolicyTier1Gateway_globalManagerNoSubnet(t *testing.T) {
resource.TestCheckResourceAttr(testResourceName, "route_advertisement_types.#", "2"),
resource.TestCheckResourceAttr(testResourceName, "route_advertisement_rule.#", "0"),
resource.TestCheckResourceAttr(testResourceName, "locale_service.#", "1"),
resource.TestCheckResourceAttr(testResourceName, "locale_service.0.preferred_edge_paths.#", "2"),
resource.TestCheckResourceAttr(testResourceName, "intersite_config.#", "1"),
resource.TestCheckResourceAttrSet(testResourceName, "intersite_config.0.transit_subnet"),
resource.TestCheckResourceAttrSet(testResourceName, "intersite_config.0.primary_site_path"),
Expand Down Expand Up @@ -203,7 +205,7 @@ resource "nsxt_policy_tier1_gateway" "test" {

locale_service {
edge_cluster_path = data.nsxt_policy_edge_cluster.ec_site1.path
preferred_edge_paths = [data.nsxt_policy_edge_node.en_site1.path]
preferred_edge_paths = [data.nsxt_policy_edge_node.en_site2.path, data.nsxt_policy_edge_node.en_site1.path]
}

intersite_config {
Expand Down Expand Up @@ -261,7 +263,7 @@ resource "nsxt_policy_tier1_gateway" "test" {

locale_service {
edge_cluster_path = data.nsxt_policy_edge_cluster.ec_site1.path
preferred_edge_paths = [data.nsxt_policy_edge_node.en_site1.path]
preferred_edge_paths = [data.nsxt_policy_edge_node.en_site1.path, data.nsxt_policy_edge_node.en_site2.path]
}

intersite_config {
Expand Down