from copy import copy
-from nose.tools import assert_equal
-from nose.tools import assert_is_instance
-from nose.tools import assert_not_equal
-from nose.tools import assert_raises
+from nose.tools import (
+ assert_equal,
+ assert_is_instance,
+ assert_not_equal,
+ assert_raises)
from apex.common.constants import (
EXTERNAL_NETWORK,
from apex.tests.constants import TEST_BUILD_DIR
-class TestNetworkEnvironment(object):
+class TestNetworkEnvironment:
@classmethod
- def setup_class(klass):
+ def setup_class(cls):
"""This method is run once for each class before any tests are run"""
- klass.ns = NetworkSettings(
+ cls.ns = NetworkSettings(
os.path.join(TEST_CONFIG_DIR, 'network/network_settings.yaml'))
- klass.ns_vlans = NetworkSettings(
+ cls.ns_vlans = NetworkSettings(
os.path.join(TEST_CONFIG_DIR,
'network/network_settings_vlans.yaml'))
- klass.ns_ipv6 = NetworkSettings(
+ cls.ns_ipv6 = NetworkSettings(
os.path.join(TEST_CONFIG_DIR, 'network/network_settings_v6.yaml'))
@classmethod
def teardown_class(klass):
"""This method is run once for each class _after_ all tests are run"""
- def setUp(self):
+ def setup(self):
"""This method is run once before _each_ test method is executed"""
def teardown(self):
# Test removing EXTERNAL_NETWORK
ns.enabled_network_list.remove(EXTERNAL_NETWORK)
ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
- regstr = ne['resource_registry']['OS::TripleO::Network::External']
- assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
+ assert 'OS::TripleO::Network::External' not in ne['resource_registry']
def test_netenv_settings_tenant_network_vlans(self):
# test vlans
# Test removing TENANT_NETWORK
ns.enabled_network_list.remove(TENANT_NETWORK)
ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
- regstr = ne['resource_registry']['OS::TripleO::Network::Tenant']
- assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
+ assert 'OS::TripleO::Network::Tenant' not in ne['resource_registry']
def test_netenv_settings_storage_network_vlans(self):
# test vlans
# Test removing STORAGE_NETWORK
ns.enabled_network_list.remove(STORAGE_NETWORK)
ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
- regstr = ne['resource_registry']['OS::TripleO::Network::Storage']
- assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
+ assert 'OS::TripleO::Network::Storage' not in ne['resource_registry']
def test_netenv_settings_api_network_v4(self):
ns = copy(self.ns_vlans)
ns = copy(self.ns)
# API_NETWORK is not in the default network settings file
ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
- regstr = ne['resource_registry']['OS::TripleO::Network::InternalApi']
- assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
+ assert 'OS::TripleO::Network::InternalApi' not in ne[
+ 'resource_registry']
def test_numa_configs(self):
ne = NetworkEnvironment(self.ns,
e = NetworkEnvException("test")
print(e)
assert_is_instance(e, NetworkEnvException)
+
+ def test_service_netmap(self):
+ ns = copy(self.ns)
+ ns.enabled_network_list = ['admin']
+ ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
+ for network in ne['parameter_defaults']['ServiceNetMap'].values():
+ assert_equal(network, 'ctlplane')