From db5e7aa499e6e6a353c57a2d7e5c044152f3328b Mon Sep 17 00:00:00 2001 From: blsaws Date: Sun, 22 May 2016 19:57:10 -0700 Subject: Align tests across ubuntu and centos JIRA: COPPER-4 Change-Id: Ieea3aaae89a99c558ad5c6ba7be0d0c64a4e1752 Signed-off-by: blsaws --- tests/adhoc/smoke01-clean.sh | 2 +- tests/adhoc/smoke01.sh | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/adhoc') diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh index 9c0138d..822392a 100644 --- a/tests/adhoc/smoke01-clean.sh +++ b/tests/adhoc/smoke01-clean.sh @@ -26,7 +26,7 @@ set -x #echo on -source /opt/copper/admin-openrc.sh +source /tmp/copper/admin-openrc.sh instance=$(nova list | awk "/ cirros1 / { print \$2 }") if [ "$instance" != "" ]; then nova delete $instance diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh index 22e2089..f7f15bc 100644 --- a/tests/adhoc/smoke01.sh +++ b/tests/adhoc/smoke01.sh @@ -23,21 +23,19 @@ # # How to use: # Install Congress test server per https://wiki.opnfv.org/copper/academy -# $ source ~/git/copper/tests/adhoc/smoke01.sh +# $ bash ~/git/copper/tests/adhoc/smoke01.sh # After test, cleanup with -# $ source ~/git/copper/tests/adhoc/smoke01-clean.sh +# $ bash ~/git/copper/tests/adhoc/smoke01-clean.sh set -x #echo on -source /opt/copper/admin-openrc.sh - -openstack service list +source /tmp/copper/admin-openrc.sh 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 +if [ -z $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 test_public --router:external=true --provider:network_type=flat --provider:physical_network=physnet1 +neutron net-create test_public --router:external=true neutron subnet-create --disable-dhcp test_public 192.168.10.0/24 -- cgit 1.2.3-korg