Skip to content

Commit 961b1e6

Browse files
ksamorayksamoray
committed
Add more tests
Signed-off-by: Kobi Samoray <[email protected]>
1 parent 15985a9 commit 961b1e6

File tree

59 files changed

+1272
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1272
-8
lines changed

Diff for: ‎nsxt/data_source_nsxt_policy_dhcp_server_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ func TestAccDataSourceNsxtPolicyDhcpServer_multitenancy(t *testing.T) {
2121
})
2222
}
2323

24+
func TestAccDataSourceNsxtPolicyDhcpServer_multitenancyProvider(t *testing.T) {
25+
testAccDataSourceNsxtPolicyDhcpServerBasic(t, false, func() {
26+
testAccPreCheck(t)
27+
testAccOnlyMultitenancyProvider(t)
28+
})
29+
}
30+
2431
func testAccDataSourceNsxtPolicyDhcpServerBasic(t *testing.T, withContext bool, preCheck func()) {
2532
name := getAccTestDataSourceName()
2633
testResourceName := "data.nsxt_policy_dhcp_server.test"

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_locale_service_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ func TestAccDataSourceNsxtPolicyGatewayLocaleService_multitenancy(t *testing.T)
8888
})
8989
}
9090

91+
func TestAccDataSourceNsxtPolicyGatewayLocaleService_multitenancyProvider(t *testing.T) {
92+
testAccDataSourceNsxtPolicyGatewayLocaleServiceDefault(t, false, func() {
93+
testAccPreCheck(t)
94+
testAccOnlyMultitenancyProvider(t)
95+
})
96+
}
97+
9198
func testAccNsxtPolicyGatewayLocaleServiceTemplate(name string, withContext bool) string {
9299
context := ""
93100
if withContext {

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_policy_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ func TestAccDataSourceNsxtPolicyGatewayPolicy_multitenancy(t *testing.T) {
2222
})
2323
}
2424

25+
func TestAccDataSourceNsxtPolicyGatewayPolicy_multitenancyProvider(t *testing.T) {
26+
testAccDataSourceNsxtPolicyGatewayPolicyBasic(t, false, func() {
27+
testAccPreCheck(t)
28+
testAccOnlyMultitenancyProvider(t)
29+
})
30+
}
31+
2532
func testAccDataSourceNsxtPolicyGatewayPolicyBasic(t *testing.T, withContext bool, preCheck func()) {
2633
name := getAccTestDataSourceName()
2734
category := "LocalGatewayRules"

Diff for: ‎nsxt/data_source_nsxt_policy_gateway_qos_profile_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ func TestAccDataSourceNsxtPolicyGatewayQosProfile_multitenancy(t *testing.T) {
3030
})
3131
}
3232

33+
func TestAccDataSourceNsxtPolicyGatewayQosProfile_multitenancyProvider(t *testing.T) {
34+
testAccDataSourceNsxtPolicyGatewayQosProfileBasic(t, false, func() {
35+
testAccPreCheck(t)
36+
testAccOnlyMultitenancyProvider(t)
37+
})
38+
}
39+
3340
func testAccDataSourceNsxtPolicyGatewayQosProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3441
name := getAccTestDataSourceName()
3542
testResourceName := "data.nsxt_policy_gateway_qos_profile.test"

Diff for: ‎nsxt/data_source_nsxt_policy_group_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ func TestAccDataSourceNsxtPolicyGroup_multitenancy(t *testing.T) {
2727
})
2828
}
2929

30+
func TestAccDataSourceNsxtPolicyGroup_multitenancyProvider(t *testing.T) {
31+
testAccDataSourceNsxtPolicyGroupBasic(t, false, func() {
32+
testAccPreCheck(t)
33+
testAccOnlyMultitenancyProvider(t)
34+
})
35+
}
36+
3037
func testAccDataSourceNsxtPolicyGroupBasic(t *testing.T, withContext bool, preCheck func()) {
3138
name := getAccTestDataSourceName()
3239
domain := "default"

Diff for: ‎nsxt/data_source_nsxt_policy_intrusion_service_profile_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ func TestAccDataSourceNsxtPolicyIntrusionServiceProfile_multitenancy(t *testing.
4949
})
5050
}
5151

