Update tests after further testing

JIRA: COPPER-4

smoke01 now includes floating IP test.

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

4 files changed, 85 insertions, 44 deletions

diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh
index 822392a..685ed86 100644
--- a/tests/adhoc/smoke01-clean.sh
+++ b/tests/adhoc/smoke01-clean.sh
@@ -24,52 +24,65 @@
 #   After test, cleanup with
 #   $ source ~/git/copper/tests/adhoc/smoke01-clean.sh
 
-set -x #echo on
+wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/setenv.sh -O ~/setenv.sh
+source ~/setenv.sh
 
-source /tmp/copper/admin-openrc.sh
+echo "Disassociate cirros1 floating IP address"
+nova floating-ip-disassociate cirros1 192.168.10.201
 
+echo "Delete cirros1 instance"
 instance=$(nova list | awk "/ cirros1 / { print \$2 }")
-if [ "$instance" != "" ]; then nova delete $instance
-fi
+if [ "$instance" != "" ]; then nova delete $instance; fi
 
+echo "Delete cirros2 instance"
 instance=$(nova list | awk "/ cirros2 / { print \$2 }")
-if  [ "$instance" != "" ]; then nova delete $instance
-fi
+if  [ "$instance" != "" ]; then nova delete $instance; fi
 
-router=$(neutron router-list | awk "/ test_router / { print \$2 }")
+echo "Delete 'ssh_ingress' security group"
+sg=$(neutron security-group-list | awk "/ ssh_ingress / { print \$2 }")
+neutron security-group-delete $sg
 
-test_internal_interface=$(neutron router-port-list $router | grep 10.0.0.1 | awk '{print $2}')
+echo "Get 'router' ID"
+router=$(neutron router-list | awk "/ public_router / { print \$2 }")
 
-if [ "$test_internal_interface" != "" ]; then neutron router-interface-delete $router port=$test_internal_interface
-fi
+echo "Get internal port ID with subnet 10.0.0.1 on 'public_router'"
+internal_interface=$(neutron router-port-list $router | grep 10.0.0.1 | awk '{print $2}')
 
-test_public_interface=$(neutron router-port-list $router | grep 191.168.10.2 | awk '{print $2}')
+echo "If found, delete the port with subnet 10.0.0.1 on 'public_router'"
+if [ "$internal_interface" != "" ]; then neutron router-interface-delete $router port=$internal_interface; fi
 
-if [ "$test_public_interface" != "" ]; then neutron router-interface-delete $router port=$test_public_interface
-fi
+echo "Get public port ID with fixed_ip 192.168.10.2 on 'public_router'"
+public_interface=$(neutron router-port-list $router | grep 192.168.10.2 | awk '{print $2}')
 
-neutron router-interface-delete $router $test_internal_interface
+echo "If found, delete the port with fixed_ip 192.168.10.2 on 'public_router'"
+if [ "$public_interface" != "" ]; then neutron router-interface-delete $router port=$public_interface; fi
 
-neutron router-gateway-clear test_router
+echo "Delete the router internal interface"
+neutron router-interface-delete $router $internal_interface
 
-neutron router-delete test_router
+echo "Clear the router gateway"
+neutron router-gateway-clear public_router
 
-port=$(neutron port-list | awk "/ 10.0.0.1 / { print \$2 }")
+echo "Delete the router"
+neutron router-delete public_router
 
-if [ "$port" != "" ]; then neutron port-delete $port
-fi
+echo "Delete neutron port with fixed_ip 10.0.0.1"
+port=$(neutron port-list | awk "/ 10.0.0.1 / { print \$2 }")
+if [ "$port" != "" ]; then neutron port-delete $port; fi
 
+echo "Delete neutron port with fixed_ip 10.0.0.2"
 port=$(neutron port-list | awk "/ 10.0.0.2 / { print \$2 }")
+if [ "$port" != "" ]; then neutron port-delete $port; fi
 
-if [ "$port" != "" ]; then neutron port-delete $port
-fi
-
-neutron subnet-delete test_internal
+echo "Delete internal subnet"
+neutron subnet-delete internal
 
-neutron net-delete test_internal
+echo "Delete internal network"
+neutron net-delete internal
 
-neutron subnet-delete test_public
+echo "Delete public subnet"
+neutron subnet-delete public
 
-neutron net-delete test_public
+echo "Delete public network"
+neutron net-delete public
 
-set +x #echo off
diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh
index f7f15bc..ba5e029 100644
--- a/tests/adhoc/smoke01.sh
+++ b/tests/adhoc/smoke01.sh
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 # What this is: A basic test to validate an OPNFV install. Creates an image,
 # test_public and private networks, a router, and launches two VMs connected to the 
 # private network and thru the router, to the internet.
@@ -27,34 +26,63 @@
 #   After test, cleanup with
 #   $ bash ~/git/copper/tests/adhoc/smoke01-clean.sh
 
-set -x #echo on
-
-source /tmp/copper/admin-openrc.sh
+wget https://git.opnfv.org/cgit/copper/plain/components/congress/install/bash/setenv.sh -O ~/setenv.sh
+source ~/setenv.sh
 
