fix customer vnet and subnet create steps.

Author: sivakami

.pipelines/swiftv2-long-running/scripts/create_vnets.sh

@@ -46,11 +46,11 @@ verify_subnet() {
 
 # -------------------------------
 create_vnet_subets() { 
-  local vnet="$2"; 
-  local vnet_cidr="$3"
-  local node_subnet_cidr="$4"; 
-  local extra_subnets="$5"; 
-  local extra_cidrs="$6"
+  local vnet="$1"
+  local vnet_cidr="$2"
+  local node_subnet_cidr="$3"
+  local extra_subnets="$4"
+  local extra_cidrs="$5"
 
   echo "==> Creating VNet: $vnet with CIDR: $vnet_cidr"
   az network vnet create -g "$RG" -l "$LOCATION" --name "$vnet" --address-prefixes "$vnet_cidr" -o none

test/integration/swiftv2/helpers/az_helpers.go

@@ -6,38 +6,41 @@ import (
 	"strings"
 )
 
-func runAzCommand(cmd string, args ...string) string {
+func runAzCommand(cmd string, args ...string) (string, error) {
 	out, err := exec.Command(cmd, args...).CombinedOutput()
 	if err != nil {
-		panic(fmt.Sprintf("Failed to run %s %v: %s", cmd, args, string(out)))
+		return "", fmt.Errorf("failed to run %s %v: %w\nOutput: %s", cmd, args, err, string(out))
 	}
-	return strings.TrimSpace(string(out))
+	return strings.TrimSpace(string(out)), nil
 }
 
-func GetVnetGUID(rg, vnet string) string {
+func GetVnetGUID(rg, vnet string) (string, error) {
 	return runAzCommand("az", "network", "vnet", "show", "--resource-group", rg, "--name", vnet, "--query", "resourceGuid", "-o", "tsv")
 }
 
-func GetSubnetARMID(rg, vnet, subnet string) string {
+func GetSubnetARMID(rg, vnet, subnet string) (string, error) {
 	return runAzCommand("az", "network", "vnet", "subnet", "show", "--resource-group", rg, "--vnet-name", vnet, "--name", subnet, "--query", "id", "-o", "tsv")
 }
 
-func GetSubnetGUID(rg, vnet, subnet string) string {
-	subnetID := GetSubnetARMID(rg, vnet, subnet)
+func GetSubnetGUID(rg, vnet, subnet string) (string, error) {
+	subnetID, err := GetSubnetARMID(rg, vnet, subnet)
+	if err != nil {
+		return "", err
+	}
 	return runAzCommand("az", "resource", "show", "--ids", subnetID, "--api-version", "2023-09-01", "--query", "properties.serviceAssociationLinks[0].properties.subnetId", "-o", "tsv")
 }
 
-func GetSubnetToken(rg, vnet, subnet string) string {
+func GetSubnetToken(rg, vnet, subnet string) (string, error) {
 	// Optionally implement if you use subnet token override
-	return ""
+	return "", nil
 }
 
 // GetClusterNodes returns a slice of node names from a cluster using the given kubeconfig
-func GetClusterNodes(kubeconfig string) []string {
+func GetClusterNodes(kubeconfig string) ([]string, error) {
 	cmd := exec.Command("kubectl", "--kubeconfig", kubeconfig, "get", "nodes", "-o", "name")
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		panic(fmt.Sprintf("Failed to get nodes using kubeconfig %s: %s\n%s", kubeconfig, err, string(out)))
+		return nil, fmt.Errorf("failed to get nodes using kubeconfig %s: %w\nOutput: %s", kubeconfig, err, string(out))
 	}
 
 	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
@@ -49,7 +52,7 @@ func GetClusterNodes(kubeconfig string) []string {
 			nodes = append(nodes, strings.TrimPrefix(line, "node/"))
 		}
 	}
-	return nodes
+	return nodes, nil
 }
 
 // EnsureNamespaceExists checks if a namespace exists and creates it if it doesn't

test/integration/swiftv2/longRunningCluster/datapath_test.go

@@ -38,10 +38,14 @@ var _ = ginkgo.Describe("Datapath Tests", func() {
 		subnetName := "s1"
 
 		// Get subnet information once (doesn't change between iterations)
-		vnetGUID := helpers.GetVnetGUID(rg, vnetName)
-		subnetGUID := helpers.GetSubnetGUID(rg, vnetName, subnetName)
-		subnetARMID := helpers.GetSubnetARMID(rg, vnetName, subnetName)
-		subnetToken := helpers.GetSubnetToken(rg, vnetName, subnetName)
+		vnetGUID, err := helpers.GetVnetGUID(rg, vnetName)
+		gomega.Expect(err).To(gomega.BeNil())
+		subnetGUID, err := helpers.GetSubnetGUID(rg, vnetName, subnetName)
+		gomega.Expect(err).To(gomega.BeNil())
+		subnetARMID, err := helpers.GetSubnetARMID(rg, vnetName, subnetName)
+		gomega.Expect(err).To(gomega.BeNil())
+		subnetToken, err := helpers.GetSubnetToken(rg, vnetName, subnetName)
+		gomega.Expect(err).To(gomega.BeNil())
 
 		// Run indefinitely until test is cancelled
 		iteration := 0
@@ -77,7 +81,8 @@ var _ = ginkgo.Describe("Datapath Tests", func() {
 
 			// Step 3: Create pods on first two nodes
 			ginkgo.By("Getting cluster nodes")
-			nodes := helpers.GetClusterNodes(kubeconfig2)
+			nodes, err := helpers.GetClusterNodes(kubeconfig2)
+			gomega.Expect(err).To(gomega.BeNil())
 			gomega.Expect(len(nodes)).To(gomega.BeNumerically(">=", 2), "Need at least 2 nodes")
 
 			podNames := []string{}