Extra changes on Flavor Config

[snaps.git] / snaps / openstack / utils / tests / nova_utils_tests.py

diff --git a/snaps/openstack/utils/tests/nova_utils_tests.py b/snaps/openstack/utils/tests/nova_utils_tests.py
index f5df865..3e55558 100644 (file)
--- a/snaps/openstack/utils/tests/nova_utils_tests.py
+++ b/snaps/openstack/utils/tests/nova_utils_tests.py
@@ -269,7 +269,8 @@ class NovaUtilsInstanceTests(OSComponentTestCase):
             self.image_creator.create()
 
             network_settings = openstack_tests.get_priv_net_config(
-                guid + '-net', guid + '-subnet').network_settings
+                self.os_creds.project_name, guid + '-net',
+                guid + '-subnet').network_settings
             self.network_creator = OpenStackNetwork(
                 self.os_creds, network_settings)
             self.network_creator.create()
@@ -342,16 +343,18 @@ class NovaUtilsInstanceTests(OSComponentTestCase):
         # Wait until instance is ACTIVE
         iters = 0
         active = False
+        status = None
         while iters < 60:
-            if create_instance.STATUS_ACTIVE == nova_utils.get_server_status(
-                    self.nova, self.vm_inst):
+            status = nova_utils.get_server_status(self.nova, self.vm_inst)
+            if create_instance.STATUS_ACTIVE == status:
                 active = True
                 break
 
             time.sleep(3)
             iters += 1
 
-        self.assertTrue(active)
+        self.assertTrue(active, msg='VM {} status {} is not {}'.format(
+            self.vm_inst.name, status, create_instance.STATUS_ACTIVE))
         vm_inst = nova_utils.get_latest_server_object(
             self.nova, self.neutron, self.keystone, self.vm_inst,
             self.os_creds.project_name)
@@ -391,15 +394,17 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase):
             self.image_creator.create()
 
             network_settings = openstack_tests.get_priv_net_config(
-                guid + '-net', guid + '-subnet').network_settings
+                self.os_creds.project_name, guid + '-net',
+                guid + '-subnet').network_settings
             self.network_creator = OpenStackNetwork(
                 self.os_creds, network_settings)
             self.network_creator.create()
 
+            flavor_settings = openstack_tests.get_flavor_config(
+                name=guid + '-flavor', ram=256, disk=10, vcpus=1,
+                metadata=self.flavor_metadata)
             self.flavor_creator = OpenStackFlavor(
-                self.os_creds,
-                FlavorConfig(
-                    name=guid + '-flavor-name', ram=256, disk=10, vcpus=1))
+                self.os_creds, flavor_settings)
             self.flavor_creator.create()
 
             # Create Volume