1 files changed, 49 insertions, 5 deletions
diff --git a/kud/tests/_functions.sh b/kud/tests/_functions.sh
index 483aed5c..d585086b 100755
--- a/kud/tests/_functions.sh
+++ b/kud/tests/_functions.sh
@@ -25,12 +25,36 @@ function print_msg {
 }
 
 function get_ovn_central_address {
-    ansible_ifconfig=$(ansible ovn-central[0] -i ${FUNCTIONS_DIR}/../hosting_providers/vagrant/inventory/hosts.ini -m shell -a "ifconfig ${OVN_CENTRAL_INTERFACE} |grep \"inet addr\" |awk '{print \$2}' |awk -F: '{print \$2}'")
-    if [[ $ansible_ifconfig != *CHANGED* ]]; then
-        echo "Fail to get the OVN central IP address from ${OVN_CENTRAL_INTERFACE} nic"
-        exit
+    #Reuse OVN_CENTRAL_ADDRESS if available (bypassable by --force flag)
+    if [[ "${1:-}" != "--force" ]] && [[ -n "${OVN_CENTRAL_ADDRESS:-}" ]]; then
+        echo "${OVN_CENTRAL_ADDRESS}"
+        return 0
+    fi
+
+    local remote_command="ip address show dev $OVN_CENTRAL_INTERFACE primary"
+    declare -a ansible_command=(ansible ovn-central[0] -i \
+                "${FUNCTIONS_DIR}/../hosting_providers/vagrant/inventory/hosts.ini")
+    declare -a filter=(awk -F '[ \t/]+' \
+                'BEGIN {r=1} {for (i=1; i<=NF; i++) if ($i == "inet") {print $(i+1); r=0}} END {exit r}')
+    local result
+
+    #Determine OVN_CENTRAL_INTERFACE address
+    if ! result="$("${ansible_command[@]}" -a "${remote_command}")"; then
+        echo "Ansible error for remote host ovn-central[0]" >&2
+        return 1
+    else
+        if [[ "${result}" != *CHANGED* ]]; then
+            echo "Failed to execute command on remote host ovn-central[0]" >&2
+            return 2
+        else
+            if ! result="$("${filter[@]}" <<< "${result}")"; then
+                echo "Failed to retrieve interface address from command output" >&2
+                return 3
+            else
+                echo "${result}:6641"
+            fi
+        fi
     fi
-    echo "$(echo ${ansible_ifconfig#*>>} | tr '\n' ':')6641"
 }
 
 function call_api {
@@ -149,6 +173,26 @@ function wait_deployment {
     done
 }
 
+# wait_for_pod() - Wait until first pod matched by kubectl filters is in running status
+function wait_for_pod {
+    #Example usage:
+    # wait_for_pods example_pod
+    # wait_for_pods --namespace test different_pod
+    # wait_for_pods -n test -l app=plugin_test
+
+    status_phase=""
+    while [[ "$status_phase" != "Running" ]]; do
+        new_phase="$(kubectl get pods -o 'go-template={{ index .items 0 "status" "phase" }}' "$@" )"
+        if [[ "$new_phase" != "$status_phase" ]]; then
+            echo "$(date +%H:%M:%S) - Filter=[$*] : $new_phase"
+            status_phase="$new_phase"
+        fi
+        if [[ "$new_phase" == "Err"* ]]; then
+            exit 1
+        fi
+    done
+}
+
 # setup() - Base testing setup shared among functional tests
 function setup {
     if ! $(kubectl version &>/dev/null); then