code review comments addressed

Author: harikrishna-patnala

test/e2e/common.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"maps"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -597,6 +598,8 @@ func EnsureSecondaryNetworkExists(client *cloudstack.CloudStackClient, input Com
 
 	By("Listing network offerings")
 	networkOffering, _, err := client.NetworkOffering.GetNetworkOfferingByName(DefaultNetworkOffering)
+	Expect(err).To(BeNil(), "error fetching network offering %q", DefaultNetworkOffering)
+	Expect(networkOffering).ToNot(BeNil(), "network offering %q not found", DefaultNetworkOffering)
 
 	// Create new network using zone and offering from primary
 	By("Create secondary network")
@@ -650,7 +653,7 @@ func CheckIfNodesHaveTwoNICs(client *cloudstack.CloudStackClient, clusterName st
 			}
 		}
 
-		By(fmt.Sprintf("VM %q has required NICs: %v", vm.Name, keys(foundNetworks)))
+		By(fmt.Sprintf("VM %q has required NICs: %v", vm.Name, maps.Keys(foundNetworks)))
 	}
 }
 

test/e2e/data/infrastructure-cloudstack/v1beta3/cluster-template-multiple-networks/multiple-networks.yaml

@@ -28,7 +28,6 @@ spec:
       template:
         name: ${CLOUDSTACK_TEMPLATE_NAME}
       sshKey: ${CLOUDSTACK_SSH_KEY_NAME}
-      affinity: pro
       networks:
         - name: ${CLOUDSTACK_NETWORK_NAME}
         - name: ${CLOUDSTACK_NEW_NETWORK_NAME}

test/e2e/multiple_networks.go

@@ -21,9 +21,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
-	"github.com/blang/semver"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
@@ -47,25 +45,6 @@ func MultipleNetworksSpec(ctx context.Context, inputGetter func() CommonSpecInpu
 		Expect(ctx).NotTo(BeNil(), "ctx is required for %s spec", specName)
 		input = inputGetter()
 
-		csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
-		version, err := GetACSVersion(csClient)
-
-		if err != nil || version == "" {
-			Skip("Failed to get CloudStack's version")
-		}
-
-		v, err := semver.ParseTolerant(strings.Join(strings.Split(version, ".")[0:3], "."))
-
-		if err != nil {
-			Skip("Failed to parse CloudStack version " + version)
-		}
-
-		expectedRange, _ := semver.ParseRange(">=4.19.0")
-
-		if !expectedRange(v) {
-			Skip("Cloudstack version " + version + " is less than 4.19.")
-		}
-
 		Expect(input.E2EConfig).ToNot(BeNil(), "Invalid argument. input.E2EConfig can't be nil when calling %s spec", specName)
 		Expect(input.ClusterctlConfigPath).To(BeAnExistingFile(), "Invalid argument. input.ClusterctlConfigPath must be an existing file when calling %s spec", specName)
 		Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName)
@@ -85,7 +64,8 @@ func MultipleNetworksSpec(ctx context.Context, inputGetter func() CommonSpecInpu
 
 		// Get details from ACS and ensure secondary network exists
 		csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
-		EnsureSecondaryNetworkExists(csClient, input)
+		_, err := EnsureSecondaryNetworkExists(csClient, input)
+		Expect(err).ToNot(HaveOccurred(), "Failed to ensure secondary network exists")
 
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 			ClusterProxy:    input.BootstrapClusterProxy,