10 files changed, 33 insertions, 102 deletions
diff --git a/test/ete/labs/gwu/onap-openrc b/test/ete/labs/gwu/onap-openrc
index 74042317b..1a452fa0a 100644
--- a/test/ete/labs/gwu/onap-openrc
+++ b/test/ete/labs/gwu/onap-openrc
@@ -1,4 +1,4 @@
-export OS_PROJECT_ID=fe370564c0614739a328e20d8ae76261
+export OS_PROJECT_ID=4c93f99551604bf7af25a8f80c7f34cb
 export OS_PROJECT_DOMAIN_NAME=Default
 export OS_USER_DOMAIN_NAME=Default
 export OS_PROJECT_NAME=onap
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index c42214937..97adca265 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -6,7 +6,7 @@ parameters:
   #                                            #
   ##############################################
 
-  public_net_id: 50e7638e-a9d2-4cd9-a242-2f289f8f6553
+  public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
 
   public_net_name: provider
 
diff --git a/test/ete/labs/huawei/onap-ci-amsterdam-heat-openrc b/test/ete/labs/huawei/onap-beijing-oom-openrc
index 5acb86759..cc6df8b91 100644
--- a/test/ete/labs/huawei/onap-ci-amsterdam-heat-openrc
+++ b/test/ete/labs/huawei/onap-beijing-oom-openrc
@@ -1,7 +1,7 @@
 export OS_PROJECT_DOMAIN_NAME=Default
 export OS_USER_DOMAIN_NAME=Default
 export OS_PROJECT_ID=3d228d2fcbb7447bbba3cde703431bc1
-export OS_PROJECT_NAME=onap-ci-amsterdam-heat
+export OS_PROJECT_NAME=onap-beijing-oom
 export OS_USERNAME=demo
 export OS_PASSWORD=demo
 export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3
diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc b/test/ete/labs/windriver/Integration-Jenkins-openrc
new file mode 100644
index 000000000..aa9aaabfc
--- /dev/null
+++ b/test/ete/labs/windriver/Integration-Jenkins-openrc
@@ -0,0 +1,10 @@
+export OS_PROJECT_ID=09d8566ea45e43aa974cf447ed591d77
+
+export OS_PROJECT_NAME=Integration-Jenkins
+export OS_USER_DOMAIN_NAME=Default
+export OS_USERNAME=demo
+export OS_PASSWORD=onapdemo
+export OS_AUTH_URL=http://10.12.25.2:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_REGION_NAME=RegionOne
+export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
deleted file mode 100644
index ca2e2c2cf..000000000
--- a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-# To use an OpenStack cloud you need to authenticate against the Identity
-# service named keystone, which returns a **Token** and **Service Catalog**.
-# The catalog contains the endpoints for all services the user/tenant has
-# access to - such as Compute, Image Service, Identity, Object Storage, Block
-# Storage, and Networking (code-named nova, glance, keystone, swift,
-# cinder, and neutron).
-#
-# *NOTE*: Using the 3 *Identity API* does not necessarily mean any other
-# OpenStack API is version 3. For example, your cloud provider may implement
-# Image API v1.1, Block Storage API v2, and Compute API v2.0. OS_AUTH_URL is
-# only for the Identity API served through keystone.
-export OS_AUTH_URL=http://10.12.25.2:5000/v3
-
-# With the addition of Keystone we have standardized on the term **project**
-# as the entity that owns the resources.
-export OS_PROJECT_ID="09d8566ea45e43aa974cf447ed591d77"
-export OS_PROJECT_NAME="Integration-Jenkins"
-export OS_USER_DOMAIN_NAME="Default"
-if [ -z "$OS_USER_DOMAIN_NAME" ]; then unset OS_USER_DOMAIN_NAME; fi
-
-# unset v2.0 items in case set
-unset OS_TENANT_ID
-unset OS_TENANT_NAME
-
-# In addition to the owning entity (tenant), OpenStack stores the entity
-# performing the action as the **user**.
-if [ -z ${OS_USERNAME_INPUT+x} ]; then
-    read -sp "Please enter your OpenStack Username for project $OS_PROJECT_NAME: " OS_USERNAME_INPUT
-fi
-export OS_USERNAME=$OS_USERNAME_INPUT
-
-# With Keystone you pass the keystone password.
-if [ -z ${OS_PASSWORD_INPUT+x} ]; then
-    read -sp "Please enter your OpenStack Password for project $OS_PROJECT_NAME as user $OS_USERNAME: " OS_PASSWORD_INPUT
-fi
-export OS_PASSWORD=$OS_PASSWORD_INPUT
-
-# If your configuration has multiple regions, we set that information here.
-# OS_REGION_NAME is optional and only valid in certain environments.
-export OS_REGION_NAME="RegionOne"
-# Don't leave a blank variable, unset it if it was empty
-if [ -z "$OS_REGION_NAME" ]; then unset OS_REGION_NAME; fi
-
-export OS_INTERFACE=public
-export OS_IDENTITY_API_VERSION=3
diff --git a/test/ete/labs/windriver/Integration-SB-04-openrc.sh b/test/ete/labs/windriver/Integration-SB-04-openrc.sh
deleted file mode 100644
index e7cee93b9..000000000
--- a/test/ete/labs/windriver/Integration-SB-04-openrc.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-# To use an OpenStack cloud you need to authenticate against the Identity
-# service named keystone, which returns a **Token** and **Service Catalog**.
-# The catalog contains the endpoints for all services the user/tenant has
-# access to - such as Compute, Image Service, Identity, Object Storage, Block
-# Storage, and Networking (code-named nova, glance, keystone, swift,
-# cinder, and neutron).
-#
-# *NOTE*: Using the 3 *Identity API* does not necessarily mean any other
-# OpenStack API is version 3. For example, your cloud provider may implement
-# Image API v1.1, Block Storage API v2, and Compute API v2.0. OS_AUTH_URL is
-# only for the Identity API served through keystone.
-export OS_AUTH_URL=http://10.12.25.2:5000/v3
-
-# With the addition of Keystone we have standardized on the term **project**
-# as the entity that owns the resources.
-export OS_PROJECT_ID="d570c718cbc545029f40e50b75eb13df"
-export OS_PROJECT_NAME="Integration-SB-04"
-export OS_USER_DOMAIN_NAME="Default"
-if [ -z "$OS_USER_DOMAIN_NAME" ]; then unset OS_USER_DOMAIN_NAME; fi
-
-# unset v2.0 items in case set
-unset OS_TENANT_ID
-unset OS_TENANT_NAME
-
-# In addition to the owning entity (tenant), OpenStack stores the entity
-# performing the action as the **user**.
-# In addition to the owning entity (tenant), OpenStack stores the entity
-# performing the action as the **user**.
-if [ -z ${OS_USERNAME_INPUT+x} ]; then
-    read -sp "Please enter your OpenStack Username for project $OS_PROJECT_NAME: " OS_USERNAME_INPUT
-fi
-export OS_USERNAME=$OS_USERNAME_INPUT
-
-# With Keystone you pass the keystone password.
-if [ -z ${OS_PASSWORD_INPUT+x} ]; then
-    read -sp "Please enter your OpenStack Password for project $OS_PROJECT_NAME as user $OS_USERNAME: " OS_PASSWORD_INPUT
-fi
-export OS_PASSWORD=$OS_PASSWORD_INPUT
-
-# If your configuration has multiple regions, we set that information here.
-# OS_REGION_NAME is optional and only valid in certain environments.
-export OS_REGION_NAME="RegionOne"
-# Don't leave a blank variable, unset it if it was empty
-if [ -z "$OS_REGION_NAME" ]; then unset OS_REGION_NAME; fi
-
-export OS_INTERFACE=public
-export OS_IDENTITY_API_VERSION=3
diff --git a/test/ete/labs/windriver/Integration-Stable-openrc b/test/ete/labs/windriver/Integration-Stable-openrc
new file mode 100644
index 000000000..0f0c6928e
--- /dev/null
+++ b/test/ete/labs/windriver/Integration-Stable-openrc
@@ -0,0 +1,10 @@
+export OS_PROJECT_ID=3583253e932845a09cd4c8ca2f31d095
+
+export OS_USER_DOMAIN_NAME=Default
+export OS_PROJECT_NAME=Integration-Stable
+export OS_USERNAME=demo
+export OS_PASSWORD=onapdemo
+export OS_AUTH_URL=http://10.12.25.2:5000/v3
+export OS_IDENTITY_API_VERSION=3
+export OS_REGION_NAME=RegionOne
+export OS_INTERFACE=public
diff --git a/test/ete/scripts/install_openstack_cli.sh b/test/ete/scripts/install_openstack_cli.sh
index c7af2d5f7..8f1529606 100755
--- a/test/ete/scripts/install_openstack_cli.sh
+++ b/test/ete/scripts/install_openstack_cli.sh
@@ -26,7 +26,7 @@ else
     source ${ONAP_VENV}/bin/activate
     
     pip install --upgrade pip
