delete the private 'branch' router part of the demo because it no longer works reliably with mop

Author: qrkourier

.github/workflows/main.yml

@@ -72,6 +72,7 @@ jobs:
         register-python-argcomplete nfctl
 
     - name: Run the NF CLI demo to  test installed version
+      id: test_demo
       shell: bash
       env:
         NETFOUNDRY_CLIENT_ID: ${{ secrets.NETFOUNDRY_CLIENT_ID }}
@@ -141,3 +142,43 @@ jobs:
         platforms: linux/amd64,linux/arm64
         push: true
         tags: ${{ steps.compose_tags.outputs.container_tags }}
+
+  cleanup-delay:
+    if: failure()
+    needs: [build_pypi_and_docker]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Wait 30 minutes before cleanup
+        run: |
+          echo "Test demo failed to complete. Waiting 30 minutes before cleanup to allow investigation..."
+          sleep 1800
+
+  cleanup-network:
+    if: always() && needs.build_pypi_and_docker.result == 'failure'
+    needs: [cleanup-delay]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.12'
+
+      - name: Install nfctl
+        run: |
+          python -m pip install --upgrade pip
+          pip install .
+
+      - name: Delete test network
+        env:
+          NETFOUNDRY_CLIENT_ID: ${{ secrets.NETFOUNDRY_CLIENT_ID }}
+          NETFOUNDRY_PASSWORD: ${{ secrets.NETFOUNDRY_PASSWORD }}
+          NETFOUNDRY_OAUTH_URL: ${{ secrets.NETFOUNDRY_OAUTH_URL }}
+        run: |
+          # Use wildcard pattern to match network created by this run
+          NETWORK_PATTERN="gh-${GITHUB_RUN_ID}-%"
+          echo "Attempting to delete network matching: ${NETWORK_PATTERN}"
+
+          # Try to delete the network, ignore errors if it doesn't exist
+          nfctl delete network "name=${NETWORK_PATTERN}" --yes || echo "Network may not exist or already deleted"

netfoundry/ctl.py

@@ -1116,32 +1116,6 @@ def create_or_validate_router(region):
                 services[svc]['properties'] = network.services(name=svc)[0]
                 spinner.succeed(sub("Finding", "Found", spinner.text))
 
-    # create a customer-hosted ER unless exists
-    customer_router_name = "Branch Exit Router"
-    spinner.text = f"Finding customer router '{customer_router_name}'"
-    with spinner:
-        if not network.edge_router_exists(name=customer_router_name):
-            spinner.text = sub("Finding", "Creating", spinner.text)
-            customer_router = network.create_edge_router(
-                name=customer_router_name,
-                attributes=["#branch_exit_routers"],
-                tunneler_enabled=True)
-        else:
-            customer_router = network.edge_routers(name=customer_router_name)[0]
-            spinner.succeed(sub("Finding", "Found", spinner.text))
-
-    spinner.text = f"Getting registration key for customer router {customer_router_name}"
-    # Customer routers don't auto-provision - registration key is available immediately at status NEW
-    # The router will only reach PROVISIONED status after manual registration and connection
-    with spinner:
-        try:
-            network.wait_for_statuses(expected_statuses=RESOURCES["edge-routers"].status_symbols["complete"], id=customer_router['id'], type="edge-router", wait=222, progress=False)
-            customer_router_registration = network.rotate_edge_router_registration(id=customer_router['id'])
-        except Exception as e:
-            raise RuntimeError(f"error getting router registration, got {e}")
-        else:
-            spinner.succeed(f"Customer router ready to register with key '{customer_router_registration['registrationKey']}'")
-
     # create unless exists
     app_wan_name = "Default Service Policy"
     spinner.text = "Finding service policy"

scripts/test-demo.sh

@@ -2,6 +2,7 @@
 # Test script for nfctl demo command
 # Can be run locally or in GitHub Actions
 
+set -o errexit
 set -o xtrace
 set -o pipefail