diff options
| author |   Tim Irnich <tim.irnich@ericsson.com> | 2017-11-09 08:05:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-09 08:05:15 +0000 |
| commit | 9830307e679b928aae43e2b458228d0549693309 (patch) | |
| tree | 5b4672ac16393ccb62c8a08e6073a80c5acf602b /sdnvpn/test/functest/testcase_1.py | |
| parent | b1d450d9de366c60a4c24923b70575c600f423b3 (diff) | |
| parent | a6e207c16430055eba8bcc8586b09a7081db3d04 (diff) | |
Merge "Fix instance boot when metadata exists"
Diffstat (limited to 'sdnvpn/test/functest/testcase_1.py')
| -rw-r--r-- | sdnvpn/test/functest/testcase_1.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index 1b51f00..89011cd 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -154,13 +154,12 @@ def main(): test_utils.create_network_association( neutron_client, bgpvpn_id, network_1_id) - # Wait for VMs to get ips. - instances_up = test_utils.wait_for_instances_up(vm_1, vm_2, - vm_3, vm_4, - vm_5) + # Wait for VMs to be ready. + instances_up = test_utils.wait_for_instances_up(vm_2, vm_3, vm_5) + instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_1, vm_4) - if not instances_up: - logger.error("One or more instances is down") + if (not instances_up or not instances_dhcp_up): + logger.error("One or more instances are down") # TODO: Handle this appropriately results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200) |