Tweaks to workaround issue with Tacker exceptions (not yet complete)

JIRA: MODELS-23

Change-Id: Ibda1d346d85c153bd5ebe36eafa52045b29e7038
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>

2 files changed, 43 insertions, 9 deletions

diff --git a/tests/utils/tacker-setup.sh b/tests/utils/tacker-setup.sh
index a523a8a..ee49590 100644
--- a/tests/utils/tacker-setup.sh
+++ b/tests/utils/tacker-setup.sh
@@ -138,6 +138,18 @@ EOF
   fi
 }
 
+function setup_client () {
+  echo "$0: Clone $1"
+  cd /tmp/tacker
+  git clone git://git.openstack.org/openstack/$1
+  cd $1
+  git checkout stable/mitaka
+
+  echo "$0: Setup $1"
+  pip install -r requirements.txt
+  python setup.py install
+}
+
 function setup () {
   echo "$0: Installing Tacker"
   # STEP 2: Install Tacker in the container
@@ -170,8 +182,25 @@ function setup () {
   echo "$0: Upgrage pip again - needs to be the latest version due to errors found in earlier testing"
   pip install --upgrade pip
 
-  echo "$0: install python-openstackclient python-glanceclient"
-  pip install --upgrade python-openstackclient python-glanceclient python-neutronclient keystonemiddleware
+  echo "$0: Clone Tacker"
+  cd /tmp/tacker
+  if [[ -d /tmp/tacker/tacker ]]; then rm -rf /tmp/tacker/tacker; fi
+  git clone git://git.openstack.org/openstack/tacker
+  cd tacker
+  git checkout stable/mitaka
+
+  echo "$0: Setup Tacker"
+  pip install -r requirements.txt
+  pip install tosca-parser
+
+  echo "$0: install stable/mitaka versions of openstack clients"
+  # Install specific versions as master diverged from mitaka
+  setup_client python-openstackclient 
+#  setup_client python-heatclient
+#  setup_client python-glanceclient
+  setup_client python-neutronclient
+  setup_client keystonemiddleware # required for keystonemiddleware.auth_token
+#  setup_client keystoneauth # Added to correct exception "EndpointNotFound: Endpoint for unknown service" in tacker/vm/plugin.py:_create_device
 
   echo "$0: Setup admin-openrc.sh"
   source /tmp/tacker/admin-openrc.sh
@@ -194,15 +223,17 @@ function setup () {
       --adminurl "http://$ip:9890/" \
       --internalurl "http://$ip:9890/" $sid
 
-  echo "$0: Clone Tacker"
-  if [[ -d /tmp/tacker/tacker ]]; then rm -rf /tmp/tacker/tacker; fi
-  git clone git://git.openstack.org/openstack/tacker
-  cd tacker
-  git checkout stable/mitaka
+#  echo "$0: Clone Tacker"
+#  cd /tmp/tacker
+#  if [[ -d /tmp/tacker/tacker ]]; then rm -rf /tmp/tacker/tacker; fi
+#  git clone git://git.openstack.org/openstack/tacker
+#  cd tacker
+#  git checkout stable/mitaka
 
   echo "$0: Setup Tacker"
-  pip install -r requirements.txt
-  pip install tosca-parser
+#  pip install -r requirements.txt
+#  pip install tosca-parser
+  cd /tmp/tacker/tacker
   python setup.py install
   mkdir /var/log/tacker
 
diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh
index 39a6c58..a7ce7ed 100644
--- a/tests/vHello_Tacker.sh
+++ b/tests/vHello_Tacker.sh
@@ -135,6 +135,9 @@ setup () {
   cp blueprints/tosca-vnfd-hello-world-tacker/vHello.pem /tmp/tacker
   chmod 600 /tmp/tacker/vHello.pem
 
+  echo "$0: setup OpenStack CLI environment"
+  source /tmp/tacker/admin-openrc.sh
+
   echo "$0: Setup image_id"
   image_id=$(openstack image list | awk "/ models-xenial-server / { print \$2 }")
   if [[ -z "$image_id" ]]; then glance --os-image-api-version 1 image-create --name models-xenial-server --disk-format qcow2 --file /tmp/xenial-server-cloudimg-amd64-disk1.img --container-format bare; fi