Fix logical error in affinity group and subdomain tests

Author: wongni

test/e2e/affinity_group.go

@@ -58,11 +58,11 @@ func AffinityGroupSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 	})
 
 	It("Should have host affinity group when affinity is pro", func() {
-		executeTest(ctx, input, namespace, specName, clusterResources, "pro")
+		affinityIds = executeTest(ctx, input, namespace, specName, clusterResources, "pro")
 	})
 
 	It("Should have host affinity group when affinity is anti", func() {
-		executeTest(ctx, input, namespace, specName, clusterResources, "anti")
+		affinityIds = executeTest(ctx, input, namespace, specName, clusterResources, "anti")
 	})
 
 	AfterEach(func() {
@@ -73,6 +73,7 @@ func AffinityGroupSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 		if err != nil {
 			Fail(err.Error())
 		}
+		By("PASSED!")
 	})
 }
 
@@ -97,9 +98,5 @@ func executeTest(ctx context.Context, input CommonSpecInput, namespace *corev1.N
 		WaitForMachineDeployments:    input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"),
 	}, clusterResources)
 
-	affinityIds := CheckAffinityGroup(clusterResources.Cluster.Name, affinityType)
-
-	By("PASSED!")
-
-	return affinityIds
+	return CheckAffinityGroup(clusterResources.Cluster.Name, affinityType)
 }

test/e2e/common.go

@@ -235,6 +235,10 @@ func DestroyOneMachine(clusterName string, machineType string) {
 }
 
 func CheckAffinityGroupsDeleted(affinityIds []string) error {
+	if len(affinityIds) == 0 {
+		return errors.New("affinityIds are empty")
+	}
+
 	client := createCloudStackClient()
 
 	for _, affinityId := range affinityIds {
@@ -250,7 +254,9 @@ func CheckAffinityGroup(clusterName string, affinityType string) []string {
 	client := createCloudStackClient()
 
 	By("Listing all machines")
-	listResp, err := client.VirtualMachine.ListVirtualMachines(client.VirtualMachine.NewListVirtualMachinesParams())
+	p := client.VirtualMachine.NewListVirtualMachinesParams()
+	p.SetListall(true)
+	listResp, err := client.VirtualMachine.ListVirtualMachines(p)
 	if err != nil {
 		Fail("Failed to list machines: " + err.Error())
 	}

test/e2e/subdomain.go

@@ -39,6 +39,7 @@ func SubdomainSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 		namespace        *corev1.Namespace
 		cancelWatches    context.CancelFunc
 		clusterResources *clusterctl.ApplyClusterTemplateAndWaitResult
+		affinityIds      []string
 	)
 
 	BeforeEach(func() {
@@ -77,11 +78,17 @@ func SubdomainSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 			WaitForMachineDeployments:    input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"),
 		}, clusterResources)
 
-		By("PASSED!")
+		affinityIds = CheckAffinityGroup(clusterResources.Cluster.Name, "pro")
 	})
 
 	AfterEach(func() {
 		// Dumps all the resources in the spec namespace, then cleanups the cluster object and the spec namespace itself.
 		dumpSpecResourcesAndCleanup(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder, namespace, cancelWatches, clusterResources.Cluster, input.E2EConfig.GetIntervals, input.SkipCleanup)
+
+		err := CheckAffinityGroupsDeleted(affinityIds)
+		if err != nil {
+			Fail(err.Error())
+		}
+		By("PASSED!")
 	})
 }