Skip to content

Commit 913120a

Browse files
author
sivakami
committed
fix vnet names.
1 parent 7e55624 commit 913120a

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.pipelines/swiftv2-long-running/scripts/create_aks.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ CLUSTER_PREFIX="aks"
1212
DEFAULT_NODE_COUNT=1
1313
COMMON_TAGS="fastpathenabled=true RGOwner=LongRunningTestPipelines stampcreatorserviceinfo=true"
1414

15-
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
16-
source "$SCRIPT_DIR/get_vnet_data.sh"
17-
1815
wait_for_provisioning() { # Helper for safe retry/wait for provisioning states (basic)
1916
local rg="$1" clusterName="$2"
2017
echo "Waiting for AKS '$clusterName' in RG '$rg' to reach Succeeded/Failed (polling)..."

.pipelines/swiftv2-long-running/scripts/datapath_tests.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ CLUSTER2="aks-2"
1313

1414
# VNet/Subnet mappings for test
1515
declare -A VN_SUB_MAP
16-
VN_SUB_MAP["vnet_a1"]="s1 s2"
17-
VN_SUB_MAP["vnet_a2"]="s1"
18-
VN_SUB_MAP["vnet_a3"]="s1"
19-
VN_SUB_MAP["vnet_b1"]="s1"
16+
VN_SUB_MAP["cx_vnet_a1"]="s1 s2"
17+
VN_SUB_MAP["cx_vnet_a2"]="s1"
18+
VN_SUB_MAP["cx_vnet_a3"]="s1"
19+
VN_SUB_MAP["cx_vnet_b1"]="s1"
2020

2121
# PN/PNI base names
2222
PN_PREFIX="pn-${BUILD_ID}"
@@ -49,7 +49,6 @@ create_pn() {
4949
echo "PodNetwork ${pn_name} submitted successfully."
5050
}
5151

52-
5352
create_pni() {
5453
local KUBECONFIG_PATH=$1
5554
local NAMESPACE=$2
@@ -85,7 +84,7 @@ get_nodes() {
8584
PN_C2="${PN_PREFIX}-c2"
8685
PNI_C2="${PNI_PREFIX}-c2"
8786

88-
create_pn "/tmp/${CLUSTER2}.kubeconfig" "$PN_C2" "vnet_b1" "s1"
87+
create_pn "/tmp/${CLUSTER2}.kubeconfig" "$PN_C2" "cx_vnet_b1" "s1"
8988
create_pni "/tmp/${CLUSTER2}.kubeconfig" "$PN_C2" "$PNI_C2" "$PN_C2" "explicit" "2" "$CLUSTER2"
9089

9190
# Create 2 pods for Customer2, one per node in aks-2

0 commit comments

Comments
 (0)