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 --- examples/launch.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/launch.py b/examples/launch.py index 35ebaf7..b0311e6 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -26,7 +26,6 @@ import os import yaml from snaps import file_utils -from snaps.config.volume_type import VolumeTypeConfig from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.keypair import KeypairConfig @@ -34,6 +33,8 @@ from snaps.config.project import ProjectConfig from snaps.config.qos import QoSConfig from snaps.config.router import RouterConfig from snaps.config.user import UserConfig +from snaps.config.volume import VolumeConfig +from snaps.config.volume_type import VolumeTypeConfig from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_image import OpenStackImage from snaps.openstack.create_instance import VmInstanceSettings @@ -46,7 +47,7 @@ from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import ( OpenStackSecurityGroup, SecurityGroupSettings) from snaps.openstack.create_user import OpenStackUser -from snaps.openstack.create_volume import OpenStackVolume, VolumeSettings +from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.create_volume_type import OpenStackVolumeType from snaps.openstack.os_credentials import OSCreds, ProxySettings from snaps.openstack.utils import deploy_utils @@ -660,7 +661,7 @@ def main(arguments): # Create volume types vol_dict = __create_instances( - os_creds_dict, OpenStackVolume, VolumeSettings, + os_creds_dict, OpenStackVolume, VolumeConfig, os_config.get('volumes'), 'volume', clean, users_dict) creators.append(vol_dict) -- cgit 1.2.3-korg