Reuse dev-scripts pools to avoid conflicts

Dev-scripts creates pools with varying names (oooq_pool, eci-XXXX-1).
Our script now finds and reuses whatever pool points to our cluster
path instead of trying to create a new one, avoiding conflicts.

Also fixes cleanup to remove pools by path, not just by name.

Author: eliorerz

scripts/cleanup.sh

@@ -255,12 +255,15 @@ fi
 # Clean up cluster-specific libvirt storage pools
 # Find all pools that point to our cluster directory, regardless of name
 # Dev-scripts may create pools with various names (oooq_pool, ${CLUSTER_NAME}, etc.)
-CLUSTER_POOL_PATH=""
+# and various paths (pool/, landing-zone/, etc.)
+CLUSTER_POOL_PATHS=()
 if [ -n "${WORKING_DIR:-}" ]; then
     if [[ "${WORKING_DIR}" == *"/clusters/${CLUSTER_NAME}" ]]; then
-        CLUSTER_POOL_PATH="${WORKING_DIR}/pool"
+        CLUSTER_POOL_PATHS+=("${WORKING_DIR}/pool")
+        CLUSTER_POOL_PATHS+=("${WORKING_DIR}/landing-zone/${CLUSTER_NAME}")
     elif [ -n "${BASE_WORKING_DIR:-}" ]; then
-        CLUSTER_POOL_PATH="${BASE_WORKING_DIR}/clusters/${CLUSTER_NAME}/pool"
+        CLUSTER_POOL_PATHS+=("${BASE_WORKING_DIR}/clusters/${CLUSTER_NAME}/pool")
+        CLUSTER_POOL_PATHS+=("${BASE_WORKING_DIR}/clusters/${CLUSTER_NAME}/landing-zone/${CLUSTER_NAME}")
     fi
 fi
 
@@ -274,18 +277,21 @@ for POOL_NAME in "${CLUSTER_NAME}" "${CLUSTER_NAME}-lz" "${CLUSTER_NAME}_pool";
     fi
 done
 
-# Also find any pool pointing to our cluster-specific path (handles oooq_pool, etc.)
-if [ -n "$CLUSTER_POOL_PATH" ]; then
+# Also find any pool pointing to our cluster-specific paths (handles oooq_pool, eci-XXXX-1, etc.)
+if [ ${#CLUSTER_POOL_PATHS[@]} -gt 0 ]; then
     while IFS= read -r pool; do
         if [ -n "$pool" ]; then
             POOL_PATH_CHECK=$(sudo virsh pool-dumpxml "$pool" 2>/dev/null | grep -oP '(?<=<path>).*(?=</path>)' || echo "")
-            if [ "$POOL_PATH_CHECK" = "$CLUSTER_POOL_PATH" ]; then
-                # Check if not already in the list
-                if [[ ! " ${POOLS_TO_CLEAN[@]} " =~ " ${pool} " ]]; then
-                    info "Found pool '$pool' pointing to cluster path, will clean it up"
-                    POOLS_TO_CLEAN+=("$pool")
+            for cluster_path in "${CLUSTER_POOL_PATHS[@]}"; do
+                if [ "$POOL_PATH_CHECK" = "$cluster_path" ]; then
+                    # Check if not already in the list
+                    if [[ ! " ${POOLS_TO_CLEAN[@]} " =~ " ${pool} " ]]; then
+                        info "Found pool '$pool' pointing to cluster path $cluster_path, will clean it up"
+                        POOLS_TO_CLEAN+=("$pool")
+                    fi
+                    break
                 fi
-            fi
+            done
         fi
     done < <(sudo virsh pool-list --all --name)
 fi
@@ -421,17 +427,20 @@ for POOL_NAME in "${CLUSTER_NAME}" "${CLUSTER_NAME}-lz" "${CLUSTER_NAME}_pool";
     fi
 done
 
-# Check for any pool pointing to cluster path (handles oooq_pool, etc.)
-if [ -n "$CLUSTER_POOL_PATH" ]; then
+# Check for any pool pointing to cluster paths (handles oooq_pool, eci-XXXX-1, etc.)
+if [ ${#CLUSTER_POOL_PATHS[@]} -gt 0 ]; then
     while IFS= read -r pool; do
         if [ -n "$pool" ]; then
             POOL_PATH_CHECK=$(sudo virsh pool-dumpxml "$pool" 2>/dev/null | grep -oP '(?<=<path>).*(?=</path>)' || echo "")
-            if [ "$POOL_PATH_CHECK" = "$CLUSTER_POOL_PATH" ]; then
-                # Add if not already in list
-                if [[ ! "$LEFTOVER_POOLS" =~ $pool ]]; then
-                    LEFTOVER_POOLS="${LEFTOVER_POOLS}${pool} "
+            for cluster_path in "${CLUSTER_POOL_PATHS[@]}"; do
+                if [ "$POOL_PATH_CHECK" = "$cluster_path" ]; then
+                    # Add if not already in list
+                    if [[ ! "$LEFTOVER_POOLS" =~ $pool ]]; then
+                        LEFTOVER_POOLS="${LEFTOVER_POOLS}${pool} "
+                    fi
+                    break
                 fi
-            fi
+            done
         fi
     done < <(sudo virsh pool-list --all --name)
 fi