X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=env%2Flib%2Fcommon.sh;h=56d19ba72cfe632099c30bf9a18ad5aba43c822b;hb=308b436e60c4f9477641a196fe5a53996fd9bc92;hp=3f572c847684117e904ae00b94d864fa9eb0662f;hpb=3132fc5e4d956ad3181a9ec0c5f234581f8947b1;p=icn.git

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 3f572c8..56d19ba 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -9,8 +9,8 @@ IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
 IRONIC_PROVISIONING_INTERFACE=${IRONIC_PROVISIONING_INTERFACE:-"provisioning"}
 IRONIC_IPMI_INTERFACE=${IRONIC_IPMI_INTERFACE:-}
 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"}
+BM_IMAGE_URL=${BM_IMAGE_URL:-"https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"}
+BM_IMAGE=${BM_IMAGE:-"focal-server-cloudimg-amd64.img"}
 
 #Baremetal operator repository URL
 BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
@@ -24,6 +24,12 @@ FORCE_REPO_UPDATE="${FORCE_REPO_UPDATE:-true}"
 # The kustomize version to use
 KUSTOMIZE_VERSION="v4.3.0"
 
+#Cluster API version to use
+CAPI_VERSION="v0.4.3"
+
+#The flux version to use
+FLUX_VERSION="0.20.0"
+
 #refered from onap
 function call_api {
     #Runs curl with passed flags and provides
@@ -98,6 +104,24 @@ function list_nodes {
     fi
 }
 
+# Returns "null" when the field is not present
+function networkdata_networks_field {
+    name=$1
+    network=$2
+    field=$3
+    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
+    cat $NODES_FILE | jq -c -r --arg name "$name" --arg network "$network" --arg field "$field" '.nodes[] | select(.name==$name) | .net.networks[] | select(.id==$network).'${field}
+}
+
+# Returns "null" when the field is not present
+function networkdata_links_field {
+    name=$1
+    link=$2
+    field=$3
+    NODES_FILE="${IRONIC_DATA_DIR}/nodes.json"
+    cat $NODES_FILE | jq -c -r --arg name "$name" --arg link "$link" --arg field "$field" '.nodes[] | select(.name==$name) | .net.links[] | select(.id==$link).'${field}
+}
+
 function node_networkdata {
     name=$1
 
@@ -107,7 +131,30 @@ function node_networkdata {
         exit 1
     fi
 
-    cat $NODES_FILE  | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net'
+    printf "    networks:\n"
+    for network in $(cat $NODES_FILE | jq -r --arg name "$name" '.nodes[] | select(.name==$name) | .net.networks[].id'); do
+	link=$(networkdata_networks_field $name $network "link")
+	type=$(networkdata_networks_field $name $network "type")
+	mac=$(networkdata_links_field $name $link "ethernet_mac_address")
+
+	# Optional values
+	ip_address=$(networkdata_networks_field $name $network "ip_address")
+	gateway=$(networkdata_networks_field $name $network "gateway")
+	dns_nameservers=$(networkdata_networks_field $name $network "dns_nameservers")
+
+	printf "      ${network}:\n"
+	printf "        macAddress: ${mac}\n"
+	printf "        type: ${type}\n"
+	if [[ $ip_address != "null" ]]; then
+	    printf "        ipAddress: ${ip_address}\n"
+	fi
+	if [[ $gateway != "null" ]]; then
+	    printf "        gateway: ${gateway}\n"
+	fi
+	if [[ $dns_nameservers != "null" ]]; then
+	    printf "        nameservers: ${dns_nameservers}\n"
+	fi
+    done
 }
 
 function wait_for {
@@ -151,6 +198,19 @@ function install_kustomize {
     kustomize version
 }
 
+function install_clusterctl {
+    curl -L https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/clusterctl-linux-amd64 -o clusterctl
+    sudo install -o root -g root -m 0755 clusterctl /usr/local/bin/clusterctl
+    rm clusterctl
+    clusterctl version
+}
+
+function install_flux_cli {
+    export FLUX_VERSION
+    curl -s https://fluxcd.io/install.sh | sudo -E bash
+    flux --version
+}
+
 function fetch_image {
     if [[ "${BM_IMAGE_URL}" && "${BM_IMAGE}" ]]; then
        mkdir -p "${IRONIC_DATA_DIR}/html/images"