Merge pull request #4816 from Azure/mvacula/cluster-listing-refactor

Cluster listing test case refactor: move into an existing test

Author: openshift-merge-bot[bot]

test/e2e/cluster_list_no_infra.go

@@ -158,5 +158,18 @@ var _ = Describe("Customer", func() {
 			By("verifying that the managed resource group still exists")
 			_, err = tc.GetARMResourcesClientFactoryOrDie(ctx).NewResourceGroupsClient().Get(ctx, clusterParams2.ManagedResourceGroupName, nil)
 			Expect(err).NotTo(HaveOccurred())
+
+			By("testing resource group-level cluster listing")
+			pager := clusterClient.NewListByResourceGroupPager(*customerResourceGroup.Name, nil)
+			var foundClusters []string
+			for pager.More() {
+				clusterList, err := pager.NextPage(ctx)
+				Expect(err).NotTo(HaveOccurred())
+				for _, cluster := range clusterList.Value {
+					foundClusters = append(foundClusters, *cluster.Name)
+				}
+			}
+			Expect(foundClusters).To(HaveLen(2), "Expected exactly two clusters listed in resource group %s", *customerResourceGroup.Name)
+			Expect(foundClusters).To(ContainElements(customerClusterName, customerClusterName2))
 		})
 })

test/e2e/clusters_sharing_resgroup.go

@@ -9,7 +9,6 @@ Customer should be able to create a no-CNI private cluster with a private key va
 Customer should be able to create a HCP cluster without CNI
 Customer should be able to create an HCP cluster and custom node pool osDisk size
 Create HCPOpenShiftCluster with Private KeyVault should create a cluster with private keyvault using v20251223preview API
-Customer should be able to list HCP clusters without node pools at the resource group level
 Customer should be able to create an HCP cluster and manage pull secrets
 Update HCPOpenShiftCluster Positive creates a cluster and updates tags with a PATCH request
 Customer should be able to create an HCP cluster with back-level version 4.19

test/testdata/zz_fixture_TestMainListSuitesForEachSuite_dev_cd_check_paralleldev_cd_check_parallel.txt

@@ -7,7 +7,6 @@ Customer should be able to create a no-CNI private cluster with a private key va
 Customer should be able to create a HCP cluster without CNI
 Customer should be able to create an HCP cluster and custom node pool osDisk size
 Create HCPOpenShiftCluster with Private KeyVault should create a cluster with private keyvault using v20251223preview API
-Customer should be able to list HCP clusters without node pools at the resource group level
 Customer should not be able to reuse subnets and NSGs between clusters
 Customer should be able to create an HCP cluster and manage pull secrets
 Customer should create an HCP cluster and validate TLS certificates

test/testdata/zz_fixture_TestMainListSuitesForEachSuite_integration_parallelintegration_parallel.txt

@@ -7,7 +7,6 @@ Customer should be able to create a no-CNI private cluster with a private key va
 Customer should be able to create a HCP cluster without CNI
 Customer should be able to create an HCP cluster and custom node pool osDisk size
 Create HCPOpenShiftCluster with Private KeyVault should create a cluster with private keyvault using v20251223preview API
-Customer should be able to list HCP clusters without node pools at the resource group level
 Customer should not be able to reuse subnets and NSGs between clusters
 Customer should be able to create an HCP cluster and manage pull secrets
 Customer should create an HCP cluster and validate TLS certificates

test/testdata/zz_fixture_TestMainListSuitesForEachSuite_prod_parallelprod_parallel.txt

@@ -10,7 +10,6 @@ Customer should be able to create a no-CNI private cluster with a private key va
 Customer should be able to create a HCP cluster without CNI
 Customer should be able to create an HCP cluster and custom node pool osDisk size
 Create HCPOpenShiftCluster with Private KeyVault should create a cluster with private keyvault using v20251223preview API
-Customer should be able to list HCP clusters without node pools at the resource group level
 Customer should not be able to reuse subnets and NSGs between clusters
 Customer should be able to create an HCP cluster and manage pull secrets
 Update HCPOpenShiftCluster Positive creates a cluster and updates tags with a PATCH request

test/testdata/zz_fixture_TestMainListSuitesForEachSuite_rp_api_compat_all_parallel_01rp_api_compat_all_parallel_development.txt

@@ -7,7 +7,6 @@ Customer should be able to create a no-CNI private cluster with a private key va
 Customer should be able to create a HCP cluster without CNI
 Customer should be able to create an HCP cluster and custom node pool osDisk size
 Create HCPOpenShiftCluster with Private KeyVault should create a cluster with private keyvault using v20251223preview API
-Customer should be able to list HCP clusters without node pools at the resource group level
 Customer should not be able to reuse subnets and NSGs between clusters
 Customer should be able to create an HCP cluster and manage pull secrets
 Update HCPOpenShiftCluster Positive creates a cluster and updates tags with a PATCH request

test/testdata/zz_fixture_TestMainListSuitesForEachSuite_rp_api_compat_all_parallelrp_api_compat_all_parallel.txt

@@ -7,7 +7,6 @@ Customer should be able to create a no-CNI private cluster with a private key va
 Customer should be able to create a HCP cluster without CNI
 Customer should be able to create an HCP cluster and custom node pool osDisk size
 Create HCPOpenShiftCluster with Private KeyVault should create a cluster with private keyvault using v20251223preview API
-Customer should be able to list HCP clusters without node pools at the resource group level
 Customer should not be able to reuse subnets and NSGs between clusters
 Customer should be able to create an HCP cluster and manage pull secrets
 Customer should create an HCP cluster and validate TLS certificates