E2E: rename network 'kindexgw' to 'xgw'

Network maybe utilized without KinD as the infra
provider.

Picked xgw as name because if its lexographically
"less" than "kind" then default route will point
to the wrong network.

Signed-off-by: Martin Kennelly <[email protected]>

Author: martinkennelly

.github/workflows/test.yml

@@ -551,7 +551,8 @@ jobs:
         echo "GOPATH=$GOPATH" >> $GITHUB_ENV
         echo "$GOPATH/bin" >> $GITHUB_PATH
         if [ $OVN_SECOND_BRIDGE == "true" ]; then
-          echo OVN_TEST_EX_GW_NETWORK=kindexgw >> $GITHUB_ENV
+          # must be "greater" lexigraphically than network "kind", therefore external gateway is named xgw
+          echo OVN_TEST_EX_GW_NETWORK=xgw >> $GITHUB_ENV
           echo OVN_ENABLE_EX_GW_NETWORK_BRIDGE=true >> $GITHUB_ENV
         fi
         if [[ "$JOB_NAME" == *"shard-conformance"* ]] && [ "$ADVERTISE_DEFAULT_NETWORK" == "true" ]; then

contrib/kind-common

@@ -450,7 +450,7 @@ install_ipamclaim_crd() {
 
 docker_create_second_disconnected_interface() {
   echo "adding second interfaces to nodes"
-  local bridge_name="${1:-kindexgw}"
+  local bridge_name="${1:-xgw}"
   echo "bridge: $bridge_name"
 
   if [ "${OCI_BIN}" = "podman" ]; then

contrib/kind.sh

@@ -1096,11 +1096,11 @@ docker_create_second_interface() {
   echo "adding second interfaces to nodes"
 
   # Create the network as dual stack, regardless of the type of the deployment. Ignore if already exists.
-  "$OCI_BIN" network create --ipv6 --driver=bridge kindexgw --subnet=172.19.0.0/16 --subnet=fc00:f853:ccd:e798::/64 || true
+  "$OCI_BIN" network create --ipv6 --driver=bridge xgw --subnet=172.19.0.0/16 --subnet=fc00:f853:ccd:e798::/64 || true
 
   KIND_NODES=$(kind get nodes --name "${KIND_CLUSTER_NAME}")
   for n in $KIND_NODES; do
-    "$OCI_BIN" network connect kindexgw "$n"
+    "$OCI_BIN" network connect xgw "$n"
   done
 }
 

test/e2e/e2e.go

@@ -1677,10 +1677,10 @@ var _ = ginkgo.Describe("e2e ingress traffic validation", func() {
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "external container %s must be created successfully", externalContainer.Name)
 
-			// If `kindexgw` exists, connect client container to it
-			kindExgwNetwork, err := infraprovider.Get().GetNetwork("kindexgw")
+			// If `xgw` exists, connect client container to it
+			exGwNetwork, err := infraprovider.Get().GetNetwork("xgw")
 			if err == nil {
-				_, _ = providerCtx.AttachNetwork(kindExgwNetwork, externalContainer.Name)
+				_, _ = providerCtx.AttachNetwork(exGwNetwork, externalContainer.Name)
 			}
 			ginkgo.By("Adding ip addresses to each node")
 			// add new secondary IP from node subnet to all nodes, if the cluster is v6 add an ipv6 address

test/e2e/service.go

@@ -815,8 +815,8 @@ var _ = ginkgo.Describe("Services", func() {
 			externalContainer, err = providerCtx.CreateExternalContainer(externalContainer)
 			framework.ExpectNoError(err, "external container %s must be created", externalContainer.Name)
 
-			// If `kindexgw` exists, connect client container to it
-			exGwNetwork, err := infraprovider.Get().GetNetwork("kindexgw")
+			// If `xgw` exists, connect client container to it
+			exGwNetwork, err := infraprovider.Get().GetNetwork("xgw")
 			if err == nil {
 				_, _ = providerCtx.AttachNetwork(exGwNetwork, externalContainer.Name)
 			}
@@ -1074,10 +1074,10 @@ spec:
 			// FIXME: implement feature to connect networks
 			// FIXME: tests shouldnt depend on external resources precreated and instead manage those resources within
 			// the lifecycle of the test.
-			// If `kindexgw` exists, connect client container to it
-			kindExGWNetwork, err := infraprovider.Get().GetNetwork("kindexgw")
+			// If `xgw` exists, connect client container to it
+			exGWNetwork, err := infraprovider.Get().GetNetwork("xgw")
 			if err == nil {
-				_, _ = providerCtx.AttachNetwork(kindExGWNetwork, serverExternalContainer.GetName())
+				_, _ = providerCtx.AttachNetwork(exGWNetwork, serverExternalContainer.GetName())
 			}
 
 			ginkgo.By("Selecting additional IP addresses for each node")