From b1672df3ccd5b61c3e0b6d18c9f993ced157250e Mon Sep 17 00:00:00 2001
From: otherview <otherview@gmail.com>
Date: Mon, 9 Oct 2023 11:01:08 +0100
Subject: [PATCH 1/4] fix the lb script

---
 .../runner-scripts/testnet-clear-loadbalancer.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh b/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh
index 0a6eeb1dc5..5bddad6a22 100755
--- a/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh
+++ b/.github/workflows/runner-scripts/testnet-clear-loadbalancer.sh
@@ -5,12 +5,18 @@
 #
 #
 
-if [[ $1 == "testnet" ]]; then
-  lb=testnet-loadbalancer
-  pool=Backend-Pool-Obscuro-testnet
+if [[ $1 == "uat-testnet" ]]; then
+  lb=uat-testnet-loadbalancer
+  pool=uat-testnet-backend-pool
+elif [[ $1 == "dev-testnet" ]]; then
+  lb=dev-testnet-loadbalancer
+  pool=dev-testnet-backend-pool
+elif [[ $1 == "sepolia-testnet" ]]; then
+  lb=sepolia-testnet-loadbalancer
+  pool=sepolia-testnet-backend-pool
 else
-  lb=devtestnet-loadbalancer
-  pool=Backend-Pool-Obscuro-devtestnet
+  echo "Invalid argument. Use 'uat-testnet', 'dev-testnet', or 'sepolia-testnet'"
+  exit 1
 fi
 
 nic_id=$(az network lb address-pool show \

From e37496cdf26e9cf261686208b4b374cddc9c4511 Mon Sep 17 00:00:00 2001
From: otherview <otherview@gmail.com>
Date: Mon, 9 Oct 2023 11:29:05 +0100
Subject: [PATCH 2/4] fix naming

---
 .github/workflows/manual-deploy-testnet-l2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
index cc0fe1490d..0425fe0ae5 100644
--- a/.github/workflows/manual-deploy-testnet-l2.yml
+++ b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -281,7 +281,7 @@ jobs:
         with:
           inlineScript: |
             az network nic ip-config address-pool add \
-              --address-pool Backend-Pool-Obscuro-${{vars.RESOURCE_TESTNET_NAME}} \
+              --address-pool ${{vars.RESOURCE_TESTNET_NAME}}-backend-pool \
               --ip-config-name ipconfig${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }} \
               --nic-name ${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }}VMNic \
               --resource-group Testnet \

From ceebdec25e88a24c48631d1def3601e7715b213f Mon Sep 17 00:00:00 2001
From: otherview <otherview@gmail.com>
Date: Mon, 9 Oct 2023 15:50:25 +0100
Subject: [PATCH 3/4] fixing some names

---
 .github/workflows/manual-deploy-testnet-l2.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
index 0425fe0ae5..4c3e43e82f 100644
--- a/.github/workflows/manual-deploy-testnet-l2.yml
+++ b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -197,7 +197,7 @@ jobs:
             --admin-username obscurouser --admin-password "${{ secrets.OBSCURO_NODE_VM_PWD }}" \
             --public-ip-address-dns-name "obscuronode-${{ matrix.host_id }}-${{vars.RESOURCE_TESTNET_NAME}}-${{ GITHUB.RUN_NUMBER }}" \
             --tags deploygroup=ObscuroNode-${{vars.RESOURCE_TESTNET_NAME}}-${{ GITHUB.RUN_NUMBER }}  ${{vars.RESOURCE_TAG_NAME}}=true \
-            --vnet-name ObscuroHost-${{vars.RESOURCE_TESTNET_NAME}}-01VNET --subnet ObscuroHost-${{vars.RESOURCE_TESTNET_NAME}}-01Subnet \
+            --vnet-name ${{vars.RESOURCE_TESTNET_NAME}}-virtual-network --subnet ${{vars.RESOURCE_TESTNET_NAME}}-sub-network \
             --size Standard_DC8_v2 --storage-sku StandardSSD_LRS --image ObscuroConfUbuntu \
             --public-ip-sku Standard --authentication-type password
 
@@ -282,8 +282,8 @@ jobs:
           inlineScript: |
             az network nic ip-config address-pool add \
               --address-pool ${{vars.RESOURCE_TESTNET_NAME}}-backend-pool \
-              --ip-config-name ipconfig${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }} \
-              --nic-name ${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }}VMNic \
+              --ip-config-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-ipconfig \
+              --nic-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-${{ matrix.host_id }}-nic \
               --resource-group Testnet \
               --lb-name ${{vars.RESOURCE_TESTNET_NAME}}-loadbalancer
 

From 918065387a27505fec5f58caab8685c56baa019b Mon Sep 17 00:00:00 2001
From: otherview <otherview@gmail.com>
Date: Mon, 9 Oct 2023 16:20:40 +0100
Subject: [PATCH 4/4] fix auto generated names

---
 .github/workflows/manual-deploy-testnet-l2.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/manual-deploy-testnet-l2.yml b/.github/workflows/manual-deploy-testnet-l2.yml
index 4c3e43e82f..3e8c1299c6 100644
--- a/.github/workflows/manual-deploy-testnet-l2.yml
+++ b/.github/workflows/manual-deploy-testnet-l2.yml
@@ -282,8 +282,8 @@ jobs:
           inlineScript: |
             az network nic ip-config address-pool add \
               --address-pool ${{vars.RESOURCE_TESTNET_NAME}}-backend-pool \
-              --ip-config-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-ipconfig \
-              --nic-name ${{vars.RESOURCE_STARTING_NAME}}-${{ GITHUB.RUN_NUMBER }}-${{ matrix.host_id }}-nic \
+              --ip-config-name ipconfig${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }} \
+              --nic-name ${{vars.RESOURCE_STARTING_NAME}}-1-${{ GITHUB.RUN_NUMBER }}VMNic \
               --resource-group Testnet \
               --lb-name ${{vars.RESOURCE_TESTNET_NAME}}-loadbalancer