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_10.py | |
parent | b1d450d9de366c60a4c24923b70575c600f423b3 (diff) | |
parent | a6e207c16430055eba8bcc8586b09a7081db3d04 (diff) |
Merge "Fix instance boot when metadata exists"
Diffstat (limited to 'sdnvpn/test/functest/testcase_10.py')
-rw-r--r-- | sdnvpn/test/functest/testcase_10.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py index 6344a17..02956c4 100644 --- a/sdnvpn/test/functest/testcase_10.py +++ b/sdnvpn/test/functest/testcase_10.py @@ -142,11 +142,11 @@ def main(): instance_ids.extend([vm_1.id, vm_3.id]) # Wait for VMs to get ips. - instances_up = test_utils.wait_for_instances_up(vm_1, vm_2, - vm_3) + instances_up = test_utils.wait_for_instances_up(vm_2) + instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_1, vm_3) - 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 # Create monitor threads to monitor traffic between vm_1, vm_2 and vm_3 m = Manager() @@ -208,9 +208,10 @@ def main(): compute_node=av_zone_1, userdata=u4) instance_ids.append(vm_4.id) + # Wait for VMs to get ips. - instances_up = test_utils.wait_for_instances_up(vm_4) - if not instances_up: + instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_4) + if not instances_dhcp_up: logger.error("Instance vm_4 failed to start.") # TODO: Handle this appropriately # Create and start a new monitor thread for vm_4 |