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 <s.pisarski@cablelabs.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py
index 0e34caa..bc664fe 100644
--- a/snaps/openstack/tests/create_instance_tests.py
+++ b/snaps/openstack/tests/create_instance_tests.py
@@ -24,6 +24,7 @@ from neutronclient.common.exceptions import InvalidIpForSubnetClient
 from novaclient.exceptions import BadRequest
 
 from snaps import file_utils
+from snaps.config.router import RouterConfig
 from snaps.config.keypair import KeypairConfig
 from snaps.openstack import create_network, create_router
 from snaps.config.flavor import FlavorConfig
@@ -36,7 +37,7 @@ from snaps.openstack.create_instance import (
 from snaps.openstack.create_keypairs import OpenStackKeypair
 from snaps.openstack.create_network import (
     OpenStackNetwork, PortSettings, NetworkSettings, SubnetSettings)
-from snaps.openstack.create_router import OpenStackRouter, RouterSettings
+from snaps.openstack.create_router import OpenStackRouter
 from snaps.openstack.create_security_group import (
     SecurityGroupSettings, OpenStackSecurityGroup, SecurityGroupRuleSettings,
     Direction, Protocol)
@@ -948,7 +949,7 @@ class CreateInstanceIPv6NetworkTests(OSIntegrationTestCase):
             ip_version=6)
         network_settings = NetworkSettings(
             name=self.guid + '-net', subnet_settings=[subnet_settings])
-        router_settings = RouterSettings(
+        router_settings = RouterConfig(
             name=self.guid + '-router', external_gateway=self.ext_net_name,
             internal_subnets=[subnet_settings.name])
 
@@ -996,7 +997,7 @@ class CreateInstanceIPv6NetworkTests(OSIntegrationTestCase):
         network_settings = NetworkSettings(
             name=self.guid + '-net',
             subnet_settings=[subnet4_settings, subnet6_settings])
-        router_settings = RouterSettings(
+        router_settings = RouterConfig(
             name=self.guid + '-router', external_gateway=self.ext_net_name,
             internal_subnets=[subnet4_settings.name])
 
@@ -2720,8 +2721,8 @@ class CreateInstanceTwoNetTests(OSIntegrationTestCase):
                     network_name=self.net_config_2.name,
                     project_name=self.os_creds.project_name)]
 
-            router_settings = RouterSettings(name=self.guid + '-pub-router',
-                                             port_settings=port_settings)
+            router_settings = RouterConfig(
+                name=self.guid + '-pub-router', port_settings=port_settings)
             self.router_creator = create_router.OpenStackRouter(
                 self.os_creds, router_settings)
             self.router_creator.create()