MCP: Consolidate common kuttl bash scripts

There is code in the bash scripts that is repeated in multiple kuttl
test files.

In this commit we consolidate that code into shared functions that can
be used by the different tests.

Author: Akrog

test/kuttl/common/shared_funcs.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# Shared assertion functions for kuttl test scripts.
+#
+# Usage: source ../../common/shared_funcs.sh
+#   (from test/kuttl/tests/<test-name>/)
+
+NAMESPACE="${NAMESPACE:-openstack-lightspeed}"
+CR_NAME="${CR_NAME:-openstack-lightspeed}"
+
+assert_mcp_openstack_enabled() {
+  local expected="$1"
+  local mcp_data
+  mcp_data=$(oc get configmap mcp-config -n "$NAMESPACE" \
+    -o jsonpath='{.data.config\.yaml}')
+  local enabled
+  enabled=$(echo "$mcp_data" | grep -A1 "openstack:" | grep "enabled:" | tr -d ' ')
+  if [ "$enabled" != "enabled:${expected}" ]; then
+    echo "ERROR: Expected MCP openstack enabled:${expected}, got ${enabled}"
+    echo "$mcp_data"
+    exit 1
+  fi
+}
+
+assert_openstack_ready() {
+  local expected="$1"
+  local ready
+  ready=$(oc get openstacklightspeed "$CR_NAME" -n "$NAMESPACE" \
+    -o jsonpath='{.status.openStackReady}' 2>/dev/null || true)
+  if [ "$expected" = "true" ]; then
+    if [ "$ready" != "true" ]; then
+      echo "ERROR: Expected openStackReady to be true, got '${ready}'"
+      exit 1
+    fi
+  else
+    if [ "$ready" = "true" ]; then
+      echo "ERROR: Expected openStackReady to not be true, got '${ready}'"
+      exit 1
+    fi
+  fi
+}
+
+assert_condition_status() {
+  local condition_type="$1"
+  local expected_status="$2"
+  local actual
+  actual=$(oc get openstacklightspeed "$CR_NAME" -n "$NAMESPACE" \
+    -o jsonpath="{.status.conditions[?(@.type==\"${condition_type}\")].status}")
+  if [ "$actual" != "$expected_status" ]; then
+    echo "ERROR: Expected condition ${condition_type}=${expected_status}, got '${actual}'"
+    oc get openstacklightspeed "$CR_NAME" -n "$NAMESPACE" -o yaml
+    exit 1
+  fi
+}

test/kuttl/tests/application-credentials/07-assert-intermediate-state.yaml

@@ -10,20 +10,6 @@ commands:
   - script: |
       #!/bin/bash
       set -euo pipefail
-
-      # openStackReady is omitempty, so absent means false
-      READY=$(oc get openstacklightspeed openstack-lightspeed -n openstack-lightspeed \
-        -o jsonpath='{.status.openStackReady}' 2>/dev/null || true)
-      if [ "$READY" = "true" ]; then
-        echo "ERROR: openStackReady should not be true in intermediate state"
-        exit 1
-      fi
-
-      MCP_CFG=$(oc get configmap mcp-config -n openstack-lightspeed \
-        -o jsonpath='{.data.config\.yaml}')
-      ENABLED=$(echo "$MCP_CFG" | grep -A1 "openstack:" | grep "enabled:" | tr -d ' ')
-      if [ "$ENABLED" != "enabled:false" ]; then
-        echo "ERROR: MCP config should have openstack disabled in intermediate state"
-        echo "$MCP_CFG"
-        exit 1
-      fi
+      source ../../common/shared_funcs.sh
+      assert_openstack_ready false
+      assert_mcp_openstack_enabled false

test/kuttl/tests/application-credentials/09-assert-mcp-credentials.yaml

@@ -43,11 +43,5 @@ commands:
         -o jsonpath='{.data.secure\.yaml}' | base64 -d)
       echo "$SECURE" | grep -q "application_credential_secret: mock-ac-secret-abcde"
 
