Prefix network and vpc for project with project name

Author: vishesh92

test/e2e/common.go

@@ -65,8 +65,8 @@ const (
 )
 
 const (
-	ControlPlaneIndicator      = "control-plane"
-	MachineDeploymentIndicator = "md"
+	ControlPlaneIndicator      = "-control-plane-"
+	MachineDeploymentIndicator = "-md-"
 	DataVolumePrefix           = "DATA-"
 )
 

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

@@ -11,11 +11,11 @@ spec:
     zone:
       name :  ${CLOUDSTACK_ZONE_NAME}
       network: 
-        name: ${CLOUDSTACK_VPC_NETWORK_NAME}
+        name: ${CLOUDSTACK_PROJECT_NAME}-${CLOUDSTACK_VPC_NETWORK_NAME}
         gateway: ${CLOUDSTACK_GATEWAY}
         netmask: ${CLOUDSTACK_NETMASK}
         vpc:
-          name: ${CLOUDSTACK_VPC_NAME}
+          name: ${CLOUDSTACK_PROJECT_NAME}-${CLOUDSTACK_VPC_NAME}
           cidr: ${CLOUDSTACK_VPC_CIDR}
     project: ${CLOUDSTACK_PROJECT_NAME}
   controlPlaneEndpoint:

test/e2e/project.go

@@ -41,7 +41,7 @@ func ProjectSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 		cancelWatches    context.CancelFunc
 		clusterResources *clusterctl.ApplyClusterTemplateAndWaitResult
 		affinityIds      []string
-		vpcName          = "vpc-for-e2e-1"
+		vpcName          string
 	)
 
 	BeforeEach(func() {
@@ -62,6 +62,7 @@ func ProjectSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 		input = inputGetter()
 
 		projectName = os.Getenv("CLOUDSTACK_PROJECT_NAME")
+		vpcName = fmt.Sprintf("%s-%s", os.Getenv("CLOUDSTACK_PROJECT_NAME"), input.E2EConfig.GetVariable("CLOUDSTACK_VPC_NETWORK_NAME"))
 		csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
 		project, _, err := csClient.Project.GetProjectByName(projectName)
 		if (err != nil) || (project == nil) {