claude fixes

Author: jcpowermac

test/e2e/vsphere/hostzonal.go

@@ -79,7 +79,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereHostVMGroupZonal
 	})
 
 	It("should enforce vm-host affinity rules between VM groups and host groups [apigroup:machine.openshift.io][Suite:openshift/conformance/parallel]", func() {
-		failIfVMHostAffinityRulesAreNotEnforced(ctx, nodes, infra.Spec.PlatformSpec.VSphere, vsphereCreds)
+		failIfVMHostAffinityRulesAreNotEnforced(ctx, infra.Spec.PlatformSpec.VSphere, vsphereCreds)
 	})
 
 	It("should respect zonal constraints during machine provisioning and scaling operations [apigroup:machine.openshift.io][Suite:openshift/conformance/parallel]", func() {
@@ -257,6 +257,11 @@ func failIfMachineIsNotInCorrectVMGroup(ctx context.Context,
 	Expect(err).NotTo(HaveOccurred(), "expected to get vSphere clients from cluster credentials")
 
 	for _, fd := range platform.FailureDomains {
+		if fd.ZoneAffinity == nil || fd.ZoneAffinity.HostGroup == nil {
+			By(fmt.Sprintf("skipping failure domain %s - no HostGroup ZoneAffinity configured", fd.Name))
+			continue
+		}
+
 		clusterVmGroups, err := getClusterVmGroups(ctx, vim25Client, fd.Topology.ComputeCluster)
 		Expect(err).NotTo(HaveOccurred(), "expected cluster vm groups to be available")
 
@@ -314,7 +319,6 @@ func failIfMachineIsNotInCorrectVMGroup(ctx context.Context,
 }
 
 func failIfVMHostAffinityRulesAreNotEnforced(ctx context.Context,
-	nodes *corev1.NodeList,
 	platform *configv1.VSpherePlatformSpec,
 	vsphereCreds *corev1.Secret) {
 
@@ -330,6 +334,11 @@ func failIfVMHostAffinityRulesAreNotEnforced(ctx context.Context,
 	for _, fd := range platform.FailureDomains {
 		By(fmt.Sprintf("checking VM-Host affinity rules for failure domain %s", fd.Name))
 
+		if fd.ZoneAffinity == nil || fd.ZoneAffinity.HostGroup == nil {
+			By(fmt.Sprintf("skipping failure domain %s - no HostGroup ZoneAffinity configured", fd.Name))
+			continue
+		}
+
 		// Get cluster configuration to check VM-Host rules
 		finder := find.NewFinder(vim25Client, true)
 		ccr, err := finder.ClusterComputeResource(ctx, fd.Topology.ComputeCluster)
@@ -341,16 +350,17 @@ func failIfVMHostAffinityRulesAreNotEnforced(ctx context.Context,
 		// Verify VM-Host affinity rule exists and is properly configured
 		var vmHostRule *types.ClusterVmHostRuleInfo
 		for _, rule := range clusterConfig.Rule {
-			if vmHostRule, ok := rule.(*types.ClusterVmHostRuleInfo); ok {
-				if vmHostRule.Name == fd.ZoneAffinity.HostGroup.VMHostRule {
+			if r, ok := rule.(*types.ClusterVmHostRuleInfo); ok {
+				if r.Name == fd.ZoneAffinity.HostGroup.VMHostRule {
+					vmHostRule = r
 					By(fmt.Sprintf("found VM-Host rule %s for failure domain %s", vmHostRule.Name, fd.Name))
 
 					// Verify the rule references the correct VM and Host groups
 					Expect(vmHostRule.VmGroupName).To(Equal(fd.ZoneAffinity.HostGroup.VMGroup),
 						"VM-Host rule should reference the correct VM group")
 					Expect(vmHostRule.AffineHostGroupName).To(Equal(fd.ZoneAffinity.HostGroup.HostGroup),
 						"VM-Host rule should reference the correct Host group")
-					Expect(vmHostRule.Enabled).To(BeTrue(),
+					Expect(ptr.Deref(vmHostRule.Enabled, false)).To(BeTrue(),
 						"VM-Host affinity rule should be enabled")
 
 					By(fmt.Sprintf("verified VM-Host affinity rule %s is correctly configured", vmHostRule.Name))
@@ -391,6 +401,11 @@ func failIfMachineAPIViolatesZonalConstraints(ctx context.Context,
 	for _, fd := range platform.FailureDomains {
 		By(fmt.Sprintf("verifying machines in failure domain %s comply with zonal constraints", fd.Name))
 
+		if fd.ZoneAffinity == nil || fd.ZoneAffinity.HostGroup == nil {
+			By(fmt.Sprintf("skipping failure domain %s - no HostGroup ZoneAffinity configured", fd.Name))
+			continue
+		}
+
 		machinesInFd, err := getMachinesInFailureDomain(platform, fd, machineList)
 		Expect(err).NotTo(HaveOccurred(), "expected to get machines in failure domain")