Change test object names to avoid conflicts.

JIRA: COPPER-4

Change-Id: I206f4bdfc87729461cfd15d304e3214f9ff4cd13
Signed-off-by: blsaws <bryan.sullivan@att.com>

3 files changed, 23 insertions, 73 deletions

diff --git a/\ b/\
deleted file mode 100644
index 26f792e..0000000
--- a/\
+++ /dev/null
@@ -1,50 +0,0 @@
-Add 2nd param for user account.
-
-JIRA: COPPER-4
-
-Signed-off-by: blsaws <bs3131@att.com>
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-# On branch master
-# Your branch is ahead of 'origin/master' by 2 commits.
-#   (use "git push" to publish your local commits)
-#
-# Changes to be committed:
-#   (use "git reset HEAD <file>..." to unstage)
-#
-#	modified:   components/congress/test-webapp/setup/install_congress_testserver_1.sh
-#
-diff --git a/components/congress/test-webapp/setup/install_congress_testserver_1.sh b/components/congress/test-webapp/setup/install_congress_testserver_1.sh
-index 87fc8f9..9e9001e 100644
---- a/components/congress/test-webapp/setup/install_congress_testserver_1.sh
-+++ b/components/congress/test-webapp/setup/install_congress_testserver_1.sh
-@@ -22,8 +22,9 @@
- # - ~/env.sh created as part of Congress install (install_congress_3.sh)
- # How to use:
- #   Install OPNFV per https://wiki.opnfv.org/copper/academy/joid
--#   $ source install_congress_testserver_1.sh  <controller_hostname>
--# <controller_hostname> is the name of the controller node in MAAS.
-+#   $ source install_congress_testserver_1.sh  <controller_hostname> <user>
-+# <controller_hostname> is the name of the controller node in MAAS
-+# and <user> is the name of the account where you are installing this
- 
- # Following are notes on creating a container as test driver for Congress. 
- # This is based upon an Ubuntu host as installed by JOID.
-@@ -38,7 +39,7 @@ set -x
- sudo apt-get install -y lxc
- juju scp ubuntu@$1:/usr/share/lxc/templates/lxc-ubuntu ~/lxc-ubuntu
- sudo cp ~/lxc-ubuntu /usr/share/lxc/templates/lxc-ubuntu
--sudo lxc-create -n trusty-copper -t /usr/share/lxc/templates/lxc-ubuntu -l DEBUG -- -b opnfv ~/opnfv
-+sudo lxc-create -n trusty-copper -t /usr/share/lxc/templates/lxc-ubuntu -l DEBUG -- -b $2 ~/$2
- sudo lxc-start -n trusty-copper -d
- if (($? > 0)); then
-   echo Error starting trusty-copper lxc container
-@@ -67,6 +68,6 @@ export NOVA_HOST=$(juju status --format=short | awk "/nova-cloud-controller\/0/
- EOF
- 
- # Invoke install_congress_testserver_2.sh
--ssh -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no opnfv@$COPPER_HOST "source ~/git/copper/components/congress/test-webapp/setup/install_congress_testserver_2.sh; exit"
-+ssh -t -x -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no $2@$COPPER_HOST "source ~/git/copper/components/congress/test-webapp/setup/install_congress_testserver_2.sh; exit"
- 
- set +x
diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh
index 8defb78..9e1745c 100644
--- a/tests/adhoc/smoke01-clean.sh
+++ b/tests/adhoc/smoke01-clean.sh
@@ -38,23 +38,23 @@ instance=$(nova list | awk "/ cirros2 / { print \$2 }")
 if  [ "$instance" != "" ]; then nova delete $instance
 fi
 
-router=$(neutron router-list | awk "/ external / { print \$2 }")
+router=$(neutron router-list | awk "/ test_router / { print \$2 }")
 
-internal_interface=$(neutron router-port-list $router | grep 10.0.0.1 | awk '{print $2}')
+test_internal_interface=$(neutron router-port-list $router | grep 10.0.0.1 | awk '{print $2}')
 
-if [ "$internal_interface" != "" ]; then neutron router-interface-delete $router port=$internal_interface
+if [ "$test_internal_interface" != "" ]; then neutron router-interface-delete $router port=$test_internal_interface
 fi
 
-public_interface=$(neutron router-port-list $router | grep 191.168.10.2 | awk '{print $2}')
+test_public_interface=$(neutron router-port-list $router | grep 191.168.10.2 | awk '{print $2}')
 
-if [ "$public_interface" != "" ]; then neutron router-interface-delete $router port=$public_interface
+if [ "$test_public_interface" != "" ]; then neutron router-interface-delete $router port=$test_public_interface
 fi
 
-neutron router-interface-delete $router $internal_interface
+neutron router-interface-delete $router $test_internal_interface
 
-neutron router-gateway-clear external
+neutron router-gateway-clear test_router
 
-neutron router-delete external
+neutron router-delete test_router
 
 port=$(neutron port-list | awk "/ 10.0.0.1 / { print \$2 }")
 
@@ -66,12 +66,12 @@ port=$(neutron port-list | awk "/ 10.0.0.2 / { print \$2 }")
 if [ "$port" != "" ]; then neutron port-delete $port
 fi
 
-neutron subnet-delete internal
+neutron subnet-delete test_internal
 
-neutron net-delete internal
+neutron net-delete test_internal
 
-neutron subnet-delete public
+neutron subnet-delete test_public
 
-neutron net-delete public
+neutron net-delete test_public
 
 set +x #echo off
diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh
index 0391fc2..a79fc65 100644
--- a/tests/adhoc/smoke01.sh
+++ b/tests/adhoc/smoke01.sh
@@ -15,7 +15,7 @@
 #
 
 # What this is: A basic test to validate an OPNFV install. Creates an image,
-# public and private networks, a router, and launches two VMs connected to the 
+# test_public and private networks, a router, and launches two VMs connected to the 
 # private network and thru the router, to the internet.
 #
 # Status: this is a work in progress, under test. Automated ping test to the 
@@ -39,26 +39,26 @@ 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
+neutron net-create test_public --router:test_router=true --provider:network_type=flat --provider:physical_network=physnet1
 
-neutron subnet-create --disable-dhcp public 192.168.10.0/24
+neutron subnet-create --disable-dhcp test_public 192.168.10.0/24
 
-neutron net-create internal
+neutron net-create test_internal
 
-neutron subnet-create internal 10.0.0.0/24 --name internal --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8
+neutron subnet-create test_internal 10.0.0.0/24 --name test_internal --gateway 10.0.0.1 --enable-dhcp --allocation-pool start=10.0.0.2,end=10.0.0.254 --dns-nameserver 8.8.8.8
 
-neutron router-create external
+neutron router-create test_router
 
-neutron router-gateway-set external public
+neutron router-gateway-set test_router test_public
 
-neutron router-interface-add external subnet=internal
+neutron router-interface-add test_router subnet=test_internal
 # add a delay since the previous command takes the neutron-api offline for a while (?)
 sleep 30
 
-INTERNAL_NET=$(neutron net-list | awk "/ internal / { print \$2 }")
+test_internal_NET=$(neutron net-list | awk "/ test_internal / { print \$2 }")
 
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$INTERNAL_NET cirros1
+nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET cirros1
 
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$INTERNAL_NET cirros2
+nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET cirros2
 
 set +x #echo off