summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/tests/openstack_tests.py
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-11-17 09:49:52 -0700
committerspisarski <s.pisarski@cablelabs.com>2017-11-20 08:34:23 -0700
commit3482f6e28e26025043f61efb90892d886f5909cc (patch)
treea9a5209a5a21d893ed0f673d6b8a9cda73ff9652 /snaps/openstack/tests/openstack_tests.py
parent133b321125eeb4c22b2963dbd112a074cfeb6ab1 (diff)
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>
Diffstat (limited to 'snaps/openstack/tests/openstack_tests.py')
-rw-r--r--snaps/openstack/tests/openstack_tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py
index 957825a..8430a96 100644
--- a/snaps/openstack/tests/openstack_tests.py
+++ b/snaps/openstack/tests/openstack_tests.py
@@ -18,8 +18,8 @@ import re
import pkg_resources
from snaps import file_utils
from snaps.config.image import ImageConfig
+from snaps.config.router import RouterConfig
from snaps.openstack.create_network import NetworkSettings, SubnetSettings
-from snaps.openstack.create_router import RouterSettings
from snaps.openstack.os_credentials import OSCreds, ProxySettings
__author__ = 'spisarski'
@@ -346,9 +346,9 @@ class OSNetworkConfig:
if router_name:
if subnet_name:
- self.router_settings = RouterSettings(
+ self.router_settings = RouterConfig(
name=router_name, external_gateway=external_gateway,
internal_subnets=[subnet_name])
else:
- self.router_settings = RouterSettings(
+ self.router_settings = RouterConfig(
name=router_name, external_gateway=external_gateway)