Skip e2e gateway failover tests on single node deployments

Signed-Off-by: Sridhar Gaddam <sgaddam@redhat.com>
novad03 · Dec 13, 2021 · 964d973 · 964d973
1 parent 8e0281c
commit 964d973
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/test/e2e/dataplane/tcp_gn_pod_connectivity.go b/test/e2e/dataplane/tcp_gn_pod_connectivity.go
@@ -38,8 +38,8 @@ var _ = Describe("[dataplane-globalnet] Basic TCP connectivity tests across over
 				return
 			}
 
-			if subFramework.IsSingleNodeDeployment(fromClusterScheduling, toClusterScheduling, framework.ClusterA,
-				framework.ClusterB) {
+			if !subFramework.CanExecuteNonGatewayConnectivityTest(fromClusterScheduling, toClusterScheduling,
+				framework.ClusterA, framework.ClusterB) {
 				return
 			}
 

diff --git a/test/e2e/dataplane/tcp_pod_connectivity.go b/test/e2e/dataplane/tcp_pod_connectivity.go
@@ -37,8 +37,8 @@ var _ = Describe("[dataplane] Basic TCP connectivity tests across clusters witho
 				return
 			}
 
-			if subFramework.IsSingleNodeDeployment(fromClusterScheduling, toClusterScheduling, framework.ClusterA,
-				framework.ClusterB) {
+			if !subFramework.CanExecuteNonGatewayConnectivityTest(fromClusterScheduling, toClusterScheduling,
+				framework.ClusterA, framework.ClusterB) {
 				return
 			}
 

diff --git a/test/e2e/framework/dataplane.go b/test/e2e/framework/dataplane.go
@@ -242,21 +242,21 @@ func GetGlobalnetEgressParams(egressIP GlobalEgressIPType) GlobalnetTestParams {
 	}
 }
 
-func IsSingleNodeDeployment(sourceNode, destNode framework.NetworkPodScheduling,
+func CanExecuteNonGatewayConnectivityTest(sourceNode, destNode framework.NetworkPodScheduling,
 	sourceCluster, destCluster framework.ClusterIndex) bool {
 	if sourceNode == framework.NonGatewayNode &&
 		framework.TestContext.NumNodesInCluster[sourceCluster] == 1 {
 		framework.Skipf("Skipping the test as cluster %q has only a single node...",
 			framework.TestContext.ClusterIDs[sourceCluster])
-		return true
+		return false
 	}
 
 	if destNode == framework.NonGatewayNode &&
 		framework.TestContext.NumNodesInCluster[destCluster] == 1 {
 		framework.Skipf("Skipping the test as cluster %q has only a single node...",
 			framework.TestContext.ClusterIDs[destCluster])
-		return true
+		return false
 	}
 
-	return false
+	return true
 }
diff --git a/test/e2e/redundancy/gateway_failover.go b/test/e2e/redundancy/gateway_failover.go
@@ -98,6 +98,11 @@ func testGatewayPodRestartScenario(f *subFramework.Framework) {
 		ToEndpointType:        defaultEndpointType(),
 	}, subFramework.GetGlobalnetEgressParams(subFramework.ClusterSelector))
 
+	if !subFramework.CanExecuteNonGatewayConnectivityTest(framework.NonGatewayNode, framework.NonGatewayNode,
+		framework.ClusterB, framework.ClusterA) {
+		return
+	}
+
 	By(fmt.Sprintf("Verifying TCP connectivity from non-gateway node on %q to non-gateway node on %q", clusterBName, clusterAName))
 	subFramework.VerifyDatapathConnectivity(tcp.ConnectivityTestParams{
 		Framework:             f.Framework,
@@ -132,6 +137,12 @@ func defaultEndpointType() tcp.EndpointType {
 }
 
 func testGatewayFailOverScenario(f *subFramework.Framework) {
+	if framework.TestContext.NumNodesInCluster[framework.ClusterA] == 1 {
+		framework.Skipf("Skipping the test as cluster %q has only a single node...",
+			framework.TestContext.ClusterIDs[framework.ClusterA])
+		return
+	}
+
 	clusterAName := framework.TestContext.ClusterIDs[framework.ClusterA]
 	clusterBName := framework.TestContext.ClusterIDs[framework.ClusterB]
 
@@ -230,6 +241,11 @@ func testGatewayFailOverScenario(f *subFramework.Framework) {
 		ToEndpointType:        defaultEndpointType(),
 	}, subFramework.GetGlobalnetEgressParams(subFramework.ClusterSelector))
 
+	if !subFramework.CanExecuteNonGatewayConnectivityTest(framework.NonGatewayNode, framework.NonGatewayNode,
+		framework.ClusterB, framework.ClusterA) {
+		return
+	}
+
 	By(fmt.Sprintf("Verifying TCP connectivity from non-gateway node on %q to non-gateway node on %q", clusterBName, clusterAName))
 	subFramework.VerifyDatapathConnectivity(tcp.ConnectivityTestParams{
 		Framework:             f.Framework,