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

diff --git a/env/lib/common.sh b/env/lib/common.sh
index 3f572c8..0de8406 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -eu -o pipefail
 
-DOWNLOAD_PATH=${DOWNLOAD_PATH:-/opt/icn}
-
 IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}
 #IRONIC_PROVISIONING_INTERFACE is required to be provisioning, don't change it
 IRONIC_INTERFACE=${IRONIC_INTERFACE:-}
@@ -18,12 +16,26 @@ BMOREPO="${BMOREPO:-https://github.com/metal3-io/baremetal-operator.git}"
 BMOPATH="/opt/src/github.com/metal3-io/baremetal-operator"
 #Bare Metal Operator version to use
 BMO_VERSION="capm3-v0.5.1"
-#Discard existing baremetal operator repo directory
+
+#KuD repository URL
+KUDREPO="${KUDREPO:-https://github.com/onap/multicloud-k8s.git}"
+#Path to clone the KuD repo
+KUDPATH="/opt/src/github.com/onap/multicloud-k8s"
+#KuD version to use
+KUD_VERSION="ed96bca7fe415f1636d82c26af15d7474bdfe876"
+
+#Discard existing repo directory
 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 +110,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 +137,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 {
@@ -124,25 +177,36 @@ function wait_for {
     done
 }
 
-function clone_baremetal_operator_repository {
-    mkdir -p $(dirname ${BMOPATH})
-    if [[ -d ${BMOPATH} && "${FORCE_REPO_UPDATE}" == "true" ]]; then
-       rm -rf "${BMOPATH}"
+function clone_repository {
+    local -r path=$1
+    local -r repo=$2
+    local -r version=$3
+    mkdir -p $(dirname ${path})
+    if [[ -d ${path} && "${FORCE_REPO_UPDATE}" == "true" ]]; then
+       rm -rf "${path}"
     fi
-    if [ ! -d "${BMOPATH}" ] ; then
-        pushd $(dirname ${BMOPATH})
-        git clone "${BMOREPO}"
+    if [ ! -d "${path}" ] ; then
+        pushd $(dirname ${path})
+        git clone "${repo}"
         popd
     else
-       pushd "${BMOPATH}"
+       pushd "${path}"
        git fetch
        popd
     fi
-    pushd "${BMOPATH}"
-    git reset --hard "${BMO_VERSION}"
+    pushd "${path}"
+    git reset --hard "${version}"
     popd
 }
 
+function clone_baremetal_operator_repository {
+    clone_repository ${BMOPATH} ${BMOREPO} ${BMO_VERSION}
+}
+
+function clone_kud_repository {
+    clone_repository ${KUDPATH} ${KUDREPO} ${KUD_VERSION}
+}
+
 function install_kustomize {
     curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz" -o kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz
     tar xzf kustomize_${KUSTOMIZE_VERSION}_linux_amd64.tar.gz --no-same-owner
@@ -151,6 +215,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"