52+
func TestAccDataSourceNsxtPolicyIntrusionServiceProfile_multitenancyProvider(t *testing.T) {
53+
testAccDataSourceNsxtPolicyIntrusionServiceProfileBasic(t, false, func() {
54+
testAccPreCheck(t)
55+
testAccOnlyMultitenancyProvider(t)
56+
})
57+
}
58+
5259
func testAccDataSourceNsxtPolicyIntrusionServiceProfileBasic(t *testing.T, withContext bool, preCheck func()) {
5360
name := getAccTestResourceName()
5461
testResourceName := "data.nsxt_policy_intrusion_service_profile.test"

Diff for: ‎nsxt/data_source_nsxt_policy_ip_block_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ func TestAccDataSourceNsxtPolicyIpBlock_multitenancy(t *testing.T) {
2929
})
3030
}
3131

32+
func TestAccDataSourceNsxtPolicyIpBlock_multitenancyProvider(t *testing.T) {
33+
testAccDataSourceNsxtPolicyIPBlockBasic(t, false, func() {
34+
testAccPreCheck(t)
35+
testAccOnlyMultitenancyProvider(t)
36+
})
37+
}
38+
3239
func testAccDataSourceNsxtPolicyIPBlockBasic(t *testing.T, withContext bool, preCheck func()) {
3340
name := getAccTestDataSourceName()
3441
testResourceName := "data.nsxt_policy_ip_block.test"

Diff for: ‎nsxt/data_source_nsxt_policy_ip_pool_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ func TestAccDataSourceNsxtPolicyIpPool_multitenancy(t *testing.T) {
2828
})
2929
}
3030

31+
func TestAccDataSourceNsxtPolicyIpPool_multitenancyProvider(t *testing.T) {
32+
testAccDataSourceNsxtPolicyIPPoolBasic(t, false, func() {
33+
testAccPreCheck(t)
34+
testAccOnlyMultitenancyProvider(t)
35+
})
36+
}
37+
3138
func testAccDataSourceNsxtPolicyIPPoolBasic(t *testing.T, withContext bool, preCheck func()) {
3239
name := getAccTestDataSourceName()
3340
testResourceName := "data.nsxt_policy_ip_pool.test"

Diff for: ‎nsxt/data_source_nsxt_policy_ipv6_dad_profile_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ func TestAccDataSourceNsxtPolicyIpv6DadProfile_multitenancy(t *testing.T) {
2727
})
2828
}
2929

30+
func TestAccDataSourceNsxtPolicyIpv6DadProfile_multitenancyProvider(t *testing.T) {
31+
testAccDataSourceNsxtPolicyIpv6DadProfileBasic(t, false, func() {
32+
testAccPreCheck(t)
33+
testAccOnlyMultitenancyProvider(t)
34+
})
35+
}
36+
3037
func testAccDataSourceNsxtPolicyIpv6DadProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3138
name := getAccTestDataSourceName()
3239
testResourceName := "data.nsxt_policy_ipv6_dad_profile.test"

Diff for: ‎nsxt/data_source_nsxt_policy_ipv6_ndra_profile_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ func TestAccDataSourceNsxtPolicyIpv6NdraProfile_multitenancy(t *testing.T) {
2727
})
2828
}
2929

30+
func TestAccDataSourceNsxtPolicyIpv6NdraProfile_multitenancyProvider(t *testing.T) {
31+
testAccDataSourceNsxtPolicyIpv6NdraProfileBasic(t, false, func() {
32+
testAccPreCheck(t)
33+
testAccOnlyMultitenancyProvider(t)
34+
})
35+
}
36+
3037
func testAccDataSourceNsxtPolicyIpv6NdraProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3138
name := getAccTestDataSourceName()
3239
testResourceName := "data.nsxt_policy_ipv6_ndra_profile.test"

Diff for: ‎nsxt/data_source_nsxt_policy_mac_discovery_profile_test.go

