diff options
author | spisarski <s.pisarski@cablelabs.com> | 2017-11-17 16:07:40 -0700 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-20 12:52:10 -0700 |
commit | a82209830309354c5bdc7e8b885c51df42c731d1 (patch) | |
tree | 8526779a6add5ff3dae7562b9b525231032f0a51 /snaps/config/tests/router_tests.py | |
parent | 1d7f4a18cf4a070570beccbb46303f5822840c41 (diff) |
Refactoring of NetworkSettings to extend NetworkConfig
This also includes SubnetSettings extending to SubnetConfig and
PortSettings extenting to Portconfig and neutron_utils have a runtime cyclical
dependency. This patch reduces this dependency and deprecates the NetworkSettings,
SubnetSettings, and PortSettings classes.
JIRA: SNAPS-220
Change-Id: I996d73d9b910c075a6511a423f01d966f5b6fb74
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/config/tests/router_tests.py')
-rw-r--r-- | snaps/config/tests/router_tests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/snaps/config/tests/router_tests.py b/snaps/config/tests/router_tests.py index ffa227a..2c8f91f 100644 --- a/snaps/config/tests/router_tests.py +++ b/snaps/config/tests/router_tests.py @@ -14,8 +14,8 @@ # limitations under the License. import unittest +from snaps.config.network import PortConfig from snaps.config.router import RouterConfig, RouterConfigError -from snaps.openstack.create_network import PortSettings class RouterConfigUnitTests(unittest.TestCase): @@ -60,7 +60,7 @@ class RouterConfigUnitTests(unittest.TestCase): self.assertEqual(0, len(settings.port_settings)) def test_all(self): - port_settings = PortSettings(name='foo', network_name='bar') + port_settings = PortConfig(name='foo', network_name='bar') settings = RouterConfig( name='foo', project_name='bar', external_gateway='foo_gateway', admin_state_up=True, enable_snat=False, @@ -93,6 +93,6 @@ class RouterConfigUnitTests(unittest.TestCase): self.assertTrue(isinstance(settings.internal_subnets, list)) self.assertEqual(1, len(settings.internal_subnets)) self.assertEqual(['10.0.0.1/24'], settings.internal_subnets) - self.assertEqual([PortSettings(**{'name': 'foo-port', - 'network_name': 'bar-net'})], + self.assertEqual([PortConfig(**{'name': 'foo-port', + 'network_name': 'bar-net'})], settings.port_settings) |