Merge "Fix instance boot when metadata exists"

[sdnvpn.git] / sdnvpn / test / functest / testcase_4.py

diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
index 5e6b2b8..cc429c3 100644 (file)
--- a/sdnvpn/test/functest/testcase_4.py
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -162,13 +162,12 @@ def main():
             neutron_client, bgpvpn_id, router_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)
+        instances_up = test_utils.wait_for_instances_up(vm_2, vm_3, vm_5)
+        instances_dhcp_up = test_utils.wait_for_instances_get_dhcp(vm_1, vm_4)
 
-        if not instances_up:
-            logger.error("One or more instances is down")
-            # TODO Handle appropriately
+        if (not instances_up or not instances_dhcp_up):
+            logger.error("One or more instances are down")
+            # TODO: Handle this appropriately
 
         results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200)
         results.get_ping_status(vm_1, vm_3, expected="PASS", timeout=30)