+28-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,29 @@ func TestAccDataSourceNsxtPolicyMacDiscoveryProfile_multitenancy(t *testing.T) {
6464
Providers: testAccProviders,
6565
Steps: []resource.TestStep{
6666
{
67-
Config: testAccNsxtPolicyMacDiscoveryProfileMultitenancyTemplate(name),
67+
Config: testAccNsxtPolicyMacDiscoveryProfileMultitenancyTemplate(name, true),
68+
Check: resource.ComposeTestCheckFunc(
69+
resource.TestCheckResourceAttr(testResourceName, "display_name", name),
70+
resource.TestCheckResourceAttrSet(testResourceName, "path"),
71+
),
72+
},
73+
},
74+
})
75+
}
76+
77+
func TestAccDataSourceNsxtPolicyMacDiscoveryProfile_multitenancyProvider(t *testing.T) {
78+
name := getAccTestResourceName()
79+
testResourceName := "data.nsxt_policy_mac_discovery_profile.test"
80+
81+
resource.ParallelTest(t, resource.TestCase{
82+
PreCheck: func() {
83+
testAccPreCheck(t)
84+
testAccOnlyMultitenancyProvider(t)
85+
},
86+
Providers: testAccProviders,
87+
Steps: []resource.TestStep{
88+
{
89+
Config: testAccNsxtPolicyMacDiscoveryProfileMultitenancyTemplate(name, false),
6890
Check: resource.ComposeTestCheckFunc(
6991
resource.TestCheckResourceAttr(testResourceName, "display_name", name),
7092
resource.TestCheckResourceAttrSet(testResourceName, "path"),
@@ -81,8 +103,11 @@ data "nsxt_policy_mac_discovery_profile" "test" {
81103
}`, name)
82104
}
83105

84-
func testAccNsxtPolicyMacDiscoveryProfileMultitenancyTemplate(name string) string {
85-
context := testAccNsxtPolicyMultitenancyContext()
106+
func testAccNsxtPolicyMacDiscoveryProfileMultitenancyTemplate(name string, withContext bool) string {
107+
context := ""
108+
if withContext {
109+
context = testAccNsxtPolicyMultitenancyContext()
110+
}
86111
return fmt.Sprintf(`
87112
resource "nsxt_policy_mac_discovery_profile" "test" {
88113
%s

Diff for: ‎nsxt/data_source_nsxt_policy_qos_profile_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ func TestAccDataSourceNsxtPolicyQosProfile_multitenancy(t *testing.T) {
2727
})
2828
}
2929

30+
func TestAccDataSourceNsxtPolicyQosProfile_multitenancyProvider(t *testing.T) {
31+
testAccDataSourceNsxtPolicyQosProfileBasic(t, false, func() {
32+
testAccPreCheck(t)
33+
testAccOnlyMultitenancyProvider(t)
34+
})
35+
}
36+
3037
func testAccDataSourceNsxtPolicyQosProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3138
name := getAccTestDataSourceName()
3239
testResourceName := "data.nsxt_policy_qos_profile.test"

Diff for: ‎nsxt/data_source_nsxt_policy_realization_info_test.go

+15
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ func TestAccDataSourceNsxtPolicyRealizationInfo_tier1DataSource_multitenancy(t *
2525
})
2626
}
2727

28+
func TestAccDataSourceNsxtPolicyRealizationInfo_tier1DataSource_multitenancyProvider(t *testing.T) {
29+
testAccDataSourceNsxtPolicyRealizationInfoTier1DataSource(t, false, func() {
30+
testAccPreCheck(t)
31+
testAccOnlyMultitenancyProvider(t)
32+
})
33+
}
34+
2835
func testAccDataSourceNsxtPolicyRealizationInfoTier1DataSource(t *testing.T, withContext bool, preCheck func()) {
2936
resourceDataType := "nsxt_policy_tier1_gateway"
3037
resourceName := getAccTestDataSourceName()
@@ -117,6 +124,14 @@ func TestAccDataSourceNsxtPolicyRealizationInfo_tier1Resource_multitenancy(t *te
117124
})
118125
}
119126

127+
func TestAccDataSourceNsxtPolicyRealizationInfo_tier1Resource_multitenancyProvider(t *testing.T) {
128+
testAccDataSourceNsxtPolicyRealizationInfoTier1Resource(t, false, func() {
129+
testAccPreCheck(t)
130+
testAccNSXVersion(t, "3.0.0")
131+
testAccOnlyMultitenancyProvider(t)
132+
})
133+
}
134+
120135
func testAccDataSourceNsxtPolicyRealizationInfoTier1Resource(t *testing.T, withContext bool, preCheck func()) {
121136
resourceType := "nsxt_policy_tier1_gateway"
122137
resourceName := getAccTestDataSourceName()

Diff for: ‎nsxt/data_source_nsxt_policy_security_policy_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ func TestAccDataSourceNsxtPolicySecurityPolicy_multitenancy(t *testing.T) {
2424
})
2525
}
2626

27+
func TestAccDataSourceNsxtPolicySecurityPolicy_multitenancyProvider(t *testing.T) {
28+
testAccDataSourceNsxtPolicySecurityPolicyBasic(t, false, func() {
29+
testAccPreCheck(t)
30+
testAccOnlyMultitenancyProvider(t)
31+
})
32+
}
33+
2734
func testAccDataSourceNsxtPolicySecurityPolicyBasic(t *testing.T, withContext bool, preCheck func()) {
2835
name := getAccTestDataSourceName()
2936
category := "Application"

Diff for: ‎nsxt/data_source_nsxt_policy_segment_realization_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ func TestAccDataSourceNsxtPolicySegmentRealization_multitenancy(t *testing.T) {
5252
})
5353
}
5454

