From 0e377731a20617c9cdb886a597395c61ae490e38 Mon Sep 17 00:00:00 2001 From: spisarski Date: Mon, 20 Nov 2017 14:56:44 -0700 Subject: Refactoring of SecurityGroupSettings to extend SecurityGroupConfig SecurityGroupSettings, SecurityGroupSettings and neutron_utils have a runtime cyclical dependency. This patch reduces this dependency and deprecates the SecurityGroupSettings and SecurityGroupRuleSettings class with snaps.config.security_group SecurityGroupConfig and SecurityGroupRuleConfg classes JIRA: SNAPS-224 Change-Id: I6cd82ed5be31f4a24449be767b203e86489b1962 Signed-off-by: spisarski --- examples/launch.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/launch.py b/examples/launch.py index 8810c32..975d834 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -33,6 +33,7 @@ from snaps.config.network import PortConfig, NetworkConfig from snaps.config.project import ProjectConfig from snaps.config.qos import QoSConfig from snaps.config.router import RouterConfig +from snaps.config.security_group import SecurityGroupConfig from snaps.config.user import UserConfig from snaps.config.vm_inst import VmInstanceConfig from snaps.config.volume import VolumeConfig @@ -44,8 +45,7 @@ from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.create_project import OpenStackProject from snaps.openstack.create_qos import OpenStackQoS from snaps.openstack.create_router import OpenStackRouter -from snaps.openstack.create_security_group import ( - OpenStackSecurityGroup, SecurityGroupSettings) +from snaps.openstack.create_security_group import OpenStackSecurityGroup from snaps.openstack.create_user import OpenStackUser from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.create_volume_type import OpenStackVolumeType @@ -690,7 +690,7 @@ def main(arguments): # Create security groups creators.append(__create_instances( os_creds_dict, OpenStackSecurityGroup, - SecurityGroupSettings, + SecurityGroupConfig, os_config.get('security_groups'), 'security_group', clean, users_dict)) -- cgit