From 838c34d02bcc34576dc660058a2beb08add8f334 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 23 Oct 2017 14:22:40 -0700
Subject: Refactor deployment scripts

Change-Id: Ib82ddeb13902afdc50de61e1042cf8b810581509
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 test/ete/scripts/deploy-onap.sh           | 42 +--------------------------
 test/ete/scripts/get-floating-ip.sh       |  0
 test/ete/scripts/install_openstack_cli.sh | 47 +++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 41 deletions(-)
 mode change 100644 => 100755 test/ete/scripts/get-floating-ip.sh
 create mode 100755 test/ete/scripts/install_openstack_cli.sh

diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 2106175a9..02943935d 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -1,50 +1,10 @@
 #!/bin/bash
 
-if [ -z "$OS_AUTH_URL" ] || [ -z "$OS_USERNAME" ]
-then
-    echo "ERROR: OpenStack environment variables not set.  Please source your OpenStack RC script first."
-    exit 1
-fi
-
-
 if [ -z "$WORKSPACE" ]; then
     export WORKSPACE=`git rev-parse --show-toplevel`
 fi
 
-
-
-# Assume that if ROBOT_VENV is set, we don't need to reinstall robot
-if [ -f ${WORKSPACE}/env.properties ]; then
-    source ${WORKSPACE}/env.properties
-fi
-
-if [ ! -z "$ONAP_VENV" ] && [ -f "$ONAP_VENV/bin/activate" ]; then
-    source ${ONAP_VENV}/bin/activate
-else
-    ONAP_VENV=$(mktemp -d --suffix=_onap_venv)
-    virtualenv ${ONAP_VENV}
-    source ${ONAP_VENV}/bin/activate
-    
-    pip install --upgrade pip
-    pip install --upgrade python-openstackclient python-heatclient
-    
-    echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties
-fi
-echo "ONAP_VENV=${ONAP_VENV}"
-
-if [ -z "$ONAP_WORKDIR" ]; then
-    ONAP_WORKDIR=$(mktemp -d --suffix=_onap_workdir)
-    echo "ONAP_WORKDIR=${ONAP_WORKDIR}" >> $WORKSPACE/env.properties
-fi
-echo "ONAP_WORKDIR=${ONAP_WORKDIR}"
-if [ ! -d ${ONAP_WORKDIR}/demo ]; then
-    git clone http://gerrit.onap.org/r/demo ${ONAP_WORKDIR}/demo
-else
-    pushd ${ONAP_WORKDIR}/demo
-    git pull
-    popd
-fi
-
+source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
 
 # Delete all existing stacks
 STACKS=$(openstack stack list -c "Stack Name" -f value)
diff --git a/test/ete/scripts/get-floating-ip.sh b/test/ete/scripts/get-floating-ip.sh
old mode 100644
new mode 100755
diff --git a/test/ete/scripts/install_openstack_cli.sh b/test/ete/scripts/install_openstack_cli.sh
new file mode 100755
index 000000000..ec5ad1f76
--- /dev/null
+++ b/test/ete/scripts/install_openstack_cli.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+if [ -z "$OS_AUTH_URL" ] || [ -z "$OS_USERNAME" ]
+then
+    echo "ERROR: OpenStack environment variables not set.  Please source your OpenStack RC script first."
+    exit 1
+fi
+
+
+if [ -z "$WORKSPACE" ]; then
+    export WORKSPACE=`git rev-parse --show-toplevel`
+fi
+
+
+
+# Assume that if ROBOT_VENV is set, we don't need to reinstall robot
+if [ -f ${WORKSPACE}/env.properties ]; then
+    source ${WORKSPACE}/env.properties
+fi
+
+if [ ! -z "$ONAP_VENV" ] && [ -f "$ONAP_VENV/bin/activate" ]; then
+    source ${ONAP_VENV}/bin/activate
+else
+    ONAP_VENV=$(mktemp -d --suffix=_onap_venv)
+    virtualenv ${ONAP_VENV}
+    source ${ONAP_VENV}/bin/activate
+    
+    pip install --upgrade pip
+    pip install --upgrade python-openstackclient python-heatclient
+    
+    echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties
+fi
+echo "ONAP_VENV=${ONAP_VENV}"
+
+if [ -z "$ONAP_WORKDIR" ]; then
+    ONAP_WORKDIR=$(mktemp -d --suffix=_onap_workdir)
+    echo "ONAP_WORKDIR=${ONAP_WORKDIR}" >> $WORKSPACE/env.properties
+fi
+echo "ONAP_WORKDIR=${ONAP_WORKDIR}"
+if [ ! -d ${ONAP_WORKDIR}/demo ]; then
+    git clone http://gerrit.onap.org/r/demo ${ONAP_WORKDIR}/demo
+else
+    pushd ${ONAP_WORKDIR}/demo
+    git pull
+    popd
+fi
+
-- 
cgit 1.2.3-korg