Merge "Fix instance boot when metadata exists"

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

diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index 65a77b6..0e3a8f5 100644 (file)
--- 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")
@@ -163,7 +167,8 @@ def main():
         logger.error("exception occurred while executing testcase_7: %s", e)
         raise
     finally:
-        test_utils.cleanup_nova(nova_client, instance_ids, image_ids)
+        test_utils.cleanup_nova(nova_client, instance_ids)
+        test_utils.cleanup_glance(glance_client, image_ids)
         test_utils.cleanup_neutron(neutron_client, floatingip_ids,
                                    bgpvpn_ids, interfaces, subnet_ids,
                                    router_ids, network_ids)