From 493ca4b1def4632625ffadacb40753283b2ee33a Mon Sep 17 00:00:00 2001
From: Alex Yang <yangyang1@zte.com.cn>
Date: Wed, 3 Jan 2018 15:42:01 +0800
Subject: Get configurations from pharos instead securedlab

Securedlab will be retired. So we should get configurations from
pharos. See [1]

[1]: https://gerrit.opnfv.org/gerrit/#/c/49161/

Change-Id: I42684a7c00ad96b1e7d0496724f0d820ffc27674
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---
 ci/deploy/deploy.sh | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 4ea87b6b..ff74061e 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -118,7 +118,7 @@ do
     esac
 done
 
-SECURELABDIR=${SECURELABDIR:-${WORKSPACE}/securedlab}
+SECURELABDIR=${SECURELABDIR:-${WORKSPACE}/pharos}
 
 if [[ ! "$SECURELABDIR" = /* ]] || [ -z $LAB_NAME ] || [ -z $POD_NAME ] ; then
     echo """Please check
@@ -184,14 +184,20 @@ BMDEPLOY_DAISY_SERVER_VM=$WORKSPACE/templates/physical_environment/vms/daisy.xml
 function update_dha_by_pdf()
 {
     local pdf_yaml=labs/$LAB_NAME/${POD_NAME}.yaml
-    local jinja2_template=installers/daisy/pod_config.yaml.j2
-    local generate_config=utils/generate_config.py
-    if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${jinja2_template} ]; then
+    local pod_template=config/installers/daisy/pod_config.yaml.j2
+    local generate_config=config/utils/generate_config.py
+    if [[ $DEPLOY_SCENARIO =~ (dpdk) ]]; then
+        local network_template=config/installers/daisy/network-dpdk.yaml.j2
+    else
+        local network_template=config/installers/daisy/network.yaml.j2
+    fi
+    if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${pod_template} ] || [ ! -f ${network_template} ] ; then
+        echo "Template files donot exist in ${SECURELABDIR}."
         return
     fi
 
     local tmpfile=$(mktemp XXXXXXXX.yml)
-    python ${generate_config} -j ${jinja2_template} -y ${pdf_yaml} > ${tmpfile}
+    python ${generate_config} -j ${pod_template} -y ${pdf_yaml} > ${tmpfile}
     if [ $? -ne 0 ]; then
         echo "Cannot generate config from POD Descriptor File, use original deploy.yml !"
         return
@@ -207,6 +213,14 @@ function update_dha_by_pdf()
     fi
     cp ${tmpfile} ${DHA_CONF}
     echo "====== Update deploy.yml from POD Descriptor File ======"
+
+    python ${generate_config} -j ${network_template} -y ${pdf_yaml} > ${tmpfile}
+    if [ $? -ne 0 ]; then
+        echo "Cannot generate network configuration from PDF and IDF!"
+        return
+    fi
+    cp ${tmpfile} ${NETWORK_CONF}
+    echo "====== Update $(basename ${NETWORK_CONF}) from POD Descriptor File ======"
     rm -f $tmpfile
 }
 
-- 
cgit 1.2.3-korg