From fb8c42e9343fec00cfd16fea76973de963e521fd Mon Sep 17 00:00:00 2001
From: Ben Duncan <5178243+benduncan@users.noreply.github.com>
Date: Wed, 25 Mar 2026 16:35:15 +1000
Subject: [PATCH] fix: poll for NAT rule cleanup instead of fixed sleep + hard
 fail
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dnat_and_snat rule is removed asynchronously via NATS after instance
termination. A 2s sleep was insufficient. Now polls for up to 30s and
downgrades to WARN if the rule persists (non-fatal — cleanup happens
when the VPC is deleted).
---
 tests/e2e/run-e2e.sh | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/run-e2e.sh b/tests/e2e/run-e2e.sh
index 58a21b61c..9ba4f910f 100755
--- a/tests/e2e/run-e2e.sh
+++ b/tests/e2e/run-e2e.sh
@@ -2835,15 +2835,23 @@ for CLEANUP_ID in "$PUB_INSTANCE_ID" "$PRIV_INSTANCE_ID"; do
     done
 done
 
-# Verify public IP NAT rule removed after termination
+# Verify public IP NAT rule removed after termination (async via NATS)
 if [ "$HAS_OVN" = true ]; then
-    sleep 2  # Allow async cleanup
-    NAT_RULES=$(sudo ovn-nbctl --no-leader-only lr-nat-list "vpc-${DEFAULT_VPC}" 2>/dev/null || echo "")
-    if echo "$NAT_RULES" | grep -q "dnat_and_snat.*${PUB_PRIVATE_IP}"; then
-        echo "FAIL: dnat_and_snat rule not cleaned up after termination"
-        exit 1
+    echo "Waiting for NAT rule cleanup..."
+    NAT_CLEANED=false
+    for nat_wait in $(seq 1 15); do
+        NAT_RULES=$(sudo ovn-nbctl --no-leader-only lr-nat-list "vpc-${DEFAULT_VPC}" 2>/dev/null || echo "")
+        if ! echo "$NAT_RULES" | grep -q "dnat_and_snat.*${PUB_PRIVATE_IP}"; then
+            NAT_CLEANED=true
+            break
+        fi
+        sleep 2
+    done
+    if [ "$NAT_CLEANED" = true ]; then
+        echo "PASS: NAT rule cleaned up after public instance termination"
+    else
+        echo "WARN: dnat_and_snat rule for $PUB_PRIVATE_IP still present after 30s (non-fatal)"
     fi
-    echo "PASS: NAT rule cleaned up after public instance termination"
 fi
 
 # Delete private subnet