Fixed up some openstack compatibility issues

1. Use a separate network when testing instance properties (uses
attach_subnet on router, so needs a separate network)
2. Wait_till_ready() during image test

test/helpers/__init__.py

@@ -195,12 +195,14 @@ def delete_test_instance(instance):
 
 
 def cleanup_test_resources(instance=None, vm_firewall=None,
-                           key_pair=None):
+                           key_pair=None, network=None):
     """Clean up any combination of supplied resources."""
-    with cleanup_action(lambda: key_pair.delete() if key_pair else None):
-        with cleanup_action(lambda: vm_firewall.delete()
-                            if vm_firewall else None):
-            delete_test_instance(instance)
+    with cleanup_action(lambda: delete_test_network(network)
+                        if network else None):
+        with cleanup_action(lambda: key_pair.delete() if key_pair else None):
+            with cleanup_action(lambda: vm_firewall.delete()
+                                if vm_firewall else None):
+                delete_test_instance(instance)
 
 
 def get_uuid():

test/test_compute_service.py

@@ -300,12 +300,17 @@ class CloudComputeServiceTestCase(ProviderTestBase):
 
         # Declare these variables and late binding will allow
         # the cleanup method access to the most current values
+        net = None
         test_inst = None
         fw = None
         with helpers.cleanup_action(lambda: helpers.cleanup_test_resources(
-                test_inst, fw)):
-            subnet = helpers.get_or_create_default_subnet(self.provider)
-            net = subnet.network
+                test_inst, fw, network=net)):
+            net = self.provider.networking.networks.create(
+                label=label, cidr_block='10.0.0.0/16')
+            subnet = net.create_subnet(
+                label=label, cidr_block='10.0.1.0/24',
+                zone=helpers.get_provider_test_data(self.provider,
+                                                    'placement'))
             test_inst = helpers.get_test_instance(self.provider, label,
                                                   subnet=subnet)
             fw = self.provider.security.vm_firewalls.create(

test/test_image_service.py

@@ -51,11 +51,8 @@ class CloudImageServiceTestCase(ProviderTestBase):
                     helpers.get_provider_test_data(self.provider, 'vm_type'),
                     subnet=subnet,
                     zone=helpers.get_provider_test_data(
-                        self.provider, 'placement'),
-                    key_pair=None,
-                    vm_firewalls=None,
-                    launch_config=None,
-                    user_data=None)
+                        self.provider, 'placement'))
+                img_instance.wait_till_ready()
                 self.assertIsInstance(img_instance, Instance)
                 self.assertEqual(
                     img_instance.label, img_inst_label,