X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=sdnvpn%2Ftest%2Ffunctest%2Ftestcase_8.py;h=4d57bae6846c6d190c683384a4a34c92fa349567;hb=c2d2043fe34461b66011b974fc535f703e5fa2de;hp=fb547619350b975ecaca0261e8e0cba97ab1e7f5;hpb=b1d450d9de366c60a4c24923b70575c600f423b3;p=sdnvpn.git

diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py
index fb54761..4d57bae 100644
--- a/sdnvpn/test/functest/testcase_8.py
+++ b/sdnvpn/test/functest/testcase_8.py
@@ -21,8 +21,8 @@ Test whether router assoc can coexist with floating IP
 import logging
 import sys
 
-from functest.utils import openstack_utils as os_utils
 from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib import openstack_utils as os_utils
 from sdnvpn.lib import utils as test_utils
 from sdnvpn.lib.results import Results
 
@@ -131,9 +131,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")