55+
func TestAccDataSourceNsxtPolicySegmentRealization_multitenancyProvider(t *testing.T) {
56+
testAccDataSourceNsxtPolicySegmentRealization(t, false, false, func() {
57+
testAccPreCheck(t)
58+
testAccOnlyMultitenancyProvider(t)
59+
})
60+
}
61+
5562
func testAccNsxtPolicySegmentRealizationTemplate(vlan, withContext bool) string {
5663
resource := "nsxt_policy_segment"
5764
tz := getOverlayTransportZoneName()

Diff for: ‎nsxt/data_source_nsxt_policy_segment_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ func TestAccDataSourceNsxtPolicySegment_multitenancy(t *testing.T) {
2828
})
2929
}
3030

31+
func TestAccDataSourceNsxtPolicySegment_multitenancyProvider(t *testing.T) {
32+
testAccDataSourceNsxtPolicySegmentBasic(t, false, func() {
33+
testAccPreCheck(t)
34+
testAccOnlyMultitenancyProvider(t)
35+
})
36+
}
37+
3138
func testAccDataSourceNsxtPolicySegmentBasic(t *testing.T, withContext bool, preCheck func()) {
3239
name := getAccTestDataSourceName()
3340
testResourceName := "data.nsxt_policy_segment.test"

Diff for: ‎nsxt/data_source_nsxt_policy_tier1_gateway_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ func TestAccDataSourceNsxtPolicyTier1Gateway_multitenancy(t *testing.T) {
2727
})
2828
}
2929

