diff options
author | spisarski <s.pisarski@cablelabs.com> | 2017-11-17 14:54:46 -0700 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-20 10:36:28 -0700 |
commit | 1d7f4a18cf4a070570beccbb46303f5822840c41 (patch) | |
tree | a17c6b16bfc508a34b3c5a6e5bca2843efdb4ac2 /snaps/openstack/utils | |
parent | 3c387ae1c18c4a80a752c3e5a2409f4a602b9e20 (diff) |
Refactoring of VolumeSettings to extend VolumeConfig
VolumeSettings and cinder_utils have a runtime cyclical
dependency. This patch reduces this dependency and
deprecates the VolumeSettings class.
JIRA: SNAPS-227
Change-Id: I3f93702ff836af365c811d44bfd0e59b76c3f1f5
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils')
-rw-r--r-- | snaps/openstack/utils/settings_utils.py | 10 | ||||
-rw-r--r-- | snaps/openstack/utils/tests/cinder_utils_tests.py | 7 | ||||
-rw-r--r-- | snaps/openstack/utils/tests/nova_utils_tests.py | 5 | ||||
-rw-r--r-- | snaps/openstack/utils/tests/settings_utils_tests.py | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/snaps/openstack/utils/settings_utils.py b/snaps/openstack/utils/settings_utils.py index c4714cc..80dfc84 100644 --- a/snaps/openstack/utils/settings_utils.py +++ b/snaps/openstack/utils/settings_utils.py @@ -15,18 +15,18 @@ import uuid from snaps import file_utils -from snaps.config.volume_type import ( - ControlLocation, VolumeTypeEncryptionConfig, VolumeTypeConfig) from snaps.config.flavor import FlavorConfig from snaps.config.keypair import KeypairConfig from snaps.config.router import RouterConfig +from snaps.config.volume import VolumeConfig +from snaps.config.volume_type import ( + ControlLocation, VolumeTypeEncryptionConfig, VolumeTypeConfig) from snaps.openstack.create_instance import ( VmInstanceSettings, FloatingIpSettings) from snaps.openstack.create_network import ( PortSettings, SubnetSettings, NetworkSettings) from snaps.openstack.create_security_group import ( SecurityGroupSettings, SecurityGroupRuleSettings) -from snaps.openstack.create_volume import VolumeSettings from snaps.openstack.utils import ( neutron_utils, nova_utils, heat_utils, glance_utils) @@ -148,13 +148,13 @@ def create_router_settings(neutron, router): port_settings=filtered_settings) -def create_volume_settings(volume): +def create_volume_config(volume): """ Returns a VolumeSettings object :param volume: a SNAPS-OO Volume object """ - return VolumeSettings( + return VolumeConfig( name=volume.name, description=volume.description, size=volume.size, type_name=volume.type, availability_zone=volume.availability_zone, diff --git a/snaps/openstack/utils/tests/cinder_utils_tests.py b/snaps/openstack/utils/tests/cinder_utils_tests.py index e8c31db..b624b09 100644 --- a/snaps/openstack/utils/tests/cinder_utils_tests.py +++ b/snaps/openstack/utils/tests/cinder_utils_tests.py @@ -18,11 +18,12 @@ import uuid import time from cinderclient.exceptions import NotFound, BadRequest +from snaps.config.volume import VolumeConfig from snaps.config.volume_type import ( VolumeTypeConfig, ControlLocation, VolumeTypeEncryptionConfig) from snaps.config.qos import Consumer, QoSConfig from snaps.openstack import create_volume -from snaps.openstack.create_volume import VolumeSettings +from snaps.openstack.create_qos import Consumer from snaps.openstack.tests import validation_utils from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import cinder_utils @@ -91,7 +92,7 @@ class CinderUtilsVolumeTests(OSComponentTestCase): """ Tests the cinder_utils.create_volume() """ - volume_settings = VolumeSettings(name=self.volume_name) + volume_settings = VolumeConfig(name=self.volume_name) self.volume = cinder_utils.create_volume( self.cinder, volume_settings) self.assertIsNotNone(self.volume) @@ -108,7 +109,7 @@ class CinderUtilsVolumeTests(OSComponentTestCase): """ Tests the cinder_utils.create_volume() """ - volume_settings = VolumeSettings(name=self.volume_name) + volume_settings = VolumeConfig(name=self.volume_name) self.volume = cinder_utils.create_volume( self.cinder, volume_settings) self.assertIsNotNone(self.volume) diff --git a/snaps/openstack/utils/tests/nova_utils_tests.py b/snaps/openstack/utils/tests/nova_utils_tests.py index 0c313b9..6335ed9 100644 --- a/snaps/openstack/utils/tests/nova_utils_tests.py +++ b/snaps/openstack/utils/tests/nova_utils_tests.py @@ -19,6 +19,7 @@ import uuid import os from snaps import file_utils +from snaps.config.volume import VolumeConfig from snaps.config.flavor import FlavorConfig from snaps.openstack import create_instance from snaps.openstack.create_flavor import OpenStackFlavor @@ -26,7 +27,7 @@ from snaps.openstack.create_image import OpenStackImage from snaps.openstack.create_instance import ( VmInstanceSettings, OpenStackVmInstance) from snaps.openstack.create_network import OpenStackNetwork, PortSettings -from snaps.openstack.create_volume import OpenStackVolume, VolumeSettings +from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.tests import openstack_tests from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.utils import ( @@ -375,7 +376,7 @@ class NovaUtilsInstanceVolumeTests(OSComponentTestCase): self.flavor_creator.create() # Create Volume - volume_settings = VolumeSettings( + volume_settings = VolumeConfig( name=self.__class__.__name__ + '-' + str(guid)) self.volume_creator = OpenStackVolume( self.os_creds, volume_settings) diff --git a/snaps/openstack/utils/tests/settings_utils_tests.py b/snaps/openstack/utils/tests/settings_utils_tests.py index f4e7da5..1157f2c 100644 --- a/snaps/openstack/utils/tests/settings_utils_tests.py +++ b/snaps/openstack/utils/tests/settings_utils_tests.py @@ -356,7 +356,7 @@ class SettingsUtilsUnitTests(unittest.TestCase): volume = Volume( name='vol-name', volume_id='vol-id', description='desc', size=99, vol_type='vol-type', availability_zone='zone1', multi_attach=True) - settings = settings_utils.create_volume_settings(volume) + settings = settings_utils.create_volume_config(volume) self.assertEqual(volume.name, settings.name) self.assertEqual(volume.description, settings.description) self.assertEqual(volume.size, settings.size) |