diff options
| author |   tomsou <soth@intracom-telecom.com> | 2017-10-24 17:37:37 +0300 |
|---|---|---|
| committer | tomsou <soth@intracom-telecom.com> | 2017-11-06 13:10:38 +0200 |
| commit | a6e207c16430055eba8bcc8586b09a7081db3d04 (patch) | |
| tree | a9d7c527e7292d714f5bca534d6d203ba4ad461e /sdnvpn/test/functest/testcase_10.py | |
| parent | 4245d81de9226f64321dcd828e2a91ac912cf7d7 (diff) | |
Fix instance boot when metadata exists
The way that a instance is considered as UP is pretty
strict and returns ERROR in case of instances with userdata
This patch differentiates the instances that are supposed to
boot till login prompt and those with userdata parameter
JIRA: SDNVPN-177
Change-Id: Ic4755366df006669475c90cc0693ac802256f379
Signed-off-by: tomsou <soth@intracom-telecom.com>
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 557b658..5a88603 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 |