From 1d7f4a18cf4a070570beccbb46303f5822840c41 Mon Sep 17 00:00:00 2001 From: spisarski Date: Fri, 17 Nov 2017 14:54:46 -0700 Subject: 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 --- snaps/openstack/utils/settings_utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'snaps/openstack/utils/settings_utils.py') 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, -- cgit 1.2.3-korg