From 3482f6e28e26025043f61efb90892d886f5909cc Mon Sep 17 00:00:00 2001 From: spisarski Date: Fri, 17 Nov 2017 09:49:52 -0700 Subject: Refactoring of RouterSettings to extend RouterConfig RouterSettings and neutron_utils have a runtime cyclical dependency. This patch reduces this dependency and deprecates the RouterSettings class. JIRA: SNAPS-223 Change-Id: I6a2a5e6e6e86204e62148a57e3525da5862841cf Signed-off-by: spisarski --- examples/launch.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples/launch.py') diff --git a/examples/launch.py b/examples/launch.py index 0ed6456..dfdf57f 100644 --- a/examples/launch.py +++ b/examples/launch.py @@ -30,6 +30,7 @@ from snaps.config.flavor import FlavorConfig from snaps.config.image import ImageConfig from snaps.config.keypair import KeypairConfig from snaps.config.project import ProjectConfig +from snaps.config.router import RouterConfig from snaps.config.user import UserConfig from snaps.openstack.create_flavor import OpenStackFlavor from snaps.openstack.create_image import OpenStackImage @@ -39,7 +40,7 @@ from snaps.openstack.create_network import ( PortSettings, NetworkSettings, OpenStackNetwork) from snaps.openstack.create_project import OpenStackProject from snaps.openstack.create_qos import QoSSettings, OpenStackQoS -from snaps.openstack.create_router import RouterSettings, OpenStackRouter +from snaps.openstack.create_router import OpenStackRouter from snaps.openstack.create_security_group import ( OpenStackSecurityGroup, SecurityGroupSettings) from snaps.openstack.create_user import OpenStackUser @@ -675,7 +676,7 @@ def main(arguments): # Create routers creators.append(__create_instances( - os_creds_dict, OpenStackRouter, RouterSettings, + os_creds_dict, OpenStackRouter, RouterConfig, os_config.get('routers'), 'router', clean, users_dict)) # Create keypairs -- cgit 1.2.3-korg