Skip to content

Commit c216852

Browse files
ksamorayksamoray
authored
Merge pull request #1503 from ksamoray/test_test
Fix test failures for v9.0
2 parents 2ccd53e + 879b812 commit c216852

3 files changed

+127
-7
lines changed

‎nsxt/data_source_nsxt_policy_bridge_profile_test.go

+43
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ package nsxt
55

66
import (
77
"fmt"
8+
"github.com/vmware/vsphere-automation-sdk-go/lib/vapi/std/errors"
9+
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx"
810
"testing"
911

1012
"github.com/google/uuid"
1113
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1214
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1315
ep "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/sites/enforcement_points"
16+
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/sites/enforcement_points/edge_clusters"
1417
"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
1518
)
1619

@@ -42,6 +45,39 @@ func TestAccDataSourceNsxtPolicyBridgeProfile_basic(t *testing.T) {
4245
})
4346
}
4447

48+
func getEdgeClusterPath() (string, error) {
49+
connector, err := testAccGetPolicyConnector()
50+
if err != nil {
51+
return "", fmt.Errorf("error during test client initialization: %v", err)
52+
}
53+
client := nsx.NewEdgeClustersClient(connector)
54+
clusterList, err := client.List(nil, nil, nil, nil, nil)
55+
if err != nil {
56+
return "", fmt.Errorf("error during edge cluster list retrieval: %v", err)
57+
}
58+
clusterName := getEdgeClusterName()
59+
clusterID := ""
60+
if clusterList.Results != nil {
61+
for _, objList := range clusterList.Results {
62+
if *objList.DisplayName == clusterName {
63+
clusterID = *objList.Id
64+
break
65+
}
66+
}
67+
}
68+
if clusterID != "" {
69+
enClient := edge_clusters.NewEdgeNodesClient(connector)
70+
objList, err := enClient.List(defaultSite, defaultEnforcementPoint, clusterID, nil, nil, nil, nil, nil, nil)
71+
if err != nil {
72+
return "", fmt.Errorf("error during edge node list retrieval: %v", err)
73+
}
74+
if len(objList.Results) > 0 {
75+
return *objList.Results[0].Path, nil
76+
}
77+
}
78+
return "", errors.NotFound{}
79+
}
80+
4581
func testAccDataSourceNsxtPolicyBridgeProfileCreate(name string) error {
4682
connector, err := testAccGetPolicyConnector()
4783
if err != nil {
@@ -59,6 +95,13 @@ func testAccDataSourceNsxtPolicyBridgeProfileCreate(name string) error {
5995
uuid, _ := uuid.NewRandom()
6096
id := uuid.String()
6197

98+
// Get Edge path
99+
edgePath, err := getEdgeClusterPath()
100+
if err == nil {
101+
obj.EdgePaths = []string{edgePath}
102+
} else if !isNotFoundError(err) {
103+
return err
104+
}
62105
client := ep.NewEdgeBridgeProfilesClient(connector)
63106
err = client.Patch(defaultSite, defaultEnforcementPoint, id, obj)
64107

‎nsxt/resource_nsxt_policy_project_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ func TestAccResourceNsxtPolicyProject_900defaultSecurityProfile(t *testing.T) {
319319
// Create: Set T0, Ext GW connection, Ext IPv4 Block, activate default DFW
320320
Config: testAccNsxtPolicyProjectMinimalistic(),
321321
Check: resource.ComposeTestCheckFunc(
322-
testAccNsxtPolicyProjectGetSecurityProfileNSEnabled(testResourceName, false),
322+
testAccNsxtPolicyProjectGetSecurityProfileNSEnabled(testResourceName, true),
323323
),
324324
},
325325
{

‎nsxt/resource_nsxt_vpc_subnet_test.go

+83-6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ var accTestVpcSubnetUpdateAttributes = map[string]string{
3131
"reserved_ip_ranges": "11.11.50.4-11.11.50.6",
3232
}
3333

34+
var accTestVpcSubnetReservedIPRangeAttributes = map[string]string{
35+
"display_name": getAccTestResourceName(),
36+
"description": "terraform created",
37+
"access_mode": "Isolated",
38+
"enabled": "true",
39+
"ipv4_subnet_size": "32",
40+
"ip_addresses": "10.110.1.0/26",
41+
"reserved_ip_ranges": "10.110.1.3-10.110.1.15",
42+
}
43+
3444
func TestAccResourceNsxtVpcSubnet_basic(t *testing.T) {
3545
testResourceName := "nsxt_vpc_subnet.test"
3646

@@ -116,8 +126,6 @@ func TestAccResourceNsxtVpcSubnet_subnetSize(t *testing.T) {
116126
resource.TestCheckResourceAttr(testResourceName, "ip_addresses.#", "1"),
117127
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.#", "1"),
118128
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.#", "1"),
119-
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.reserved_ip_ranges.#", "1"),
120-
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.reserved_ip_ranges.0", accTestVpcSubnetCreateAttributes["reserved_ip_ranges"]),
121129
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.#", "1"),
122130
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.0.option121.#", "1"),
123131
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.0.other.#", "1"),
@@ -138,8 +146,6 @@ func TestAccResourceNsxtVpcSubnet_subnetSize(t *testing.T) {
138146
resource.TestCheckResourceAttr(testResourceName, "ipv4_subnet_size", accTestVpcSubnetCreateAttributes["ipv4_subnet_size"]),
139147
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.#", "1"),
140148
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.#", "1"),
141-
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.reserved_ip_ranges.#", "1"),
142-
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.reserved_ip_ranges.0", accTestVpcSubnetUpdateAttributes["reserved_ip_ranges"]),
143149
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.#", "1"),
144150
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.0.option121.#", "1"),
145151
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.0.other.#", "1"),
@@ -166,6 +172,44 @@ func TestAccResourceNsxtVpcSubnet_subnetSize(t *testing.T) {
166172
})
167173
}
168174

175+
func TestAccResourceNsxtVpcSubnet_reservedIPRange(t *testing.T) {
176+
testResourceName := "nsxt_vpc_subnet.test"
177+
178+
resource.ParallelTest(t, resource.TestCase{
179+
PreCheck: func() {
180+
testAccPreCheck(t)
181+
testAccOnlyVPC(t)
182+
},
183+
Providers: testAccProviders,
184+
CheckDestroy: func(state *terraform.State) error {
185+
return testAccNsxtVpcSubnetCheckDestroy(state, accTestVpcSubnetUpdateAttributes["display_name"])
186+
},
187+
Steps: []resource.TestStep{
188+
{
189+
Config: testAccNsxtVpcSubnetReservedIPRangeTemplate(true),
190+
Check: resource.ComposeTestCheckFunc(
191+
testAccNsxtVpcSubnetExists(accTestVpcSubnetCreateAttributes["display_name"], testResourceName),
192+
resource.TestCheckResourceAttr(testResourceName, "display_name", accTestVpcSubnetReservedIPRangeAttributes["display_name"]),
193+
resource.TestCheckResourceAttr(testResourceName, "description", accTestVpcSubnetReservedIPRangeAttributes["description"]),
194+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.reserved_ip_ranges.#", "1"),
195+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.reserved_ip_ranges.0", accTestVpcSubnetReservedIPRangeAttributes["reserved_ip_ranges"]),
196+
resource.TestCheckResourceAttr(testResourceName, "ip_addresses.#", "1"),
197+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.#", "1"),
198+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.#", "1"),
199+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.#", "1"),
200+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.0.option121.#", "1"),
201+
resource.TestCheckResourceAttr(testResourceName, "dhcp_config.0.dhcp_server_additional_config.0.options.0.other.#", "1"),
202+
203+
resource.TestCheckResourceAttrSet(testResourceName, "nsx_id"),
204+
resource.TestCheckResourceAttrSet(testResourceName, "path"),
205+
resource.TestCheckResourceAttrSet(testResourceName, "revision"),
206+
resource.TestCheckResourceAttr(testResourceName, "tag.#", "0"),
207+
),
208+
},
209+
},
210+
})
211+
}
212+
169213
func TestAccResourceNsxtVpcSubnet_importBasic(t *testing.T) {
170214
name := getAccTestResourceName()
171215
testResourceName := "nsxt_vpc_subnet.test"
@@ -301,10 +345,9 @@ resource "nsxt_vpc_subnet" "test" {
301345
values = ["abc", "def"]
302346
}
303347
}
304-
reserved_ip_ranges = ["%s"]
305348
}
306349
}
307-
}`, testAccNsxtPolicyMultitenancyContext(), attrMap["display_name"], attrMap["description"], attrMap["ipv4_subnet_size"], attrMap["reserved_ip_ranges"])
350+
}`, testAccNsxtPolicyMultitenancyContext(), attrMap["display_name"], attrMap["description"], attrMap["ipv4_subnet_size"])
308351
}
309352

