From ddd30aace0b76befa6e7938237f9451d1a6a8c7d Mon Sep 17 00:00:00 2001
From: Bryan Sullivan <bs3131@att.com>
Date: Tue, 9 Feb 2016 19:11:54 -0800
Subject: Update smoke tests after testing.

JIRA: COPPER-4

Change-Id: I5945d3b5f340e8122927d456fedbff6d4536affc
Signed-off-by: Bryan Sullivan <bs3131@att.com>
---
 tests/adhoc/dmz01.sh         |  6 ++++--
 tests/adhoc/smoke01-clean.sh |  6 +++++-
 tests/adhoc/smoke01.sh       | 10 +++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/adhoc/dmz01.sh b/tests/adhoc/dmz01.sh
index 8854ca2..7fc68e1 100644
--- a/tests/adhoc/dmz01.sh
+++ b/tests/adhoc/dmz01.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors
 #  
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,9 @@
 
 set -x #echo on
 
-source ~/admin-openrc.sh
+source ~/admin-openrc.sh <<EOF
+openstack
+EOF
 
 glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64-dmz --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare 
 
diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh
index cc8302d..8defb78 100644
--- a/tests/adhoc/smoke01-clean.sh
+++ b/tests/adhoc/smoke01-clean.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors
 #  
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,6 +26,10 @@
 
 set -x #echo on
 
+source ~/admin-openrc.sh <<EOF
+openstack
+EOF
+
 instance=$(nova list | awk "/ cirros1 / { print \$2 }")
 if [ "$instance" != "" ]; then nova delete $instance
 fi
diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh
index 911fabb..ec834f3 100644
--- a/tests/adhoc/smoke01.sh
+++ b/tests/adhoc/smoke01.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+# Copyright 2015-2016 Open Platform for NFV Project, Inc. and its contributors
 #  
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,11 +29,15 @@
 
 set -x #echo on
 
-source ~/admin-openrc.sh
+source ~/admin-openrc.sh <<EOF
+openstack
+EOF
 
 openstack service list
 
-glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64 --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare
+image=$(openstack image list | awk "/ cirros-0.3.3-x86_64 / { print \$2 }")
+if [ "$image" == "" ]; then glance --os-image-api-version 1 image-create --name cirros-0.3.3-x86_64 --disk-format qcow2 --location http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img --container-format bare
+fi
 
 neutron net-create public --router:external=true --provider:network_type=flat --provider:physical_network=physnet1
 
-- 
cgit 1.2.3-korg