summaryrefslogtreecommitdiffstats
path: root/sdnvpn/test/functest/testcase_7.py
diff options
context:
space:
mode:
authorTim Irnich <tim.irnich@ericsson.com>2017-11-09 08:05:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-09 08:05:15 +0000
commit9830307e679b928aae43e2b458228d0549693309 (patch)
tree5b4672ac16393ccb62c8a08e6073a80c5acf602b /sdnvpn/test/functest/testcase_7.py
parentb1d450d9de366c60a4c24923b70575c600f423b3 (diff)
parenta6e207c16430055eba8bcc8586b09a7081db3d04 (diff)
Merge "Fix instance boot when metadata exists"
Diffstat (limited to 'sdnvpn/test/functest/testcase_7.py')
-rw-r--r--sdnvpn/test/functest/testcase_7.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index 2d9e713..0e3a8f5 100644
--- a/sdnvpn/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -132,9 +132,13 @@ def main():
test_utils.wait_for_bgp_net_assoc(
neutron_client, bgpvpn_id, network_2_id)
- instances_up = test_utils.wait_for_instances_up(vm_1, vm_2)
- if not instances_up:
- logger.error("One or more instances is down")
+ # Wait for VMs to get ips.
+ instances_up = test_utils.wait_for_instances_up(vm_2)
+ instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_1)
+
+ 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")