30+
func TestAccDataSourceNsxtPolicyTier1Gateway_multitenancyProvider(t *testing.T) {
31+
testAccDataSourceNsxtPolicyTier1GatewayBasic(t, false, func() {
32+
testAccPreCheck(t)
33+
testAccOnlyMultitenancyProvider(t)
34+
})
35+
}
36+
3037
func testAccDataSourceNsxtPolicyTier1GatewayBasic(t *testing.T, withContext bool, preCheck func()) {
3138
routerName := getAccTestDataSourceName()
3239
testResourceName := "data.nsxt_policy_tier1_gateway.test"

Diff for: ‎nsxt/data_source_nsxt_policy_vm_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ func TestAccDataSourceNsxtPolicyVM_multitenancy(t *testing.T) {
2727
testAccEnvDefined(t, "NSXT_TEST_VM_NAME")
2828
})
2929
}
30+
func TestAccDataSourceNsxtPolicyVM_multitenancyProvider(t *testing.T) {
31+
testAccDataSourceNsxtPolicyVMBasic(t, false, func() {
32+
testAccPreCheck(t)
33+
testAccOnlyMultitenancyProvider(t)
34+
testAccEnvDefined(t, "NSXT_TEST_VM_ID")
35+
testAccEnvDefined(t, "NSXT_TEST_VM_NAME")
36+
})
37+
}
3038
func testAccDataSourceNsxtPolicyVMBasic(t *testing.T, withContext bool, preCheck func()) {
3139
testResourceName := "data.nsxt_policy_vm.test"
3240

Diff for: ‎nsxt/data_source_nsxt_policy_vms_test.go

+9-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,21 @@ func TestAccDataSourceNsxtPolicyVMs_basic(t *testing.T) {
1919
}
2020

2121
func TestAccDataSourceNsxtPolicyVMs_multitenancy(t *testing.T) {
22-
testAccDataSourceNsxtPolicyVMsBasic(t, false, func() {
22+
testAccDataSourceNsxtPolicyVMsBasic(t, true, func() {
2323
testAccPreCheck(t)
2424
testAccOnlyMultitenancy(t)
2525
testAccEnvDefined(t, "NSXT_TEST_VM_NAME")
2626
})
2727
}
2828

29+
func TestAccDataSourceNsxtPolicyVMs_multitenancyProvider(t *testing.T) {
30+
testAccDataSourceNsxtPolicyVMsBasic(t, false, func() {
31+
testAccPreCheck(t)
32+
testAccOnlyMultitenancyProvider(t)
33+
testAccEnvDefined(t, "NSXT_TEST_VM_NAME")
34+
})
35+
}
36+
2937
func testAccDataSourceNsxtPolicyVMsBasic(t *testing.T, withContext bool, preCheck func()) {
3038
testResourceName := "data.nsxt_policy_vms.test"
3139
checkDataSourceName := "data.nsxt_policy_vm.check"

Diff for: ‎nsxt/data_source_policy_vpc_test.go

+39-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,40 @@ func TestAccDataSourceNsxtPolicyVPC_basic_multitenancy(t *testing.T) {
3535
t.Error(err)
3636
}
3737
},
38-
Config: testAccNsxtPolicyVPCReadTemplate(name),
38+
Config: testAccNsxtPolicyVPCReadTemplate(name, true),
39+
Check: resource.ComposeTestCheckFunc(
40+
resource.TestCheckResourceAttr(testResourceName, "display_name", name),
41+
resource.TestCheckResourceAttr(testResourceName, "description", name),
42+
resource.TestCheckResourceAttrSet(testResourceName, "path"),
43+
resource.TestCheckResourceAttrSet(testResourceName, "short_id"),
44+
),
45+
},
46+
},
47+
})
48+
}
49+
50+
func TestAccDataSourceNsxtPolicyVPC_basic_multitenancyProvider(t *testing.T) {
51+
name := getAccTestDataSourceName()
52+
testResourceName := "data.nsxt_policy_vpc.test"
53+
54+
resource.ParallelTest(t, resource.TestCase{
55+
PreCheck: func() {
56+
testAccOnlyMultitenancyProvider(t)
57+
testAccPreCheck(t)
58+
testAccNSXVersion(t, "4.1.2")
59+
},
60+
Providers: testAccProviders,
61+
CheckDestroy: func(state *terraform.State) error {
62+
return testAccDataSourceNsxtPolicyVPCDeleteByName(name)
63+
},
64+
Steps: []resource.TestStep{
65+
{
66+
PreConfig: func() {
67+
if err := testAccDataSourceNsxtPolicyVPCCreate(name); err != nil {
68+
t.Error(err)
69+
}
70+
},
71+
Config: testAccNsxtPolicyVPCReadTemplate(name, false),
3972
Check: resource.ComposeTestCheckFunc(
4073
resource.TestCheckResourceAttr(testResourceName, "display_name", name),
4174
resource.TestCheckResourceAttr(testResourceName, "description", name),
@@ -113,8 +146,11 @@ func testAccDataSourceNsxtPolicyVPCDeleteByName(name string) error {
113146
return fmt.Errorf("error while deleting VPC '%s': resource not found", name)
114147
}
115148

116-
func testAccNsxtPolicyVPCReadTemplate(name string) string {
117-
context := testAccNsxtPolicyMultitenancyContext()
149+
func testAccNsxtPolicyVPCReadTemplate(name string, withContext bool) string {
150+
context := ""
151+
if withContext {
152+
context = testAccNsxtPolicyMultitenancyContext()
153+
}
118154
return fmt.Sprintf(`
119155
data "nsxt_policy_ip_block" "test" {
120156
%s

Diff for: ‎nsxt/resource_nsxt_policy_context_profile_custom_attribute_test.go

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ func TestAccResourceNsxtPolicyContextProfileCustomAttribute_multitenancy(t *test
3030
})
3131
}
3232

33+
func TestAccResourceNsxtPolicyContextProfileCustomAttribute_multitenancyProvider(t *testing.T) {
34+
testAccResourceNsxtPolicyContextProfileCustomAttributeBasic(t, false, func() {
35+
testAccPreCheck(t)
36+
testAccOnlyMultitenancyProvider(t)
37+
})
38+
}
39+
3340
func testAccResourceNsxtPolicyContextProfileCustomAttributeBasic(t *testing.T, withContext bool, preCheck func()) {
3441
testResourceName := "nsxt_policy_context_profile_custom_attribute.test"
3542

0 commit comments

Comments
 (0)