-      MCP_CFG=$(oc get configmap mcp-config -n openstack-lightspeed \
-        -o jsonpath='{.data.config\.yaml}')
-      ENABLED=$(echo "$MCP_CFG" | grep -A1 "openstack:" | grep "enabled:" | tr -d ' ')
-      if [ "$ENABLED" != "enabled:true" ]; then
-        echo "ERROR: MCP config does not have openstack enabled"
-        echo "$MCP_CFG"
-        exit 1
-      fi
+      source ../../common/shared_funcs.sh
+      assert_mcp_openstack_enabled true

test/kuttl/tests/dynamic-crd-watch-recovery/06-assert-openstack-lightspeed-instance.yaml

@@ -15,11 +15,5 @@ commands:
   - script: |
       #!/bin/bash
       set -euo pipefail
-      MCP_DATA=$(oc get configmap mcp-config -n openstack-lightspeed \
-        -o jsonpath='{.data.config\.yaml}')
-      ENABLED=$(echo "$MCP_DATA" | grep -A1 "openstack:" | grep "enabled:" | tr -d ' ')
-      if [ "$ENABLED" != "enabled:true" ]; then
-        echo "ERROR: MCP config does not have openstack enabled"
-        echo "$MCP_DATA"
-        exit 1
-      fi
+      source ../../common/shared_funcs.sh
+      assert_mcp_openstack_enabled true

test/kuttl/tests/dynamic-crd-watch-recovery/07-assert-openstack-lightspeed-instance.yaml

@@ -8,28 +8,7 @@ commands:
   - script: |
       #!/bin/bash
       set -euo pipefail
-      READY=$(oc get openstacklightspeed openstack-lightspeed \
-        -n openstack-lightspeed \
-        -o jsonpath='{.status.openStackReady}' 2>/dev/null || true)
-      if [ "$READY" = "true" ]; then
-        echo "ERROR: openStackReady is still true"
-        exit 1
-      fi
-
-      MCP_DATA=$(oc get configmap mcp-config -n openstack-lightspeed \
-        -o jsonpath='{.data.config\.yaml}')
-      ENABLED=$(echo "$MCP_DATA" | grep -A1 "openstack:" | grep "enabled:" | tr -d ' ')
-      if [ "$ENABLED" != "enabled:false" ]; then
-        echo "ERROR: MCP config does not have openstack disabled"
-        echo "$MCP_DATA"
-        exit 1
-      fi
-
-      CONDITION=$(oc get openstacklightspeed openstack-lightspeed \
-        -n openstack-lightspeed \
-        -o jsonpath='{.status.conditions[?(@.type=="Ready")].status}')
-      if [ "$CONDITION" != "True" ]; then
-        echo "ERROR: Operator is not Ready after CRD removal"
-        oc get openstacklightspeed openstack-lightspeed -n openstack-lightspeed -o yaml
-        exit 1
-      fi
+      source ../../common/shared_funcs.sh
+      assert_openstack_ready false
+      assert_mcp_openstack_enabled false
+      assert_condition_status Ready True

test/kuttl/tests/dynamic-crd-watch-recovery/10-assert-openstack-lightspeed-instance.yaml

@@ -15,11 +15,5 @@ commands:
   - script: |
       #!/bin/bash
       set -euo pipefail
-      MCP_DATA=$(oc get configmap mcp-config -n openstack-lightspeed \
-        -o jsonpath='{.data.config\.yaml}')
-      ENABLED=$(echo "$MCP_DATA" | grep -A1 "openstack:" | grep "enabled:" | tr -d ' ')
-      if [ "$ENABLED" != "enabled:true" ]; then
-        echo "ERROR: MCP config does not have openstack enabled"
-        echo "$MCP_DATA"
-        exit 1
-      fi
+      source ../../common/shared_funcs.sh
+      assert_mcp_openstack_enabled true