Fix test failures for v9.0

Address test failures for v9.0 test executions

Signed-off-by: Kobi Samoray <[email protected]>

Author: ksamoray

nsxt/data_source_nsxt_policy_bridge_profile_test.go

@@ -5,12 +5,15 @@ package nsxt
 
 import (
 	"fmt"
+	"github.com/vmware/vsphere-automation-sdk-go/lib/vapi/std/errors"
+	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt-mp/nsx"
 	"testing"
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	ep "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/sites/enforcement_points"
+	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/infra/sites/enforcement_points/edge_clusters"
 	"github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model"
 )
 
@@ -42,6 +45,39 @@ func TestAccDataSourceNsxtPolicyBridgeProfile_basic(t *testing.T) {
 	})
 }
 
+func getEdgeClusterPath() (string, error) {
+	connector, err := testAccGetPolicyConnector()
+	if err != nil {
+		return "", fmt.Errorf("error during test client initialization: %v", err)
+	}
+	client := nsx.NewEdgeClustersClient(connector)
+	clusterList, err := client.List(nil, nil, nil, nil, nil)
+	if err != nil {
+		return "", fmt.Errorf("error during edge cluster list retrieval: %v", err)
+	}
+	clusterName := getEdgeClusterName()
+	clusterID := ""
+	if clusterList.Results != nil {
+		for _, objList := range clusterList.Results {
+			if *objList.DisplayName == clusterName {
+				clusterID = *objList.Id
+				break
+			}
+		}
+	}
+	if clusterID != "" {
+		enClient := edge_clusters.NewEdgeNodesClient(connector)
+		objList, err := enClient.List(defaultSite, defaultEnforcementPoint, clusterID, nil, nil, nil, nil, nil, nil)
+		if err != nil {
+			return "", fmt.Errorf("error during edge node list retrieval: %v", err)
+		}
+		if len(objList.Results) > 0 {
+			return *objList.Results[0].Path, nil
+		}
+	}
+	return "", errors.NotFound{}
+}
+
 func testAccDataSourceNsxtPolicyBridgeProfileCreate(name string) error {
 	connector, err := testAccGetPolicyConnector()
 	if err != nil {
@@ -59,6 +95,13 @@ func testAccDataSourceNsxtPolicyBridgeProfileCreate(name string) error {
 	uuid, _ := uuid.NewRandom()
 	id := uuid.String()
 
+	// Get Edge path
+	edgePath, err := getEdgeClusterPath()
+	if err == nil {
+		obj.EdgePaths = []string{edgePath}
+	} else if !isNotFoundError(err) {
+		return err
+	}
 	client := ep.NewEdgeBridgeProfilesClient(connector)
 	err = client.Patch(defaultSite, defaultEnforcementPoint, id, obj)
 

nsxt/resource_nsxt_policy_project_test.go

@@ -319,7 +319,7 @@ func TestAccResourceNsxtPolicyProject_900defaultSecurityProfile(t *testing.T) {
 				// Create: Set T0, Ext GW connection, Ext IPv4 Block, activate default DFW
 				Config: testAccNsxtPolicyProjectMinimalistic(),
 				Check: resource.ComposeTestCheckFunc(
-					testAccNsxtPolicyProjectGetSecurityProfileNSEnabled(testResourceName, false),
+					testAccNsxtPolicyProjectGetSecurityProfileNSEnabled(testResourceName, true),
 				),
 			},
 			{

nsxt/resource_nsxt_vpc_subnet_test.go

@@ -282,6 +282,7 @@ resource "nsxt_vpc_subnet" "test" {
   display_name = "%s"
   description  = "%s"
 
+  ip_addresses = ["%s"]
   ipv4_subnet_size = %s
   access_mode      = "Public"
 
@@ -304,7 +305,7 @@ resource "nsxt_vpc_subnet" "test" {
       reserved_ip_ranges = ["%s"]
     }
   }
-}`, testAccNsxtPolicyMultitenancyContext(), attrMap["display_name"], attrMap["description"], attrMap["ipv4_subnet_size"], attrMap["reserved_ip_ranges"])
+}`, testAccNsxtPolicyMultitenancyContext(), attrMap["display_name"], attrMap["description"], attrMap["ip_addresses"], attrMap["ipv4_subnet_size"], attrMap["reserved_ip_ranges"])
 }
 
 func testAccNsxtVpcSubnetMinimalisticIsolated() string {