Refactoring of FlavorSettings to extend FlavorConfig

FlavorSettings and glance_utils have a runtime cyclical
dependency. This patch reduces this dependency and
deprecates the FlavorSettings class.

JIRA: SNAPS-216

Change-Id: Ie9532fcbe16377d4ab608bdacd1982c3c6628fe9
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py
index 4400001..bc9cb2c 100644
--- a/snaps/openstack/tests/create_stack_tests.py
+++ b/snaps/openstack/tests/create_stack_tests.py
@@ -18,9 +18,10 @@ import time
 import pkg_resources
 from heatclient.exc import HTTPBadRequest
 from snaps import file_utils
-from snaps.openstack.create_flavor import OpenStackFlavor, FlavorSettings
-from snaps.openstack.create_image import OpenStackImage
+from snaps.config.flavor import FlavorConfig
 from snaps.config.image import ImageConfig
+from snaps.openstack.create_flavor import OpenStackFlavor
+from snaps.openstack.create_image import OpenStackImage
 
 try:
     from urllib.request import URLError
@@ -149,8 +150,8 @@ class CreateStackSuccessTests(OSIntegrationTestCase):
         # Create Flavor
         self.flavor_creator = OpenStackFlavor(
             self.admin_os_creds,
-            FlavorSettings(name=self.guid + '-flavor-name', ram=256, disk=10,
-                           vcpus=1))
+            FlavorConfig(
+                name=self.guid + '-flavor-name', ram=256, disk=10, vcpus=1))
         self.flavor_creator.create()
 
         self.network_name = self.guid + '-net'
@@ -983,8 +984,9 @@ class CreateStackFailureTests(OSIntegrationTestCase):
         # Create Flavor
         self.flavor_creator = OpenStackFlavor(
             self.admin_os_creds,
-            FlavorSettings(name=self.guid + '-flavor-name', ram=256, disk=10,
-                           vcpus=1000000))
+            FlavorConfig(
+                name=self.guid + '-flavor-name', ram=256, disk=10,
+                vcpus=1000000))
         self.flavor_creator.create()
 
         self.network_name = self.guid + '-net'