Add VPC for project e2e test

Author: vishesh92

test/e2e/common.go

@@ -394,16 +394,31 @@ func CheckNetworkExists(client *cloudstack.CloudStackClient, networkName string)
 }
 
 func CheckVPCExists(client *cloudstack.CloudStackClient, vpcName string) (bool, error) {
-	_, count, err := client.VPC.GetVPCByName(vpcName)
+	return CheckVPCExistsInProject(client, vpcName, "")
+}
+
+func CheckVPCExistsInProject(client *cloudstack.CloudStackClient, vpcName string, project string) (bool, error) {
+	p := client.VPC.NewListVPCsParams()
+	p.SetName(vpcName)
+
+	if project != "" {
+		projectID, _, err := client.Project.GetProjectID(project)
+		if err != nil {
+			Fail("Failed to get project: " + err.Error())
+		}
+		p.SetProjectid(projectID)
+	}
+
+	listResp, err := client.VPC.ListVPCs(p)
 	if err != nil {
 		if strings.Contains(err.Error(), "No match found for") {
 			return false, nil
 		}
 		return false, err
-	} else if count > 1 {
-		return false, fmt.Errorf("Expected 0-1 VPC with name %s, but got %d.", vpcName, count)
+	} else if listResp.Count > 1 {
+		return false, fmt.Errorf("Expected 0-1 VPC with name %s, but got %d.", vpcName, listResp.Count)
 	}
-	return count == 1, nil
+	return listResp.Count == 1, nil
 }
 
 func CreateCloudStackClient(ctx context.Context, kubeConfigPath string) *cloudstack.CloudStackClient {

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

@@ -12,6 +12,11 @@ spec:
       name :  ${CLOUDSTACK_ZONE_NAME}
       network: 
         name: ${CLOUDSTACK_NETWORK_NAME}
+        gateway: ${CLOUDSTACK_GATEWAY}
+        netmask: ${CLOUDSTACK_NETMASK}
+        vpc:
+          name: ${CLOUDSTACK_VPC_NAME}
+          cidr: ${CLOUDSTACK_VPC_CIDR}
     project: ${CLOUDSTACK_PROJECT_NAME}
   controlPlaneEndpoint:
     host: ""

test/e2e/project.go

@@ -41,6 +41,7 @@ func ProjectSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 		cancelWatches    context.CancelFunc
 		clusterResources *clusterctl.ApplyClusterTemplateAndWaitResult
 		affinityIds      []string
+		vpcName          = "vpc-for-e2e-1"
 	)
 
 	BeforeEach(func() {
@@ -81,8 +82,8 @@ func ProjectSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 				Namespace:                namespace.Name,
 				ClusterName:              fmt.Sprintf("%s-%s", specName, util.RandomString(6)),
 				KubernetesVersion:        input.E2EConfig.GetVariable(KubernetesVersion),
-				ControlPlaneMachineCount: pointer.Int64Ptr(1),
-				WorkerMachineCount:       pointer.Int64Ptr(1),
+				ControlPlaneMachineCount: pointer.Int64(1),
+				WorkerMachineCount:       pointer.Int64(2),
 			},
 			WaitForClusterIntervals:      input.E2EConfig.GetIntervals(specName, "wait-cluster"),
 			WaitForControlPlaneIntervals: input.E2EConfig.GetIntervals(specName, "wait-control-plane"),
@@ -91,6 +92,9 @@ func ProjectSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 
 		csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
 		affinityIds = CheckAffinityGroupInProject(csClient, clusterResources.Cluster.Name, "pro", projectName)
+		exists, err := CheckVPCExistsInProject(csClient, vpcName, projectName)
+		Expect(err).To(BeNil())
+		Expect(exists).To(BeTrue())
 	})
 
 	AfterEach(func() {