Fix network creation

Author: harikrishna-patnala

test/e2e/common.go

@@ -575,32 +575,36 @@ func IsClusterReady(ctx context.Context, mgmtClient client.Client, cluster *clus
 	return c.Status.ControlPlaneReady && c.Status.InfrastructureReady
 }
 
-func EnsureSecondaryNetworkExistsFromPrimary(client *cloudstack.CloudStackClient, input CommonSpecInput) (*cloudstack.Network, error) {
-	primaryNetName := input.E2EConfig.GetVariable("CLOUDSTACK_NETWORK_NAME")
+func EnsureSecondaryNetworkExists(client *cloudstack.CloudStackClient, input CommonSpecInput) (*cloudstack.Network, error) {
 	secondaryNetName := input.E2EConfig.GetVariable("CLOUDSTACK_NEW_NETWORK_NAME")
 
-	// Fetch primary network using helper
-	primaryNet, _, err := client.Network.GetNetworkByName(primaryNetName)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get primary network %q: %w", primaryNetName, err)
-	}
-
+	By("Fetching secondary network details")
 	// Try fetching secondary network
 	secondaryNet, _, err := client.Network.GetNetworkByName(secondaryNetName)
 	if err == nil && secondaryNet != nil {
 		By(fmt.Sprintf("Network %q already exists", secondaryNetName))
 		return secondaryNet, nil
 	}
 
+	By("Listing Zone")
+	zoneName := input.E2EConfig.GetVariable("CLOUDSTACK_ZONE_NAME")
+	pz := client.Zone.NewListZonesParams()
+	pz.SetName(zoneName)
+	listZonesResponse, err := client.Zone.ListZones(pz)
+	Expect(err).To(BeNil(), "error listing zones")
+	Expect(listZonesResponse.Count).To(Equal(1), "no zones, or more than one zone resolve to zone name %s", zoneName)
+	zoneId := listZonesResponse.Zones[0].Id
+
+	By("Listing network offerings")
+	networkOffering, _, err := client.NetworkOffering.GetNetworkOfferingByName(DefaultNetworkOffering)
+
 	// Create new network using zone and offering from primary
+	By("Create secondary network")
 	createParams := client.Network.NewCreateNetworkParams(
-		primaryNet.Networkofferingid,
-		primaryNet.Zoneid,
 		secondaryNetName,
+		networkOffering.Id,
+		zoneId,
 	)
-	createParams.SetDisplaytext(secondaryNetName)
-	createParams.SetAccount(primaryNet.Account)
-	createParams.SetDomainid(primaryNet.Domainid)
 
 	newNetResp, err := client.Network.CreateNetwork(createParams)
 	if err != nil {
@@ -612,7 +616,8 @@ func EnsureSecondaryNetworkExistsFromPrimary(client *cloudstack.CloudStackClient
 		return nil, fmt.Errorf("failed to fetch created network %q by ID: %w", newNetResp.Id, err)
 	}
 
-	By(fmt.Sprintf("Created secondary network %q in zone %q", secondaryNetName, primaryNet.Zonename))
+	By("Created secondary network")
+	By(fmt.Sprintf("Created secondary network %q", secondaryNetName))
 	return newNet, nil
 }
 

test/e2e/multiple_networks.go

@@ -85,7 +85,7 @@ func MultipleNetworksSpec(ctx context.Context, inputGetter func() CommonSpecInpu
 
 		// Get details from ACS and ensure secondary network exists
 		csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
-		EnsureSecondaryNetworkExistsFromPrimary(csClient, input)
+		EnsureSecondaryNetworkExists(csClient, input)
 
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 			ClusterProxy:    input.BootstrapClusterProxy,