diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_apex_deploy_settings.py | 8 | ||||
| -rw-r--r-- | tests/test_apex_network_settings.py | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py index 48c55d79..5882eb95 100644 --- a/tests/test_apex_deploy_settings.py +++ b/tests/test_apex_deploy_settings.py @@ -20,15 +20,15 @@ from nose.tools import assert_is_instance deploy_files = ('deploy_settings.yaml', 'os-nosdn-nofeature-noha.yaml', - 'os-nosdn-ovs-noha.yaml', + 'os-nosdn-ovs_dpdk-noha.yaml', 'os-ocl-nofeature-ha.yaml', 'os-odl-bgpvpn-ha.yaml', 'os-odl-bgpvpn-noha.yaml', - 'os-odl_l3-nofeature-ha.yaml', + 'os-odl-nofeature-ha.yaml', 'os-nosdn-nofeature-ha.yaml', - 'os-nosdn-ovs-ha.yaml', + 'os-nosdn-ovs_dpdk-ha.yaml', 'os-nosdn-performance-ha.yaml', - 'os-odl_l2-nofeature-ha.yaml', + 'os-odl-nofeature-ha.yaml', 'os-odl_l2-sfc-noha.yaml', 'os-onos-nofeature-ha.yaml', 'os-onos-sfc-ha.yaml') diff --git a/tests/test_apex_network_settings.py b/tests/test_apex_network_settings.py index 8f994352..a1dbaf1c 100644 --- a/tests/test_apex_network_settings.py +++ b/tests/test_apex_network_settings.py @@ -89,13 +89,10 @@ class TestNetworkSettings(object): ns = NetworkSettings('../config/network/network_settings.yaml') assert_is_instance(ns, NetworkSettings) for role in ['controller', 'compute']: - nic_index = 1 + nic_index = 0 print(ns.nics) for network in ns.enabled_network_list: - if role == 'compute': - nic = 'eth' + str(nic_index - 1) - else: - nic = 'nic' + str(nic_index) + nic = 'eth' + str(nic_index) assert_equal(ns.nics[role][network], nic) nic_index += 1 @@ -107,7 +104,7 @@ class TestNetworkSettings(object): ns = NetworkSettings(files_dir+'network_settings.yaml') storage_net_nicmap = ns['networks'][STORAGE_NETWORK]['nic_mapping'] # set duplicate nic - storage_net_nicmap['controller']['members'][0] = 'nic1' + storage_net_nicmap['controller']['members'][0] = 'eth0' assert_raises(NetworkSettingsException, NetworkSettings, ns) # remove nic members storage_net_nicmap['controller']['members'] = [] |