fix(tests): Fix test cases for machineController

Signed-off-by: Suhas Agasthya <suhasagasthya@gmail.com>

Author: suhasagasthya

internal/controllers/cloudstackmachine_controller_test.go

@@ -166,11 +166,16 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 				Name:       dummies.CAPIMachine.Name,
 				UID:        "uniqueness",
 			})
+			if dummies.CSMachine1.Labels == nil {
+				dummies.CSMachine1.Labels = map[string]string{}
+			}
+			dummies.CSMachine1.Labels[infrav1.FailureDomainLabelName] =
+				infrav1.FailureDomainHashedMetaName(dummies.CSMachine1.Spec.FailureDomainName, dummies.CAPICluster.Name)
 
 			return ph.Patch(ctx, dummies.CSMachine1, v1beta1patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
-
-		setClusterReady(g, testEnv.Client)
+		// Mark both Cluster and CloudStackCluster ready (v1beta2 readiness semantics).
+		markClustersReady(ctx, g, testEnv.Client, dummies.CAPICluster, dummies.CSCluster)
 
 		defer func() {
 			if err := recover(); err != nil {
@@ -308,7 +313,7 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 		dummies.CAPIMachine.Spec.Bootstrap.DataSecretName = &dummies.BootstrapSecret.Name
 		g.Expect(testEnv.Create(ctx, dummies.BootstrapSecret)).To(Succeed())
 
-		// Create CAPI and CS machines.
+		// Create CAPI & set NodeRef.
 		g.Expect(testEnv.Create(ctx, dummies.CAPIMachine)).To(Succeed())
 		// Set the NodeRef on the CAPI machine to simulate that the machine is operational.
 		g.Eventually(func() error {
@@ -339,13 +344,19 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 				UID:        "uniqueness",
 			})
 			controllerutil.AddFinalizer(dummies.CSMachine1, infrav1.MachineFinalizer)
-			// Set the instance state to running to simulate that the machine is operational.
 			dummies.CSMachine1.Status.InstanceState = cloud.InstanceStateRunning
+			// Keep original logical FailureDomainName ("fd1"); only ensure label is present.
+			if dummies.CSMachine1.Labels == nil {
+				dummies.CSMachine1.Labels = map[string]string{}
+			}
+			dummies.CSMachine1.Labels[infrav1.FailureDomainLabelName] =
+				infrav1.FailureDomainHashedMetaName(dummies.CSMachine1.Spec.FailureDomainName, dummies.CAPICluster.Name)
 
 			return ph.Patch(ctx, dummies.CSMachine1, v1beta1patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
 
-		setClusterReady(g, testEnv.Client)
+		// Mark clusters ready (replaces setClusterReady & checkClusterReady).
+		markClustersReady(ctx, g, testEnv.Client, dummies.CAPICluster, dummies.CSCluster)
 
 		defer func() {
 			if err := recover(); err != nil {
@@ -354,9 +365,6 @@ func TestCloudStackMachineReconcilerIntegrationTests(t *testing.T) {
 			g.Expect(testEnv.Cleanup(ctx, dummies.CAPICluster, dummies.CSCluster, dummies.ACSEndpointSecret1, dummies.CSFailureDomain1, dummies.CSISONet1, dummies.BootstrapSecret, dummies.CAPIMachine, dummies.CSMachine1, ns)).To(Succeed())
 		}()
 
-		// Check that the CAPI and CloudStack cluster are ready before reconciling.
-		checkClusterReady(ctx, g, testEnv.Client)
-
 		// Check that the machine was created correctly before reconciling.
 		machineKey := client.ObjectKey{Namespace: ns.Name, Name: dummies.CSMachine1.Name}
 		machine := &infrav1.CloudStackMachine{}

internal/controllers/helpers_test.go

@@ -20,73 +20,35 @@ import (
 	"context"
 
 	. "github.com/onsi/gomega"
-	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
-	dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta3"
 )
 
-// setClusterReady patches the CAPI and CloudStack cluster with ready status true.
-func setClusterReady(g *WithT, client client.Client) {
-	setCAPIClusterReady(g, client)
-	setCloudStackClusterReady(g, client)
-}
-
-// checkClusterReady checks if the CAPI and CloudStack cluster are ready.
-func checkClusterReady(ctx context.Context, g *WithT, client client.Client) {
-	checkCAPIClusterReady(ctx, g, client)
-	checkCloudStackClusterReady(ctx, g, client)
-}
-
-// checkCAPIClusterReady checks if the CAPI cluster is ready.
-func checkCAPIClusterReady(ctx context.Context, g *WithT, client client.Client) {
-	g.Eventually(func() bool {
-		capiCluster := &clusterv1.Cluster{}
-		if err := client.Get(ctx, types.NamespacedName{Namespace: dummies.CAPICluster.Namespace, Name: dummies.CAPICluster.Name}, capiCluster); err == nil {
-			if *capiCluster.Status.Initialization.InfrastructureProvisioned {
-				return true
-			}
+// markClustersReady patches Cluster & CloudStackCluster status to satisfy controller readiness checks (v1beta2 semantics).
+func markClustersReady(ctx context.Context, g *WithT, c client.Client, cluster *clusterv1.Cluster, csCluster *infrav1.CloudStackCluster) {
+	g.Eventually(func() error {
+		ph, err := v1beta1patch.NewHelper(cluster, c)
+		if err != nil {
+			return err
 		}
-
-		return false
-	}, timeout).Should(BeTrue())
-}
-
-// checkCloudStackClusterReady checks if the CloudStack cluster is ready.
-func checkCloudStackClusterReady(ctx context.Context, g *WithT, client client.Client) {
-	g.Eventually(func() bool {
-		csCluster := &infrav1.CloudStackCluster{}
-		if err := client.Get(ctx, types.NamespacedName{Namespace: dummies.CSCluster.Namespace, Name: dummies.CSCluster.Name}, csCluster); err == nil {
-			if csCluster.Status.Ready {
-				return true
-			}
+		if cluster.Status.Initialization.InfrastructureProvisioned == nil || !*cluster.Status.Initialization.InfrastructureProvisioned {
+			cluster.Status.Initialization.InfrastructureProvisioned = ptr.To(true)
 		}
-
-		return false
-	}, timeout).Should(BeTrue())
-}
-
-// setCAPIClusterReady patches the cluster with ready status true.
-func setCAPIClusterReady(g *WithT, client client.Client) {
-	g.Eventually(func() error {
-		ph, err := v1beta1patch.NewHelper(dummies.CAPICluster, client)
-		g.Expect(err).ToNot(HaveOccurred())
-		*dummies.CAPICluster.Status.Initialization.InfrastructureProvisioned = true
-
-		return ph.Patch(ctx, dummies.CAPICluster, v1beta1patch.WithStatusObservedGeneration{})
+		return ph.Patch(ctx, cluster, v1beta1patch.WithStatusObservedGeneration{})
 	}, timeout).Should(Succeed())
-}
 
-// setCloudStackClusterReady patches the cluster with ready status true.
-func setCloudStackClusterReady(g *WithT, client client.Client) {
 	g.Eventually(func() error {
-		ph, err := v1beta1patch.NewHelper(dummies.CSCluster, client)
-		g.Expect(err).ToNot(HaveOccurred())
-		dummies.CSCluster.Status.Ready = true
-
-		return ph.Patch(ctx, dummies.CSCluster, v1beta1patch.WithStatusObservedGeneration{})
+		ph, err := v1beta1patch.NewHelper(csCluster, c)
+		if err != nil {
+			return err
+		}
+		if !csCluster.Status.Ready {
+			csCluster.Status.Ready = true
+		}
+		return ph.Patch(ctx, csCluster, v1beta1patch.WithStatusObservedGeneration{})
 	}, timeout).Should(Succeed())
 }