diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2016-12-07 05:41:52 -0800 |
|---|---|---|
| committer | Bryan Sullivan <bryan.sullivan@att.com> | 2016-12-07 05:43:11 -0800 |
| commit | 1eb8479dfb8ba6d3d908ed85131c67cc3b6d1058 (patch) | |
| tree | 50a4bc47b8b527019704381743b5df23088e40aa /tests | |
| parent | a6b4e3954814582d79ceae537030d32932e8e8e1 (diff) | |
Correct ref to congress server in juju command
JIRA: COPPER-2
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Small changes to smoke01 test
Change-Id: Ie1783671ba4b418c45cdbd4447538728ce9fff49
Signed-off-by: Bryan Sullivan <bryan.sullivan@att.com>
Diffstat (limited to 'tests')
| -rw-r--r--[-rwxr-xr-x] | tests/adhoc/smoke01-clean.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/adhoc/smoke01.sh | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | tests/run.sh | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/adhoc/smoke01-clean.sh b/tests/adhoc/smoke01-clean.sh index a846dbb..a846dbb 100755..100644 --- a/tests/adhoc/smoke01-clean.sh +++ b/tests/adhoc/smoke01-clean.sh diff --git a/tests/adhoc/smoke01.sh b/tests/adhoc/smoke01.sh index 81684e1..dd1dd56 100755..100644 --- a/tests/adhoc/smoke01.sh +++ b/tests/adhoc/smoke01.sh @@ -63,7 +63,7 @@ function get_external_net () { else echo "$0: External network not found" echo "$0: Create external network" - neutron net-create public --router:external + openstack network create --external public EXTERNAL_NETWORK_NAME="public" echo "$0: 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 @@ -145,7 +145,7 @@ echo "$0: Get cirros1 instance ID" test_cirros1_ID=$(openstack server list | awk "/ cirros1 / { print \$2 }") echo "$0: Wait for cirros1 to go ACTIVE" -COUNTER=5 +COUNTER=10 RESULT="Test Failed!" until [[ $COUNTER -eq 0 || $RESULT == "Test Success!" ]]; do status=$(openstack server show $test_cirros1_ID | awk "/ status / { print \$4 }") @@ -161,7 +161,7 @@ nova floating-ip-associate cirros1 $FLOATING_IP echo "$0: Boot cirros2" nova boot --flavor m1.tiny --image cirros-0.3.3-x86_64 --nic net-id=$internal_NET --security-groups smoke01 cirros2 -COUNTER=1 +COUNTER=10 RESULT="Failed!" until [[ "$COUNTER" -gt 6 || "$RESULT" == "Success!" ]]; do echo "$0: Verify internal network connectivity" diff --git a/tests/run.sh b/tests/run.sh index 333779e..333779e 100755..100644 --- a/tests/run.sh +++ b/tests/run.sh |