Correct misnamed attribute.

JIRA: COPPER-4

Change-Id: Id64c9a53c07f9b2c6894d4a91859c17821b35443
Signed-off-by: blsaws <bs3131@att.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/tests/adhoc/dmz01-clean.sh b/tests/adhoc/dmz01-clean.sh
index c218ef2..9a917c5 100644
--- a/tests/adhoc/dmz01-clean.sh
+++ b/tests/adhoc/dmz01-clean.sh
@@ -64,10 +64,10 @@ echo "If found, delete the port with subnet 10.0.0.1 on 'test_router'"
 if [ "$test_internal_interface" != "" ]; then neutron router-interface-delete $router port=$test_internal_interface
 fi
 
-echo "Get public port ID with subnet 192.168.10.2 on 'test_router'"
+echo "Get public port ID with fixed_ip 192.168.10.2 on 'test_router'"
 test_public_interface=$(neutron router-port-list $router | grep 192.168.10.2 | awk '{print $2}')
 
-echo "If found, delete the port with subnet 192.168.10.2 on 'test_router'"
+echo "If found, delete the port with fixed_ip 192.168.10.2 on 'test_router'"
 if [ "$test_public_interface" != "" ]; then neutron router-interface-delete $router port=$test_public_interface
 fi
 
@@ -80,12 +80,12 @@ neutron router-gateway-clear test_router
 echo "Delete the router"
 neutron router-delete test_router
 
-echo "Delete neutron port on subnet 10.0.0.1"
+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 on subnet 10.0.0.2"
+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
diff --git a/tests/adhoc/dmz01.sh b/tests/adhoc/dmz01.sh
index 11d657a..6ed290a 100644
--- a/tests/adhoc/dmz01.sh
+++ b/tests/adhoc/dmz01.sh
@@ -108,7 +108,7 @@ echo "Boot cirros1 with non-dmz image"
 nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$test_internal_NET --security-groups dmz cirros1
 
 echo "Boot cirros2 with non-dmz image"
-nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64-dmz --nic net-id=$test_internal_NET  --security-groups dmz cirros2\
+nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64-dmz --nic net-id=$test_internal_NET  --security-groups dmz cirros2
 
 echo "Wait 30 seconds for Congress polling to occur at least once"
 sleep 30
@@ -130,6 +130,7 @@ until [[ $COUNTER -eq 0  || $RESULT == "Test Success!" ]]; do
   if [ "$dmz_cirros1" == "$test_cirros1_ID" ] &&  [ "$dmz_cirros2" == "$test_cirros2_ID" ]; then RESULT="Test Success!"
   fi
   let COUNTER-=1
+  sleep 10
 done
 echo $RESULT