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_2.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_2.py')
-rw-r--r-- | sdnvpn/test/functest/testcase_2.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index bc37c5c..928656e 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -200,16 +200,12 @@ def main(): neutron_client, bgpvpn1_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 - ) - - if not instances_up: - logger.error("One or more instances is down") - sys.exit(-1) + instances_up = test_utils.wait_for_instances_up(vm_2) + instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_1, vm_4) + + if (not instances_up or not instances_dhcp_up): + logger.error("One or more instances are down") + # TODO: Handle this appropriately logger.info("Waiting for the VMs to connect to each other using the" " updated network configuration") |