Fixed 2 cluster e2e test

Author: mrog

test/e2e/config/cloudstack.yaml

@@ -113,6 +113,7 @@ variables:
   CLOUDSTACK_NETWORK_NAME: isolated-for-e2e-1
   CLOUDSTACK_NEW_NETWORK_NAME: isolated-for-e2e-new
   CLUSTER_ENDPOINT_IP: 172.16.2.199
+  CLUSTER_ENDPOINT_IP_2: 172.16.2.199
   CLUSTER_ENDPOINT_NEW_IP: 172.16.2.201
   CLUSTER_ENDPOINT_PORT: 6443
   CLUSTER_ENDPOINT_PORT_2: 6444

test/e2e/data/infrastructure-cloudstack/v1beta1/cluster-template-second-cluster/cloudstack-cluster.yaml

@@ -7,8 +7,8 @@ spec:
   - name: ${CLOUDSTACK_ZONE_NAME}
     network:
       name: ${CLOUDSTACK_NETWORK_NAME}
-  account: ${CLOUDSTACK_INVALID_ACCOUNT_NAME}
+  account: ${CLOUDSTACK_ACCOUNT_NAME}
   domain: ${CLOUDSTACK_DOMAIN_NAME}
   controlPlaneEndpoint:
-    host: ${CLUSTER_ENDPOINT_IP}
-    port: ${CLUSTER_ENDPOINT_PORT_2}
+    host: ${CLUSTER_ENDPOINT_IP_2}
+    port: ${CLUSTER_ENDPOINT_PORT}

test/e2e/second_cluster.go renamed to test/e2e/two_clusters.go

@@ -31,10 +31,10 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 )
 
-// SecondClusterSpec implements a test that verifies two clusters can co-exist.
-func SecondClusterSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
+// TwoClustersSpec implements a test that verifies two clusters can co-exist.
+func TwoClustersSpec(ctx context.Context, inputGetter func() CommonSpecInput) {
 
-	const specName = "second-cluster"
+	const specName = "two-clusters"
 
 	var (
 		input             CommonSpecInput
@@ -85,7 +85,7 @@ func SecondClusterSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 		clusterResources2 = new(clusterctl.ApplyClusterTemplateAndWaitResult)
 	})
 
-	It("should successfully add and remove a second cluster", func() {
+	It("should successfully add and remove a second cluster without breaking the first cluster", func() {
 		mgmtClient := input.BootstrapClusterProxy.GetClient()
 
 		By("Create the first cluster and verify that it's ready")

test/e2e/second_cluster_test.go renamed to test/e2e/two_clusters_test.go

@@ -24,9 +24,9 @@ import (
 	. "github.com/onsi/ginkgo"
 )
 
-var _ = Describe("with a second cluster", func() {
+var _ = Describe("with two clusters", func() {
 
-	SecondClusterSpec(context.TODO(), func() CommonSpecInput {
+	TwoClustersSpec(context.TODO(), func() CommonSpecInput {
 		return CommonSpecInput{
 			E2EConfig:             e2eConfig,
 			ClusterctlConfigPath:  clusterctlConfigPath,