Enhanced GetPortGroupsAttachedToVMsInFailureDomain to only look at VMs related to cluster

Author: vr4manta

test/e2e/vsphere/multi-nic.go

@@ -41,18 +41,19 @@ func failIfNodeNotInMachineNetwork(nodes corev1.NodeList, machineNetworks []stri
 
 func failIfIncorrectPortgroupsAttachedToVMs(
 	ctx context.Context,
-	infra configv1.PlatformSpec,
+	infra *configv1.Infrastructure,
 	nodeList *corev1.NodeList,
 	vsphereCreds *corev1.Secret) {
 
 	By("checking if VMs have the correct portgroups attached")
 
-	for _, failureDomain := range infra.VSphere.FailureDomains {
-		nodes, err := getNodesInFailureDomain(infra.VSphere, failureDomain, nodeList)
+	providerSpec := infra.Spec.PlatformSpec
+	for _, failureDomain := range providerSpec.VSphere.FailureDomains {
+		nodes, err := getNodesInFailureDomain(providerSpec.VSphere, failureDomain, nodeList)
 		fmt.Printf("nodes: %d", len(nodes))
 		Expect(err).NotTo(HaveOccurred())
 
-		vmPortgroupMap, err := GetPortGroupsAttachedToVMsInFailureDomain(ctx, failureDomain, vsphereCreds, infra.VSphere.VCenters)
+		vmPortgroupMap, err := GetPortGroupsAttachedToVMsInFailureDomain(ctx, infra.Status.InfrastructureName, failureDomain, vsphereCreds, providerSpec.VSphere.VCenters)
 		if err != nil {
 			Expect(err).NotTo(HaveOccurred())
 		}
@@ -212,7 +213,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 	})
 
 	It("node VMs should have all specified portgroups attached which are associated with their failure domain [apigroup:machine.openshift.io][Suite:openshift/conformance/parallel]", func() {
-		failIfIncorrectPortgroupsAttachedToVMs(ctx, infra.Spec.PlatformSpec, nodes, vsphereCreds)
+		failIfIncorrectPortgroupsAttachedToVMs(ctx, infra, nodes, vsphereCreds)
 	})
 
 	It("new machines should pass multi network tests [apigroup:machine.openshift.io][Suite:openshift/conformance/serial]", Label("Serial"), func() {
@@ -252,6 +253,6 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 		failIfNodeNotInMachineNetwork(*nodes, machineNetworks)
 		failIfNodeNetworkingInconsistentWithMachineNetwork(infra.Spec.PlatformSpec, machineNetworks)
 		failIfMachinesDoNotHaveAllPortgroups(infra.Spec.PlatformSpec, machines)
-		failIfIncorrectPortgroupsAttachedToVMs(ctx, infra.Spec.PlatformSpec, nodes, vsphereCreds)
+		failIfIncorrectPortgroupsAttachedToVMs(ctx, infra, nodes, vsphereCreds)
 	})
 })

test/e2e/vsphere/util.go

@@ -6,21 +6,21 @@ import (
 	"net"
 	"net/url"
 	"path"
+	"slices"
 	"strconv"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/api/machine/v1beta1"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
-	util "github.com/openshift/machine-api-operator/test/e2e"
 	"github.com/pkg/errors"
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/object"
 	vapirest "github.com/vmware/govmomi/vapi/rest"
+	"github.com/vmware/govmomi/vapi/tags"
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
@@ -29,6 +29,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	"github.com/openshift/machine-api-operator/pkg/controller/vsphere"
+	util "github.com/openshift/machine-api-operator/test/e2e"
 )
 
 func isIpInCidrRange(ip string, cidr string) (bool, error) {
@@ -255,6 +256,7 @@ func getCredentialsForVCenter(ctx context.Context, vsphereCreds *corev1.Secret,
 
 func GetPortGroupsAttachedToVMsInFailureDomain(
 	ctx context.Context,
+	clusterID string,
 	failureDomain configv1.VSpherePlatformFailureDomainSpec,
 	vsphereCreds *corev1.Secret,
 	vCenters []configv1.VSpherePlatformVCenterSpec) (map[string][]string, error) {
@@ -281,7 +283,7 @@ func GetPortGroupsAttachedToVMsInFailureDomain(
 
 	portGroupMap := make(map[string][]string)
 
-	client, _, logout, err := CreateVSphereClients(ctx, vcenterUrl, user, pass)
+	client, rClient, logout, err := CreateVSphereClients(ctx, vcenterUrl, user, pass)
 	defer logout()
 
 	if err != nil {
@@ -290,17 +292,31 @@ func GetPortGroupsAttachedToVMsInFailureDomain(
 
 	finder := NewFinder(client)
 
+	// Get tagged objects and then grab VMs
+	tm := tags.NewManager(rClient)
+	refs, err := tm.ListAttachedObjects(ctx, clusterID)
+	var vmList []types.ManagedObjectReference
+	for _, ref := range refs {
+		if ref.Reference().Type == "VirtualMachine" {
+			vmList = append(vmList, ref.Reference())
+		}
+	}
+
 	vms, err := finder.VirtualMachineList(ctx, fmt.Sprintf("/%s/vm/...", failureDomain.Topology.Datacenter))
 	if err != nil {
 		return nil, fmt.Errorf("unable to get VMs in %s. %v", failureDomain.Topology.ComputeCluster, err)
 	}
 
 	for _, vm := range vms {
+		// Make sure vm has the cluster id tag.  Note: template will be included.
+		if !slices.Contains(vmList, vm.Reference()) {
+			continue
+		}
+
 		vm, err := finder.VirtualMachine(ctx, vm.InventoryPath)
 		if err != nil {
 			return nil, fmt.Errorf("unable to get VMs in %s. %v", failureDomain.Topology.ComputeCluster, err)
 		}
-		fmt.Printf("UUID: %s\n", vm.UUID(ctx))
 		virtualDevices, err := vm.Device(ctx)
 
 		var portGroups []string