From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 3 Apr 2018 14:52:28 +0000 (-0700)
Subject: Add missing heat template env values
X-Git-Tag: sniroemulator-1.0.0~183^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F40715%2F4;p=integration.git

Add missing heat template env values

Change-Id: I1ed5fc8f8a3c98d399aa9558cb552a2a86bb8a27
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---

diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index 52ecae9d8..b0be26bfe 100644
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -89,6 +89,10 @@ parameters:
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
   openo_ip_addr: 10.0.14.1
+  music_ip_addr: 10.0.15.1
+  oof_ip_addr: 10.0.16.1
+  aaf_ip_addr: 10.0.13.1
+  nbi_ip_addr: 10.0.17.1
 
   ###########################
   #                         #
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 27cd0ef62..626281758 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -89,6 +89,10 @@ parameters:
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
   openo_ip_addr: 10.0.14.1
+  music_ip_addr: 10.0.15.1
+  oof_ip_addr: 10.0.16.1
+  aaf_ip_addr: 10.0.13.1
+  nbi_ip_addr: 10.0.17.1
 
   ###########################
   #                         #
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 68ca34830..689482c2e 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -39,13 +39,13 @@ popd
 sed "1,/${SENTINEL}/d" ${ENV_SRC} >> ${ENV_FILE}
 cat ${ENV_FILE}
 
-sdiff -w 180 ${ENV_SRC} ${ENV_FILE}
+diff ${ENV_SRC} ${ENV_FILE}
 
 # generate final heat template
 # add apt proxy to heat template if applicable
 if [ -x $LAB_DIR/apt-proxy.sh ]; then
     $LAB_DIR/apt-proxy.sh ${YAML_FILE}
-    sdiff -w 180 ${YAML_SRC} ${YAML_FILE}
+    diff ${YAML_SRC} ${YAML_FILE}
 fi
 
 
@@ -60,7 +60,9 @@ $WORKSPACE/test/ete/scripts/teardown-onap.sh
 # create new stack
 STACK="ete-$(uuidgen | cut -c-8)"
 echo "New Stack Name: ${STACK}"
-openstack stack create -t ${YAML_FILE} -e ${ENV_FILE} $STACK
+if ! openstack stack create -t ${YAML_FILE} -e ${ENV_FILE} $STACK; then
+    exit 1
+fi
 
 while [ "CREATE_IN_PROGRESS" == "$(openstack stack show -c stack_status -f value $STACK)" ]; do
     sleep 20