Move wait_for to common.sh

[icn.git] / env / lib / common.sh

diff --git a/env/lib/common.sh b/env/lib/common.sh
index aa8a1e9..7ec65c5 100755 (executable)
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -18,10 +18,6 @@ IRONIC_PROVISIONING_INTERFACE_IP=${IRONIC_PROVISIONING_INTERFACE_IP:-"172.22.0.1
 BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img"}
 BM_IMAGE=${BM_IMAGE:-"bionic-server-cloudimg-amd64.img"}
 
-#Path to clone the metal3 dev env repo
-M3PATH="$(go env GOPATH)/src/github.com/metal3-io"
-#Path to clone the baremetal operator repo
-BMOPATH="${M3PATH}/baremetal-operator"
 #Baremetal operator repository URL
 BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
 #Baremetal operator repository branch to checkout
@@ -67,17 +63,40 @@ function list_nodes {
         exit 1
     fi
 
-    cat "$NODES_FILE" | \
-        jq -r '.nodes[] | [
-           .name,
-           .ipmi_driver_info.username,
-           .ipmi_driver_info.password,
-           .ipmi_driver_info.address,
-           .os.username,
-           .os.password,
-           .os.image_name
-           ] | @csv' | \
-        sed 's/"//g'
+    # The boot MAC address must be specified when a port is included
+    # in the IPMI driver address (i.e when using the VirtualBMC
+    # controller).  Note that the below is a bit of a hack as it only
+    # checks the first entry in NODES_FILE for the port.
+    if cat "$NODES_FILE" |
+            jq -r '.nodes[0].ipmi_driver_info.address' | grep -c ':[0-9]\+$' >/dev/null; then
+        BOOT_LINK=$(cat "$NODES_FILE" |
+                        jq -r '.nodes[0].net.links | map(.id=="provisioning_nic") | index(true)')
+        cat "$NODES_FILE" |
+            jq -r --argjson BOOT_LINK $BOOT_LINK '.nodes[] | [
+               .name,
+               .ipmi_driver_info.username,
+               .ipmi_driver_info.password,
+               .ipmi_driver_info.address,
+               .net.links[$BOOT_LINK].ethernet_mac_address,
+               .os.username,
+               .os.password,
+               .os.image_name
+               ] | @csv' |
+            sed 's/"//g'
+    else
+        cat "$NODES_FILE" |
+            jq -r '.nodes[] | [
+               .name,
+               .ipmi_driver_info.username,
+               .ipmi_driver_info.password,
+               .ipmi_driver_info.address,
+               "",
+               .os.username,
+               .os.password,
+               .os.image_name
+               ] | @csv' |
+            sed 's/"//g'
+    fi
 }
 
 function node_networkdata {
@@ -91,3 +110,17 @@ function node_networkdata {
 
     cat $NODES_FILE  | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net'
 }
+
+function wait_for {
+    local -r interval=${WAIT_FOR_INTERVAL:-30s}
+    local -r max_tries=${WAIT_FOR_TRIES:-20}
+    local try=0
+    until "$@"; do
+        echo "[${try}/${max_tries}] - Waiting ${interval} for $*"
+        sleep ${interval}
+        try=$((try+1))
+        if [[ ${try} -ge ${max_tries} ]]; then
+            return 1
+        fi
+    done
+}