Separating metal-lb ip-address pool definition

e2e/tests/oai/001a-infra.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+#!/usr/bin/env bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2023 The Nephio Authors.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+## TEST METADATA
+## TEST-NAME: Deploy and interconnect OAI clusters
+##
+
+set -o pipefail
+set -o errexit
+set -o nounset
+[[ ${DEBUG:-false} != "true" ]] || set -o xtrace
+
+# shellcheck source=e2e/defaults.env
+source "$E2EDIR/defaults.env"
+
+# shellcheck source=e2e/lib/k8s.sh
+source "${LIBDIR}/k8s.sh"
+
+# shellcheck source=e2e/lib/kpt.sh
+source "${LIBDIR}/kpt.sh"
+
+# shellcheck source=e2e/lib/capi.sh
+source "${LIBDIR}/capi.sh"
+
+# shellcheck source=e2e/lib/porch.sh
+source "${LIBDIR}/porch.sh"
+
+# shellcheck source=e2e/lib/_assertions.sh
+source "${LIBDIR}/_assertions.sh"
+
+
+declare -A clusters
+clusters=(
+    ["core"]="172.18.16.0/20"
+    ["regional"]="172.18.32.0/20"
+    ["edge"]="172.18.48.0/20"
+)
+
+k8s_apply "$TESTDIR/001-infra.yaml"
+
+# Wait for cluster resources creation
+for cluster in "${!clusters[@]}"; do
+    k8s_wait_exists "workloadcluster" "$cluster"
+    k8s_wait_exists "packagevariant" "oai-$cluster-clusters-mgmt-$cluster"
+    k8s_wait_exists "cl" "$cluster" "$HOME/.kube/config" "default" 900
+done
+
+# Wait for cluster readiness
+kubeconfig="$HOME/.kube/config"
+for cluster in $(kubectl get cl -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig "$kubeconfig"); do
+    capi_cluster_ready "$cluster"
+done
+
+# Inter-connect worker nodes
+"$E2EDIR/provision/hacks/inter-connect_workers.sh"
+
+# Configure VLAN interfaces
+"$E2EDIR/provision/hacks/vlan-interfaces.sh"
+
+# Create network package variant
+k8s_apply "$TESTDIR/001-network.yaml"
+
+# Provide a secret for external backend connection
+k8s_apply "$TESTDIR/001-secret.yaml"
+
+k8s_wait_ready "packagevariant" "network"
+kpt_wait_pkg "mgmt" "network"
+
+# Wait for cluster resources creation
+for vpc in cu-e1 cudu-f1 internal internet ran; do
+    k8s_wait_exists "networkinstance" "vpc-$vpc"
+done
+
+# Generate a RawTopology to interconnect clusters
+"$E2EDIR/provision/hacks/network-topo.sh"

e2e/tests/oai/001-infra.sh → e2e/tests/oai/001b-infra-metal-lb.sh

@@ -10,7 +10,7 @@
 ##############################################################################
 
 ## TEST METADATA
-## TEST-NAME: Deploy and interconnect OAI clusters
+## TEST-NAME: Define IP Address pools on OAI clusters
 ##
 
 set -o pipefail
@@ -73,45 +73,7 @@ clusters=(
     ["edge"]="172.18.48.0/20"
 )
 
-k8s_apply "$TESTDIR/001-infra.yaml"
-
-# Wait for cluster resources creation
-for cluster in "${!clusters[@]}"; do
-    k8s_wait_exists "workloadcluster" "$cluster"
-    k8s_wait_exists "packagevariant" "oai-$cluster-clusters-mgmt-$cluster"
-    k8s_wait_exists "cl" "$cluster" "$HOME/.kube/config" "default" 900
-done
-
-# Wait for cluster readiness
-kubeconfig="$HOME/.kube/config"
-for cluster in $(kubectl get cl -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' --kubeconfig "$kubeconfig"); do
-    capi_cluster_ready "$cluster"
-done
-
 # Define MetalLB IP ranges
 for cluster in "${!clusters[@]}"; do
     _define_ip_address_pool "$cluster" "${clusters[$cluster]}"
 done
-
-# Inter-connect worker nodes
-"$E2EDIR/provision/hacks/inter-connect_workers.sh"
-
-# Configure VLAN interfaces
-"$E2EDIR/provision/hacks/vlan-interfaces.sh"
-
-# Create network package variant
-k8s_apply "$TESTDIR/001-network.yaml"
-
-# Provide a secret for external backend connection
-k8s_apply "$TESTDIR/001-secret.yaml"
-
-k8s_wait_ready "packagevariant" "network"
-kpt_wait_pkg "mgmt" "network"
-
-# Wait for cluster resources creation
-for vpc in cu-e1 cudu-f1 internal internet ran; do
-    k8s_wait_exists "networkinstance" "vpc-$vpc"
-done
-
-# Generate a RawTopology to interconnect clusters
-"$E2EDIR/provision/hacks/network-topo.sh"