310353
func testAccNsxtVpcSubnetMinimalisticIsolated() string {
@@ -325,3 +368,37 @@ resource "nsxt_vpc_subnet" "test" {
325368
access_mode = "Public"
326369
}`, testAccNsxtPolicyMultitenancyContext(), accTestVpcSubnetUpdateAttributes["display_name"])
327370
}
371+
372+
func testAccNsxtVpcSubnetReservedIPRangeTemplate(createFlow bool) string {
373+
attrMap := accTestVpcSubnetReservedIPRangeAttributes
374+
375+
return fmt.Sprintf(`
376+
resource "nsxt_vpc_subnet" "test" {
377+
%s
378+
display_name = "%s"
379+
description = "%s"
380+
ip_addresses = ["%s"]
381+
382+
access_mode = "Public"
383+
384+
dhcp_config {
385+
mode = "DHCP_SERVER"
386+
387+
dhcp_server_additional_config {
388+
options {
389+
option121 {
390+
static_route {
391+
network = "2.1.1.0/24"
392+
next_hop = "2.3.1.3"
393+
}
394+
}
395+
other {
396+
code = "119"
397+
values = ["abc", "def"]
398+
}
399+
}
400+
reserved_ip_ranges = ["%s"]
401+
}
402+
}
403+
}`, testAccNsxtPolicyMultitenancyContext(), attrMap["display_name"], attrMap["description"], attrMap["ip_addresses"], attrMap["reserved_ip_ranges"])
404+
}

0 commit comments

Comments
 (0)