Skip to content

Commit ee8d47f

Browse files
ksamorayksamoray
committed
Run multitenancy tests in LM setups
DO not skip multitenancy tests in LM environments, given that project id is set Signed-off-by: Kobi Samoray <[email protected]>
1 parent 32340df commit ee8d47f

18 files changed

+254
-175
lines changed

‎nsxt/data_source_nsxt_policy_dhcp_server_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func testAccDataSourceNsxtPolicyDhcpServerBasic(t *testing.T, withContext bool,
4444
func testAccNsxtPolicyDhcpServerReadTemplate(name string, withContext bool) string {
4545
context := ""
4646
if withContext {
47-
context = testAccNsxtPolicyMultitenancyContext()
47+
context = testAccNsxtProjectContext()
4848
}
4949
return fmt.Sprintf(`
5050
resource "nsxt_policy_dhcp_server" "test" {

‎nsxt/data_source_nsxt_policy_gateway_locale_service_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func TestAccDataSourceNsxtPolicyGatewayLocaleService_multitenancy(t *testing.T)
9191
func testAccNsxtPolicyGatewayLocaleServiceTemplate(name string, withContext bool) string {
9292
context := ""
9393
if withContext {
94-
context = testAccNsxtPolicyMultitenancyContext()
94+
context = testAccNsxtProjectContext()
9595
}
9696
return fmt.Sprintf(`
9797
data "nsxt_policy_edge_cluster" "test" {

‎nsxt/data_source_nsxt_policy_ip_pool_test.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package nsxt
55

66
import (
77
"fmt"
8+
tf_api "github.com/vmware/terraform-provider-nsxt/api/utl"
89
"testing"
910

1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -31,17 +32,21 @@ func TestAccDataSourceNsxtPolicyIpPool_multitenancy(t *testing.T) {
3132
func testAccDataSourceNsxtPolicyIPPoolBasic(t *testing.T, withContext bool, preCheck func()) {
3233
name := getAccTestDataSourceName()
3334
testResourceName := "data.nsxt_policy_ip_pool.test"
35+
var clientType tf_api.ClientType = tf_api.Local
36+
if withContext {
37+
clientType = tf_api.Multitenancy
38+
}
3439

3540
resource.ParallelTest(t, resource.TestCase{
3641
PreCheck: preCheck,
3742
Providers: testAccProviders,
3843
CheckDestroy: func(state *terraform.State) error {
39-
return testAccDataSourceNsxtPolicyIPPoolDeleteByName(name)
44+
return testAccDataSourceNsxtPolicyIPPoolDeleteByName(name, clientType)
4045
},
4146
Steps: []resource.TestStep{
4247
{
4348
PreConfig: func() {
44-
if err := testAccDataSourceNsxtPolicyIPPoolCreate(name); err != nil {
49+
if err := testAccDataSourceNsxtPolicyIPPoolCreate(name, clientType); err != nil {
4550
t.Error(err)
4651
}
4752
},
@@ -57,12 +62,12 @@ func testAccDataSourceNsxtPolicyIPPoolBasic(t *testing.T, withContext bool, preC
5762
})
5863
}
5964

60-
func testAccDataSourceNsxtPolicyIPPoolCreate(name string) error {
65+
func testAccDataSourceNsxtPolicyIPPoolCreate(name string, clientType tf_api.ClientType) error {
6166
connector, err := testAccGetPolicyConnector()
6267
if err != nil {
6368
return fmt.Errorf("Error during test client initialization: %v", err)
6469
}
65-
client := infra.NewIpPoolsClient(testAccGetSessionContext(), connector)
70+
client := infra.NewIpPoolsClient(testAccGetContextByType(clientType), connector)
6671
if client == nil {
6772
return policyResourceNotSupportedError()
6873
}
@@ -84,12 +89,12 @@ func testAccDataSourceNsxtPolicyIPPoolCreate(name string) error {
8489
return nil
8590
}
8691

87-
func testAccDataSourceNsxtPolicyIPPoolDeleteByName(name string) error {
92+
func testAccDataSourceNsxtPolicyIPPoolDeleteByName(name string, clientType tf_api.ClientType) error {
8893
connector, err := testAccGetPolicyConnector()
8994
if err != nil {
9095
return fmt.Errorf("Error during test client initialization: %v", err)
9196
}
92-
client := infra.NewIpPoolsClient(testAccGetSessionContext(), connector)
97+
client := infra.NewIpPoolsClient(testAccGetContextByType(clientType), connector)
9398
if client == nil {
9499
return policyResourceNotSupportedError()
95100
}
@@ -114,7 +119,7 @@ func testAccDataSourceNsxtPolicyIPPoolDeleteByName(name string) error {
114119
func testAccNsxtPolicyIPPoolReadTemplate(name string, withContext bool) string {
115120
context := ""
116121
if withContext {
117-
context = testAccNsxtPolicyMultitenancyContext()
122+
context = testAccNsxtProjectContext()
118123
}
119124
return fmt.Sprintf(`
120125
data "nsxt_policy_ip_pool" "test" {

‎nsxt/data_source_nsxt_policy_ipv6_dad_profile_test.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package nsxt
55

66
import (
77
"fmt"
8+
tf_api "github.com/vmware/terraform-provider-nsxt/api/utl"
89
"testing"
910

1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -30,17 +31,21 @@ func TestAccDataSourceNsxtPolicyIpv6DadProfile_multitenancy(t *testing.T) {
3031
func testAccDataSourceNsxtPolicyIpv6DadProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3132
name := getAccTestDataSourceName()
3233
testResourceName := "data.nsxt_policy_ipv6_dad_profile.test"
34+
var clientType tf_api.ClientType = tf_api.Local
35+
if withContext {
36+
clientType = tf_api.Multitenancy
37+
}
3338

3439
resource.ParallelTest(t, resource.TestCase{
3540
PreCheck: preCheck,
3641
Providers: testAccProviders,
3742
CheckDestroy: func(state *terraform.State) error {
38-
return testAccDataSourceNsxtPolicyIpv6DadProfileDeleteByName(name)
43+
return testAccDataSourceNsxtPolicyIpv6DadProfileDeleteByName(name, clientType)
3944
},
4045
Steps: []resource.TestStep{
4146
{
4247
PreConfig: func() {
43-
if err := testAccDataSourceNsxtPolicyIpv6DadProfileCreate(name); err != nil {
48+
if err := testAccDataSourceNsxtPolicyIpv6DadProfileCreate(name, clientType); err != nil {
4449
t.Error(err)
4550
}
4651
},
@@ -55,7 +60,7 @@ func testAccDataSourceNsxtPolicyIpv6DadProfileBasic(t *testing.T, withContext bo
5560
})
5661
}
5762

58-
func testAccDataSourceNsxtPolicyIpv6DadProfileCreate(name string) error {
63+
func testAccDataSourceNsxtPolicyIpv6DadProfileCreate(name string, clientType tf_api.ClientType) error {
5964
connector, err := testAccGetPolicyConnector()
6065
if err != nil {
6166
return fmt.Errorf("Error during test client initialization: %v", err)
@@ -70,7 +75,7 @@ func testAccDataSourceNsxtPolicyIpv6DadProfileCreate(name string) error {
7075

7176
// Generate a random ID for the resource
7277
id := newUUID()
73-
client := infra.NewIpv6DadProfilesClient(testAccGetSessionContext(), connector)
78+
client := infra.NewIpv6DadProfilesClient(testAccGetContextByType(clientType), connector)
7479
if client == nil {
7580
return policyResourceNotSupportedError()
7681
}
@@ -82,13 +87,13 @@ func testAccDataSourceNsxtPolicyIpv6DadProfileCreate(name string) error {
8287
return nil
8388
}
8489

85-
func testAccDataSourceNsxtPolicyIpv6DadProfileDeleteByName(name string) error {
90+
func testAccDataSourceNsxtPolicyIpv6DadProfileDeleteByName(name string, clientType tf_api.ClientType) error {
8691
connector, err := testAccGetPolicyConnector()
8792
if err != nil {
8893
return fmt.Errorf("Error during test client initialization: %v", err)
8994
}
9095
// Find the object by name and delete it
91-
client := infra.NewIpv6DadProfilesClient(testAccGetSessionContext(), connector)
96+
client := infra.NewIpv6DadProfilesClient(testAccGetContextByType(clientType), connector)
9297
if client == nil {
9398
return policyResourceNotSupportedError()
9499
}
@@ -113,7 +118,7 @@ func testAccDataSourceNsxtPolicyIpv6DadProfileDeleteByName(name string) error {
113118
func testAccNsxtPolicyIpv6DadProfileReadTemplate(name string, withContext bool) string {
114119
context := ""
115120
if withContext {
116-
context = testAccNsxtPolicyMultitenancyContext()
121+
context = testAccNsxtProjectContext()
117122
}
118123
return fmt.Sprintf(`
119124
data "nsxt_policy_ipv6_dad_profile" "test" {

‎nsxt/data_source_nsxt_policy_ipv6_ndra_profile_test.go‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package nsxt
55

66
import (
77
"fmt"
8+
tf_api "github.com/vmware/terraform-provider-nsxt/api/utl"
89
"testing"
910

1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -30,17 +31,21 @@ func TestAccDataSourceNsxtPolicyIpv6NdraProfile_multitenancy(t *testing.T) {
3031
func testAccDataSourceNsxtPolicyIpv6NdraProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3132
name := getAccTestDataSourceName()
3233
testResourceName := "data.nsxt_policy_ipv6_ndra_profile.test"
34+
var clientType tf_api.ClientType = tf_api.Local
35+
if withContext {
36+
clientType = tf_api.Multitenancy
37+
}
3338

3439
resource.ParallelTest(t, resource.TestCase{
3540
PreCheck: preCheck,
3641
Providers: testAccProviders,
3742
CheckDestroy: func(state *terraform.State) error {
38-
return testAccDataSourceNsxtPolicyIpv6NdraProfileDeleteByName(name)
43+
return testAccDataSourceNsxtPolicyIpv6NdraProfileDeleteByName(name, clientType)
3944
},
4045
Steps: []resource.TestStep{
4146
{
4247
PreConfig: func() {
43-
if err := testAccDataSourceNsxtPolicyIpv6NdraProfileCreate(name); err != nil {
48+
if err := testAccDataSourceNsxtPolicyIpv6NdraProfileCreate(name, clientType); err != nil {
4449
t.Error(err)
4550
}
4651
},
@@ -55,7 +60,7 @@ func testAccDataSourceNsxtPolicyIpv6NdraProfileBasic(t *testing.T, withContext b
5560
})
5661
}
5762

58-
func testAccDataSourceNsxtPolicyIpv6NdraProfileCreate(name string) error {
63+
func testAccDataSourceNsxtPolicyIpv6NdraProfileCreate(name string, clientType tf_api.ClientType) error {
5964
connector, err := testAccGetPolicyConnector()
6065
if err != nil {
6166
return fmt.Errorf("Error during test client initialization: %v", err)
@@ -75,7 +80,7 @@ func testAccDataSourceNsxtPolicyIpv6NdraProfileCreate(name string) error {
7580
// Generate a random ID for the resource
7681
id := newUUID()
7782

78-
client := infra.NewIpv6NdraProfilesClient(testAccGetSessionContext(), connector)
83+
client := infra.NewIpv6NdraProfilesClient(testAccGetContextByType(clientType), connector)
7984
if client == nil {
8085
return policyResourceNotSupportedError()
8186
}
@@ -86,13 +91,13 @@ func testAccDataSourceNsxtPolicyIpv6NdraProfileCreate(name string) error {
8691
return nil
8792
}
8893

89-
func testAccDataSourceNsxtPolicyIpv6NdraProfileDeleteByName(name string) error {
94+
func testAccDataSourceNsxtPolicyIpv6NdraProfileDeleteByName(name string, clientType tf_api.ClientType) error {
9095
connector, err := testAccGetPolicyConnector()
9196
if err != nil {
9297
return fmt.Errorf("Error during test client initialization: %v", err)
9398
}
9499
// Find the object by name and delete it
95-
client := infra.NewIpv6NdraProfilesClient(testAccGetSessionContext(), connector)
100+
client := infra.NewIpv6NdraProfilesClient(testAccGetContextByType(clientType), connector)
96101
if client == nil {
97102
return policyResourceNotSupportedError()
98103
}

‎nsxt/data_source_nsxt_policy_qos_profile_test.go‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package nsxt
55

66
import (
77
"fmt"
8+
tf_api "github.com/vmware/terraform-provider-nsxt/api/utl"
89
"testing"
910

1011
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -30,17 +31,21 @@ func TestAccDataSourceNsxtPolicyQosProfile_multitenancy(t *testing.T) {
3031
func testAccDataSourceNsxtPolicyQosProfileBasic(t *testing.T, withContext bool, preCheck func()) {
3132
name := getAccTestDataSourceName()
3233
testResourceName := "data.nsxt_policy_qos_profile.test"
34+
var clientType tf_api.ClientType = tf_api.Local
35+
if withContext {
36+
clientType = tf_api.Multitenancy
37+
}
3338

3439
resource.Test(t, resource.TestCase{
3540
PreCheck: preCheck,
3641
Providers: testAccProviders,
3742
CheckDestroy: func(state *terraform.State) error {
38-
return testAccDataSourceNsxtPolicyQosProfileDeleteByName(name)
43+
return testAccDataSourceNsxtPolicyQosProfileDeleteByName(name, clientType)
3944
},
4045
Steps: []resource.TestStep{
4146
{
4247
PreConfig: func() {
43-
if err := testAccDataSourceNsxtPolicyQosProfileCreate(name); err != nil {
48+
if err := testAccDataSourceNsxtPolicyQosProfileCreate(name, clientType); err != nil {
4449
t.Error(err)
4550
}
4651
},
@@ -55,7 +60,7 @@ func testAccDataSourceNsxtPolicyQosProfileBasic(t *testing.T, withContext bool,
5560
})
5661
}
5762

58-
func testAccDataSourceNsxtPolicyQosProfileCreate(name string) error {
63+
func testAccDataSourceNsxtPolicyQosProfileCreate(name string, clientType tf_api.ClientType) error {
5964
connector, err := testAccGetPolicyConnector()
6065
if err != nil {
6166
return fmt.Errorf("Error during test client initialization: %v", err)
@@ -71,7 +76,7 @@ func testAccDataSourceNsxtPolicyQosProfileCreate(name string) error {
7176
// Generate a random ID for the resource
7277
id := newUUID()
7378

74-
client := infra.NewQosProfilesClient(testAccGetSessionContext(), connector)
79+
client := infra.NewQosProfilesClient(testAccGetContextByType(clientType), connector)
7580
if client == nil {
7681
return policyResourceNotSupportedError()
7782
}
@@ -83,14 +88,14 @@ func testAccDataSourceNsxtPolicyQosProfileCreate(name string) error {
8388
return nil
8489
}
8590

86-
func testAccDataSourceNsxtPolicyQosProfileDeleteByName(name string) error {
91+
func testAccDataSourceNsxtPolicyQosProfileDeleteByName(name string, clientType tf_api.ClientType) error {
8792
connector, err := testAccGetPolicyConnector()
8893
if err != nil {
8994
return fmt.Errorf("Error during test client initialization: %v", err)
9095
}
9196

9297
// Find the object by name and delete it
93-
client := infra.NewQosProfilesClient(testAccGetSessionContext(), connector)
98+
client := infra.NewQosProfilesClient(testAccGetContextByType(clientType), connector)
9499
if client == nil {
95100
return policyResourceNotSupportedError()
96101
}
@@ -113,7 +118,7 @@ func testAccDataSourceNsxtPolicyQosProfileDeleteByName(name string) error {
113118
func testAccNsxtPolicyQosProfileReadTemplate(name string, withContext bool) string {
114119
context := ""
115120
if withContext {
116-
context = testAccNsxtPolicyMultitenancyContext()
121+
context = testAccNsxtProjectContext()
117122
}
118123
return fmt.Sprintf(`
119124
data "nsxt_policy_qos_profile" "test" {

‎nsxt/data_source_nsxt_policy_segment_security_profile_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ data "nsxt_policy_segment_security_profile" "test" {
6060
}
6161

6262
func testAccNsxtPolicySegmentSecurityProfileMultitenancyTemplate(name string) string {
63-
context := testAccNsxtPolicyMultitenancyContext()
63+
context := testAccNsxtProjectContext()
6464
return fmt.Sprintf(`
6565
resource "nsxt_policy_segment_security_profile" "test" {
6666
%s

0 commit comments

Comments
 (0)