diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-09-15 14:36:24 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2016-09-27 15:34:58 -0400 |
| commit | d8059095ab25e5939373777330b955075d064ec6 (patch) | |
| tree | 3254a048d2d183e848d772e4bf6f61c96a0a3577 /tests/test_apex_network_environment.py | |
| parent | fdcadb59d666e277d91629ed75705b4636a8749c (diff) | |
Removing --flat and network_isolation variables
VLAN support allows a set of nodes with a single nic to deploy removing
the need for --flat. flat was not well maintained or tested.
Change-Id: Ieae1c2350c83544ce50048b44300fa0b8e68dd43
Signed-off-by: Dan Radez <dradez@redhat.com>
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) |