+echo "Create cirros-0.3.3-x86_64 image"
 image=$(openstack image list | awk "/ cirros-0.3.3-x86_64 / { print \$2 }")
 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 
+echo "Create external network"
+neutron net-create public --router:external
+
+echo "Create external subnet"
+neutron subnet-create public 192.168.10.0/24 --name public --enable_dhcp=False --allocation_pool start=192.168.10.6,end=192.168.10.49 --gateway 192.168.10.1
 
-neutron subnet-create --disable-dhcp test_public 192.168.10.0/24
+echo "Create floating IP for external subnet"
+neutron floatingip-create public
 
-neutron net-create test_internal
+echo "Create internal network"
+neutron net-create internal
 
-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
+echo "Create internal subnet"
+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 router-create test_router
+echo "Create router"
+neutron router-create public_router
 
-neutron router-gateway-set test_router test_public
+echo "Create router gateway"
+neutron router-gateway-set public_router public
 
-neutron router-interface-add test_router subnet=test_internal
+echo "Add router interface for internal network"
+neutron router-interface-add public_router subnet=internal
 # add a delay since the previous command takes the neutron-api offline for a while (?)
 sleep 30
 
-test_internal_NET=$(neutron net-list | awk "/ test_internal / { print \$2 }")
+echo "Create ssh_ingress security group"
+neutron security-group-create ssh_ingress
+
+echo "Add rule to ssh_ingress security group"
+neutron security-group-rule-create --direction ingress --protocol=TCP --port-range-min=22 --port-range-max=22 ssh_ingress
+
+echo "Wait up to a minute as 'neutron router-interface-add' blocks the neutron-api for some time..."
+# add a delay since the previous command takes the neutron-api offline for a while (?)
+COUNTER=1
+RESULT="Failed!"
+until [[ "$COUNTER" -gt 6  || "$RESULT" == "Success!" ]]; do
+  echo "Get the internal network ID: try" $COUNTER 
+  internal_NET=$(neutron net-list | awk "/ internal / { print \$2 }")
+  if [ "$internal_NET" != "" ]; then RESULT="Success!"; fi
+  let COUNTER+=1
+  sleep 10
+done
 
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET cirros1
+echo "Boot cirros1"
+nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$internal_NET --security-groups ssh_ingress cirros1
 
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET cirros2
+echo "Boot cirros1"
+nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$internal_NET cirros2
 
-set +x #echo off
+echo "Associate floating IP to cirros1"
+nova floating-ip-associate cirros1 192.168.10.6
diff --git a/tests/dmz.sh b/tests/dmz.sh
index fd5d5b2..ff5a5cd 100644
--- a/tests/dmz.sh
+++ b/tests/dmz.sh
@@ -63,7 +63,7 @@ if [ $(openstack congress policy show test | awk "/ id / { print \$4 }") ]; then
 openstack congress policy create test
 
 echo "Create dmz_server rule in policy 'test'"
-openstack congress policy rule create test "dmz_server(x) :- nova:servers(id=x,status='ACTIVE'), neutronv2:ports(id, device_id, status='ACTIVE'),  neutronv2:security_group_port_bindings(pid, sg), neutronv2:security_groups(sg,name='dmz')" --name dmz_server
+openstack congress policy rule create test "dmz_server(x) :- nova:servers(id=x,status='ACTIVE'), neutronv2:ports(id, device_id, status='ACTIVE'),  neutronv2:security_group_port_bindings(id, sg), neutronv2:security_groups(sg,name='dmz')" --name dmz_server
 
 echo "Create dmz_placement_error rule in policy 'test'"
 openstack congress policy rule create test "dmz_placement_error(id) :- nova:servers(id,name,hostId,status,tenant_id,user_id,image,flavor,az,hh), not glancev2:tags(image,'dmz'), dmz_server(id)" --name dmz_placement_error
diff --git a/tests/reserved_subnet.sh b/tests/reserved_subnet.sh
index 73123b5..f30c3c5 100644
--- a/tests/reserved_subnet.sh
+++ b/tests/reserved_subnet.sh
@@ -57,7 +57,7 @@ echo "Create Congress policy 'test'"
 if [[ $(openstack congress policy show test | awk "/ id / { print \$4 }") ]]; then unclean; fi
 openstack congress policy create test
 
-echo "Create smtp_ingress rule in policy 'test'"
+echo "Create reserved_subnet_error rule in policy 'test'"
 openstack congress policy rule create test "reserved_subnet_error(x) :- neutronv2:subnets(id=x, cidr='10.7.1.0/24')" --name rsv_subnet_adm
 openstack congress policy rule create test "reserved_subnet_error(x) :- neutronv2:subnets(id=x, cidr='10.7.12.0/24')" --name rsv_subnet_prv
 openstack congress policy rule create test "reserved_subnet_error(x) :- neutronv2:subnets(id=x, cidr='10.7.13.0/24')" --name rsv_subnet_stg