diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-28 17:22:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-28 17:22:42 +0000 |
| commit | 9239d8f96cdd4dfc014de2d211312c3719eceaca (patch) | |
| tree | c61fca329350af8a14fd06d97c04ece040e1b9d4 /tests/test_apex_network_environment.py | |
| parent | 523c9cb5bea77f19c909ebce4fa23c9676c4dd6d (diff) | |
| parent | d8059095ab25e5939373777330b955075d064ec6 (diff) | |
Merge "Removing --flat and network_isolation variables"
Diffstat (limited to 'tests/test_apex_network_environment.py')
| -rw-r--r-- | tests/test_apex_network_environment.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_apex_network_environment.py b/tests/test_apex_network_environment.py index 7c9b922f..df0f0334 100644 --- a/tests/test_apex_network_environment.py +++ b/tests/test_apex_network_environment.py @@ -37,11 +37,11 @@ class TestNetworkEnvironment(object): def setup_class(klass): """This method is run once for each class before any tests are run""" klass.ns = NetworkSettings( - '../config/network/network_settings.yaml', True) + '../config/network/network_settings.yaml') klass.ns_vlans = NetworkSettings( - '../config/network/network_settings_vlans.yaml', True) + '../config/network/network_settings_vlans.yaml') klass.ns_ipv6 = NetworkSettings( - '../config/network/network_settings_v6.yaml', True) + '../config/network/network_settings_v6.yaml') @classmethod def teardown_class(klass): @@ -130,7 +130,7 @@ class TestNetworkEnvironment(object): ns = copy(self.ns_vlans) ns['networks'][API_NETWORK]['enabled'] = True ns['networks'][API_NETWORK]['cidr'] = '10.11.12.0/24' - ns = NetworkSettings(ns, True) + ns = NetworkSettings(ns) # test vlans ne = NetworkEnvironment(ns, '../build/network-environment.yaml') assert_equal(ne['parameter_defaults']['InternalApiNetworkVlanID'], 101) @@ -138,7 +138,7 @@ class TestNetworkEnvironment(object): def test_netenv_settings_api_network_vlans(self): ns = copy(self.ns_vlans) ns['networks'][API_NETWORK]['enabled'] = True - ns = NetworkSettings(ns, True) + ns = NetworkSettings(ns) # test vlans ne = NetworkEnvironment(ns, '../build/network-environment.yaml') assert_equal(ne['parameter_defaults']['InternalApiNetworkVlanID'], 101) |