Skip to content

Commit d925ff1

Browse files
committed
Fix test failures for v9.0
Address test failures for v9.0 test executions Signed-off-by: Kobi Samoray <[email protected]>
1 parent 549e7a5 commit d925ff1

2 files changed

+44
-1
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
{

0 commit comments

Comments
 (0)