-    pip install --upgrade python-openstackclient python-heatclient python-designateclient
+    pip install openstacksdk==0.9.19 python-openstackclient python-heatclient python-designateclient
     
     echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties
 fi
diff --git a/test/ete/scripts/run-healthcheck.sh b/test/ete/scripts/run-healthcheck.sh
index 2f0f014d3..c86fd453a 100755
--- a/test/ete/scripts/run-healthcheck.sh
+++ b/test/ete/scripts/run-healthcheck.sh
@@ -20,7 +20,9 @@ fi
 ssh-keygen -R ${ROBOT_IP}
 
 ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "OS_PROJECT_ID=$OS_PROJECT_ID OS_USERNAME=$OS_USERNAME OS_PASSWORD=$OS_PASSWORD bash -s" < ./remote/run-robot.sh
+RESULT=$?
 
 LOG_DIR=$(ssh -o StrictHostKeychecking=no -i ${SSH_KEY} root@${ROBOT_IP} "ls -1t /opt/eteshare/logs | head -1")
 echo "Browse Robot results at http://${ROBOT_IP}:88/logs/${LOG_DIR}/"
 rsync -e "ssh -i ${SSH_KEY}" -avPz root@${ROBOT_IP}:/opt/eteshare/logs/${LOG_DIR}/ $WORKSPACE/archives/
+exit $RESULT
diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh
index eecef876b..60bfa638f 100755
--- a/test/ete/scripts/teardown-onap.sh
+++ b/test/ete/scripts/teardown-onap.sh
@@ -6,10 +6,16 @@ fi
 
 source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
 
-# delete all Designate DNS records; do this first since we rely on multi-vim for this
+# delete all Proxy Designate DNS records; do this first since we rely on multi-vim for this
 $WORKSPACE/test/ete/scripts/dns-zones/delete-dns-zones.sh $OS_PROJECT_NAME
 sleep 1
 
+# delete all Desigate DNS zones
+ZONES=$(openstack zone list -c "id" -f value)
+for ZONE in ${ZONES}; do
+    openstack zone delete $ZONE
+done
+
 # delete all instances
 openstack server delete $(openstack server list -c ID -f value)
 sleep 1
@@ -42,7 +48,6 @@ sleep 1
 STACKS=$(openstack stack list -c "Stack Name" -f value)
 
 if [ ! -z "${STACKS}" ]; then
-    echo "Deleting Stacks ${STACKS}"
     openstack stack delete -y $STACKS
     for STACK in ${STACKS}; do
         until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do