SPLAT-2051: introduce e2e tests for multi network vsphere

Author: rvanderp3

Diff for: test/e2e/vsphere/multi-nic.go

@@ -24,6 +24,9 @@ import (
 )
 
 func failIfNodeNotInMachineNetwork(nodes corev1.NodeList, machineNetworks []string) {
+
+	By("checking if nodes are in the machine network")
+
 	for _, node := range nodes.Items {
 		for _, address := range node.Status.Addresses {
 			if address.Type != "InternalIP" && address.Type != "ExternalIP" {
@@ -41,6 +44,9 @@ func failIfIncorrectPortgroupsAttachedToVMs(
 	infra configv1.PlatformSpec,
 	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)
 		fmt.Printf("nodes: %d", len(nodes))
@@ -87,6 +93,9 @@ func failIfNodeNetworkingInconsistentWithMachineNetwork(infra configv1.PlatformS
 }
 
 func failIfMachinesDoNotHaveAllPortgroups(platformSpec configv1.PlatformSpec, machines *machinev1beta1.MachineList) {
+
+	By("checking to see if machines have all portgroups")
+
 	for _, failureDomain := range platformSpec.VSphere.FailureDomains {
 		machinesInFailureDomain, err := getMachinesInFailureDomain(platformSpec.VSphere, failureDomain, machines)
 		Expect(err).NotTo(HaveOccurred())
@@ -98,6 +107,9 @@ func failIfMachinesDoNotHaveAllPortgroups(platformSpec configv1.PlatformSpec, ma
 }
 
 func failIfMachineDoesNotHaveAllPortgroups(machine machinev1beta1.Machine, failureDomain configv1.VSpherePlatformFailureDomainSpec) {
+
+	By("checking to see if machine has all portgroups")
+
 	spec, err := vsphere.ProviderSpecFromRawExtension(machine.Spec.ProviderSpec.Value)
 	Expect(err).NotTo(HaveOccurred())
 
@@ -204,6 +216,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 		machineSet := machineSets.Items[0]
 
 		// scale up new machine and wait for scale up to complete
+		By("scaling up a new machineset which should have multiple NICs")
 		err = e2eutil.ScaleMachineSet(cfg, machineSet.Name, int(*machineSet.Spec.Replicas)+1)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -213,6 +226,7 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 		machines, err = mc.Machines("openshift-machine-api").List(ctx, v1.ListOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
+		By("determining common port groups among machines")
 		portGroups := make(map[string]any)
 		for _, machine := range machines.Items {
 			providerSpec, err := vsphere.ProviderSpecFromRawExtension(machine.Spec.ProviderSpec.Value)
@@ -232,5 +246,4 @@ var _ = Describe("[sig-cluster-lifecycle][OCPFeatureGate:VSphereMultiNetworks][p
 		failIfMachinesDoNotHaveAllPortgroups(infra.Spec.PlatformSpec, machines)
 		failIfIncorrectPortgroupsAttachedToVMs(ctx, infra.Spec.PlatformSpec, nodes, vsphereCreds)
 	})
-
 })

Diff for: test/e2e/vsphere/util.go

@@ -9,7 +9,9 @@ import (
 	"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"
@@ -45,6 +47,9 @@ func getNodesInFailureDomain(vsphereInfraSpec *configv1.VSpherePlatformSpec,
 	if len(vsphereInfraSpec.FailureDomains) < 2 {
 		return nodes.Items, nil
 	}
+
+	By("getting nodes in failure domain")
+
 	var nodesInFd []corev1.Node
 	region := fd.Region
 	zone := fd.Zone
@@ -75,6 +80,9 @@ func getNodesInFailureDomain(vsphereInfraSpec *configv1.VSpherePlatformSpec,
 func getMachinesInFailureDomain(vsphereInfraSpec *configv1.VSpherePlatformSpec,
 	fd configv1.VSpherePlatformFailureDomainSpec,
 	machines *machinev1beta1.MachineList) ([]machinev1beta1.Machine, error) {
+
+	By("getting machines in failure domain")
+
 	if len(vsphereInfraSpec.FailureDomains) < 2 {
 		return machines.Items, nil
 	}
@@ -106,6 +114,9 @@ func getMachinesInFailureDomain(vsphereInfraSpec *configv1.VSpherePlatformSpec,
 }
 
 func getProviderFromMachineSet(cfg *rest.Config) *v1beta1.VSphereMachineProviderSpec {
+
+	By("getting provider from machineset")
+
 	workerMachineSets, err := util.GetMachineSets(cfg)
 	Expect(err).NotTo(HaveOccurred())
 	Expect(len(workerMachineSets.Items)).NotTo(Equal(0), "cluster should have at least 1 worker machine set created by installer")