x/vmware-nsx
Code Issues Proposed changes

Remove plugin_name_v2 and extension_manager in test_config

Browse Source 
There are two ways to specify a core plugin and an extension manager
in the unit tests: test_config and arguments of the constructor.
Both are used and it sometimes makes it a bit difficult to debug.
This patch removes the way via test_config and makes constructor
arguments the only way to do it.

Also removes the default entries in test_config because they are
not used anywhere.

Change-Id: I491003f4246e62001e9b74743c8fbfa922088383
Closes-Bug: #1245335
This commit is contained in:
Akihiro MOTOKI 2013-10-26 21:53:21 +09:00 committed by Akihiro Motoki
parent affb042639
commit 237b24b0c8
20 changed files with 76 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/common/test_lib.py
View File

@ -37,15 +37,8 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from neutron.common import constants
# describes parameters used by different unit/functional tests # describes parameters used by different unit/functional tests
# a plugin-specific testing mechanism should import this dictionary # a plugin-specific testing mechanism should import this dictionary
# and override the values in it if needed (e.g., run_tests.py in # and override the values in it if needed (e.g., run_tests.py in
# neutron/plugins/openvswitch/ ) # neutron/plugins/openvswitch/ )
test_config = { test_config = {}
"plugin_name": "",
"default_net_op_status": constants.NET_STATUS_ACTIVE,
"default_port_op_status": constants.PORT_STATUS_ACTIVE,
}

31
neutron/tests/unit/bigswitch/test_router_db.py
View File

@ -20,7 +20,6 @@
import contextlib import contextlib
import copy import copy
import os
from mock import patch from mock import patch
from oslo.config import cfg from oslo.config import cfg
@ -30,8 +29,6 @@ from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.extensions import l3 from neutron.extensions import l3
from neutron.manager import NeutronManager from neutron.manager import NeutronManager
from neutron.openstack.common.notifier import api as notifier_api
from neutron.openstack.common.notifier import test_notifier
from neutron.openstack.common import uuidutils from neutron.openstack.common import uuidutils
from neutron.plugins.bigswitch.extensions import routerrule from neutron.plugins.bigswitch.extensions import routerrule
from neutron.tests.unit.bigswitch import fake_server from neutron.tests.unit.bigswitch import fake_server
@ -44,25 +41,6 @@ from neutron.tests.unit import test_l3_plugin
_uuid = uuidutils.generate_uuid _uuid = uuidutils.generate_uuid
def new_L3_setUp(self):
test_config['plugin_name_v2'] = (
'neutron.plugins.bigswitch.plugin.NeutronRestProxyV2')
etc_path = os.path.join(os.path.dirname(__file__), 'etc')
rp_conf_file = os.path.join(etc_path, 'restproxy.ini.test')
test_config['config_files'] = [rp_conf_file]
cfg.CONF.set_default('allow_overlapping_ips', False)
ext_mgr = RouterRulesTestExtensionManager()
test_config['extension_manager'] = ext_mgr
super(test_l3_plugin.L3BaseForIntTests, self).setUp()
# Set to None to reload the drivers
notifier_api._drivers = None
cfg.CONF.set_override("notification_driver", [test_notifier.__name__])
origSetUp = test_l3_plugin.L3NatDBIntTestCase.setUp
class RouterRulesTestExtensionManager(object): class RouterRulesTestExtensionManager(object):
def get_resources(self): def get_resources(self):
@ -92,15 +70,16 @@ class RouterDBTestCase(test_base.BigSwitchTestBase,
def setUp(self): def setUp(self):
self.setup_patches() self.setup_patches()
test_l3_plugin.L3NatDBIntTestCase.setUp = new_L3_setUp self.setup_config_files()
super(RouterDBTestCase, self).setUp() ext_mgr = RouterRulesTestExtensionManager()
super(RouterDBTestCase, self).setUp(plugin=self._plugin_name,
ext_mgr=ext_mgr)
cfg.CONF.set_default('allow_overlapping_ips', False)
self.plugin_obj = NeutronManager.get_plugin() self.plugin_obj = NeutronManager.get_plugin()
def tearDown(self): def tearDown(self):
super(RouterDBTestCase, self).tearDown() super(RouterDBTestCase, self).tearDown()
del test_config['plugin_name_v2']
del test_config['config_files'] del test_config['config_files']
test_l3_plugin.L3NatDBIntTestCase.setUp = origSetUp
def test_router_remove_router_interface_wrong_subnet_returns_400(self): def test_router_remove_router_interface_wrong_subnet_returns_400(self):
with self.router() as r: with self.router() as r:

11
neutron/tests/unit/cisco/n1kv/test_n1kv_plugin.py
View File

@ -22,7 +22,6 @@ from oslo.config import cfg
from neutron.api import extensions as neutron_extensions from neutron.api import extensions as neutron_extensions
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
import neutron.db.api as db import neutron.db.api as db
from neutron.plugins.cisco.db import n1kv_db_v2 from neutron.plugins.cisco.db import n1kv_db_v2
@ -203,12 +202,9 @@ class N1kvPluginTestCase(test_plugin.NeutronDbPluginV2TestCase):
n1kv_neutron_plugin.N1kvNeutronPluginV2._setup_vsm = _fake_setup_vsm n1kv_neutron_plugin.N1kvNeutronPluginV2._setup_vsm = _fake_setup_vsm
test_config['plugin_name_v2'] = self._plugin_name
neutron_extensions.append_api_extensions_path(extensions.__path__) neutron_extensions.append_api_extensions_path(extensions.__path__)
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
ext_mgr = NetworkProfileTestExtensionManager() ext_mgr = NetworkProfileTestExtensionManager()
test_config['extension_manager'] = ext_mgr
self.addCleanup(self.restore_test_config)
# Save the original RESOURCE_ATTRIBUTE_MAP # Save the original RESOURCE_ATTRIBUTE_MAP
self.saved_attr_map = {} self.saved_attr_map = {}
@ -221,7 +217,8 @@ class N1kvPluginTestCase(test_plugin.NeutronDbPluginV2TestCase):
n1kv_profile.EXTENDED_ATTRIBUTES_2_0["ports"]) n1kv_profile.EXTENDED_ATTRIBUTES_2_0["ports"])
self.addCleanup(self.restore_resource_attribute_map) self.addCleanup(self.restore_resource_attribute_map)
self.addCleanup(db.clear_db) self.addCleanup(db.clear_db)
super(N1kvPluginTestCase, self).setUp(self._plugin_name) super(N1kvPluginTestCase, self).setUp(self._plugin_name,
ext_mgr=ext_mgr)
# Create some of the database entries that we require. # Create some of the database entries that we require.
self._make_test_profile() self._make_test_profile()
self._make_test_policy_profile() self._make_test_policy_profile()
@ -230,10 +227,6 @@ class N1kvPluginTestCase(test_plugin.NeutronDbPluginV2TestCase):
# Restore the original RESOURCE_ATTRIBUTE_MAP # Restore the original RESOURCE_ATTRIBUTE_MAP
attributes.RESOURCE_ATTRIBUTE_MAP = self.saved_attr_map attributes.RESOURCE_ATTRIBUTE_MAP = self.saved_attr_map
def restore_test_config(self):
# Restore the original test_config
del test_config['plugin_name_v2']
def test_plugin(self): def test_plugin(self):
self._make_network('json', self._make_network('json',
'some_net', 'some_net',

5
neutron/tests/unit/nec/test_nec_plugin.py
View File

@ -100,12 +100,13 @@ class NecPluginV2TestCase(NecPluginV2TestCaseBase,
'port_added': added, 'port_removed': removed} 'port_added': added, 'port_removed': removed}
self.callback_nec.update_ports(self.context, **kwargs) self.callback_nec.update_ports(self.context, **kwargs)
def setUp(self): def setUp(self, plugin=None, ext_mgr=None):
self.addCleanup(mock.patch.stopall) self.addCleanup(mock.patch.stopall)
self._set_nec_ini() self._set_nec_ini()
self.addCleanup(self._clean_nec_ini) self.addCleanup(self._clean_nec_ini)
super(NecPluginV2TestCase, self).setUp(self._plugin_name) plugin = plugin or self._plugin_name
super(NecPluginV2TestCase, self).setUp(plugin, ext_mgr=ext_mgr)
self.plugin = manager.NeutronManager.get_plugin() self.plugin = manager.NeutronManager.get_plugin()
self.plugin.ofc = fake_ofc_manager.patch_ofc_manager() self.plugin.ofc = fake_ofc_manager.patch_ofc_manager()

5
neutron/tests/unit/nec/test_packet_filter.py
View File

@ -19,7 +19,6 @@ import mock
import webob.exc import webob.exc
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.plugins.nec.common import exceptions as nexc from neutron.plugins.nec.common import exceptions as nexc
from neutron.plugins.nec.extensions import packetfilter from neutron.plugins.nec.extensions import packetfilter
@ -54,8 +53,8 @@ class TestNecPluginPacketFilter(test_nec_plugin.NecPluginV2TestCase):
_nec_ini = NEC_PLUGIN_PF_INI _nec_ini = NEC_PLUGIN_PF_INI
def setUp(self): def setUp(self):
test_config['extension_manager'] = PacketfilterExtensionManager() ext_mgr = PacketfilterExtensionManager()
super(TestNecPluginPacketFilter, self).setUp() super(TestNecPluginPacketFilter, self).setUp(ext_mgr=ext_mgr)
def _create_packet_filter(self, fmt, net_id, expected_res_status=None, def _create_packet_filter(self, fmt, net_id, expected_res_status=None,
arg_list=None, **kwargs): arg_list=None, **kwargs):

1
neutron/tests/unit/nicira/test_agent_scheduler.py
View File

@ -33,7 +33,6 @@ class NVPDhcpAgentNotifierTestCase(test_base.OvsDhcpAgentNotifierTestCase):
plugin_str = PLUGIN_NAME plugin_str = PLUGIN_NAME
def setUp(self): def setUp(self):
test_config['plugin_name_v2'] = PLUGIN_NAME
test_config['config_files'] = [get_fake_conf('nsx.ini.full.test')] test_config['config_files'] = [get_fake_conf('nsx.ini.full.test')]
# mock nvp api client # mock nvp api client

5
neutron/tests/unit/nicira/test_maclearning.py
View File

@ -59,14 +59,12 @@ class MacLearningDBTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self): def setUp(self):
self.adminContext = context.get_admin_context() self.adminContext = context.get_admin_context()
test_config['config_files'] = [get_fake_conf('nsx.ini.full.test')] test_config['config_files'] = [get_fake_conf('nsx.ini.full.test')]
test_config['plugin_name_v2'] = PLUGIN_NAME
cfg.CONF.set_override('api_extensions_path', NVPEXT_PATH) cfg.CONF.set_override('api_extensions_path', NVPEXT_PATH)
# Save the original RESOURCE_ATTRIBUTE_MAP # Save the original RESOURCE_ATTRIBUTE_MAP
self.saved_attr_map = {} self.saved_attr_map = {}
for resource, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.iteritems(): for resource, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.iteritems():
self.saved_attr_map[resource] = attrs.copy() self.saved_attr_map[resource] = attrs.copy()
ext_mgr = MacLearningExtensionManager() ext_mgr = MacLearningExtensionManager()
test_config['extension_manager'] = ext_mgr
# mock nvp api client # mock nvp api client
self.fc = fake_nvpapiclient.FakeClient(STUBS_PATH) self.fc = fake_nvpapiclient.FakeClient(STUBS_PATH)
self.mock_nvpapi = mock.patch(NVPAPI_NAME, autospec=True) self.mock_nvpapi = mock.patch(NVPAPI_NAME, autospec=True)
@ -87,7 +85,8 @@ class MacLearningDBTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
self.addCleanup(patch_sync.stop) self.addCleanup(patch_sync.stop)
self.addCleanup(self.restore_resource_attribute_map) self.addCleanup(self.restore_resource_attribute_map)
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
super(MacLearningDBTestCase, self).setUp() super(MacLearningDBTestCase, self).setUp(plugin=PLUGIN_NAME,
ext_mgr=ext_mgr)
def restore_resource_attribute_map(self): def restore_resource_attribute_map(self):
# Restore the original RESOURCE_ATTRIBUTE_MAP # Restore the original RESOURCE_ATTRIBUTE_MAP

14
neutron/tests/unit/nicira/test_networkgw.py
View File

@ -25,7 +25,6 @@ from neutron.api import extensions
from neutron.api.extensions import PluginAwareExtensionManager from neutron.api.extensions import PluginAwareExtensionManager
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common import config from neutron.common import config
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.db import api as db_api from neutron.db import api as db_api
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
@ -246,13 +245,14 @@ class NetworkGatewayExtensionTestCase(base.BaseTestCase):
class NetworkGatewayDbTestCase(test_db_plugin.NeutronDbPluginV2TestCase): class NetworkGatewayDbTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
"""Unit tests for Network Gateway DB support.""" """Unit tests for Network Gateway DB support."""
def setUp(self): def setUp(self, plugin=None, ext_mgr=None):
test_config['plugin_name_v2'] = '%s.%s' % ( if not plugin:
__name__, TestNetworkGatewayPlugin.__name__) plugin = '%s.%s' % (__name__, TestNetworkGatewayPlugin.__name__)
ext_mgr = TestExtensionManager() if not ext_mgr:
test_config['extension_manager'] = ext_mgr ext_mgr = TestExtensionManager()
self.resource = networkgw.RESOURCE_NAME.replace('-', '_') self.resource = networkgw.RESOURCE_NAME.replace('-', '_')
super(NetworkGatewayDbTestCase, self).setUp() super(NetworkGatewayDbTestCase, self).setUp(plugin=plugin,
ext_mgr=ext_mgr)
def _create_network_gateway(self, fmt, tenant_id, name=None, def _create_network_gateway(self, fmt, tenant_id, name=None,
devices=None, arg_list=None, **kwargs): devices=None, arg_list=None, **kwargs):

19
neutron/tests/unit/nicira/test_nicira_plugin.py
View File

@ -119,7 +119,6 @@ class NiciraPluginV2TestCase(test_plugin.NeutronDbPluginV2TestCase):
self.mock_instance.return_value.get_nvp_version.return_value = ( self.mock_instance.return_value.get_nvp_version.return_value = (
NVPVersion("2.9")) NVPVersion("2.9"))
self.mock_instance.return_value.request.side_effect = _fake_request self.mock_instance.return_value.request.side_effect = _fake_request
plugin = plugin or PLUGIN_NAME
super(NiciraPluginV2TestCase, self).setUp(plugin=plugin, super(NiciraPluginV2TestCase, self).setUp(plugin=plugin,
ext_mgr=ext_mgr) ext_mgr=ext_mgr)
cfg.CONF.set_override('metadata_mode', None, 'NSX') cfg.CONF.set_override('metadata_mode', None, 'NSX')
@ -400,8 +399,8 @@ class TestNiciraPortSecurity(NiciraPortSecurityTestCase,
pass pass
class TestNiciraAllowedAddressPairs(test_addr_pair.TestAllowedAddressPairs, class TestNiciraAllowedAddressPairs(NiciraPluginV2TestCase,
NiciraPluginV2TestCase): test_addr_pair.TestAllowedAddressPairs):
pass pass
@ -480,7 +479,7 @@ class NiciraL3NatTest(test_l3_plugin.L3BaseForIntTests,
def _restore_l3_attribute_map(self): def _restore_l3_attribute_map(self):
l3.RESOURCE_ATTRIBUTE_MAP = self._l3_attribute_map_bk l3.RESOURCE_ATTRIBUTE_MAP = self._l3_attribute_map_bk
def setUp(self, plugin=None, ext_mgr=None, service_plugins=None): def setUp(self, plugin=PLUGIN_NAME, ext_mgr=None, service_plugins=None):
self._l3_attribute_map_bk = {} self._l3_attribute_map_bk = {}
for item in l3.RESOURCE_ATTRIBUTE_MAP: for item in l3.RESOURCE_ATTRIBUTE_MAP:
self._l3_attribute_map_bk[item] = ( self._l3_attribute_map_bk[item] = (
@ -1248,8 +1247,7 @@ class NiciraNeutronNVPOutOfSync(NiciraPluginV2TestCase,
def setUp(self): def setUp(self):
ext_mgr = test_l3_plugin.L3TestExtensionManager() ext_mgr = test_l3_plugin.L3TestExtensionManager()
test_lib.test_config['extension_manager'] = ext_mgr super(NiciraNeutronNVPOutOfSync, self).setUp(ext_mgr=ext_mgr)
super(NiciraNeutronNVPOutOfSync, self).setUp()
def test_delete_network_not_in_nvp(self): def test_delete_network_not_in_nvp(self):
res = self._create_network('json', 'net1', True) res = self._create_network('json', 'net1', True)
@ -1404,12 +1402,13 @@ class NiciraNeutronNVPOutOfSync(NiciraPluginV2TestCase,
constants.NET_STATUS_ERROR) constants.NET_STATUS_ERROR)
class TestNiciraNetworkGateway(test_l2_gw.NetworkGatewayDbTestCase, class TestNiciraNetworkGateway(NiciraPluginV2TestCase,
NiciraPluginV2TestCase): test_l2_gw.NetworkGatewayDbTestCase):
def setUp(self): def setUp(self, plugin=PLUGIN_NAME, ext_mgr=None):
cfg.CONF.set_override('api_extensions_path', NVPEXT_PATH) cfg.CONF.set_override('api_extensions_path', NVPEXT_PATH)
super(TestNiciraNetworkGateway, self).setUp() super(TestNiciraNetworkGateway,
self).setUp(plugin=plugin, ext_mgr=ext_mgr)
def test_create_network_gateway_name_exceeds_40_chars(self): def test_create_network_gateway_name_exceeds_40_chars(self):
name = 'this_is_a_gateway_whose_name_is_longer_than_40_chars' name = 'this_is_a_gateway_whose_name_is_longer_than_40_chars'

36
neutron/tests/unit/services/metering/test_metering_plugin.py
View File

@ -17,7 +17,6 @@
import mock import mock
from neutron.api.v2 import attributes as attr from neutron.api.v2 import attributes as attr
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.db import agents_db from neutron.db import agents_db
from neutron.db import l3_agentschedulers_db from neutron.db import l3_agentschedulers_db
@ -67,11 +66,12 @@ class TestMeteringPlugin(test_db_plugin.NeutronDbPluginV2TestCase,
def setUp(self): def setUp(self):
service_plugins = {'metering_plugin_name': DB_METERING_PLUGIN_KLASS} service_plugins = {'metering_plugin_name': DB_METERING_PLUGIN_KLASS}
test_config['plugin_name_v2'] = ('neutron.tests.unit.test_l3_plugin.' plugin = 'neutron.tests.unit.test_l3_plugin.TestL3NatIntPlugin'
'TestL3NatIntPlugin')
ext_mgr = MeteringTestExtensionManager() ext_mgr = MeteringTestExtensionManager()
test_config['extension_manager'] = ext_mgr super(TestMeteringPlugin, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
super(TestMeteringPlugin, self).setUp(service_plugins=service_plugins) service_plugins=service_plugins)
self.addCleanup(mock.patch.stopall)
self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60' self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60'
@ -92,14 +92,6 @@ class TestMeteringPlugin(test_db_plugin.NeutronDbPluginV2TestCase,
self.topic = 'metering_agent' self.topic = 'metering_agent'
def tearDown(self):
self.uuid_patch.stop()
self.fanout_patch.stop()
self.context_patch.stop()
del test_config['extension_manager']
del test_config['plugin_name_v2']
super(TestMeteringPlugin, self).tearDown()
def test_add_metering_label_rpc_call(self): def test_add_metering_label_rpc_call(self):
second_uuid = 'e27fe2df-376e-4ac7-ae13-92f050a21f84' second_uuid = 'e27fe2df-376e-4ac7-ae13-92f050a21f84'
expected = {'args': {'routers': [{'status': 'ACTIVE', expected = {'args': {'routers': [{'status': 'ACTIVE',
@ -278,18 +270,17 @@ class TestMeteringPluginL3AgentScheduler(
def setUp(self): def setUp(self):
service_plugins = {'metering_plugin_name': DB_METERING_PLUGIN_KLASS} service_plugins = {'metering_plugin_name': DB_METERING_PLUGIN_KLASS}
plugin_str = ('neutron.tests.unit.services.metering.' plugin_str = ('neutron.tests.unit.services.metering.'
'test_metering_plugin.TestRouteIntPlugin') 'test_metering_plugin.TestRouteIntPlugin')
test_config['plugin_name_v2'] = plugin_str
ext_mgr = MeteringTestExtensionManager() ext_mgr = MeteringTestExtensionManager()
test_config['extension_manager'] = ext_mgr
super(TestMeteringPluginL3AgentScheduler, super(TestMeteringPluginL3AgentScheduler,
self).setUp(service_plugins=service_plugins) self).setUp(plugin=plugin_str, ext_mgr=ext_mgr,
service_plugins=service_plugins)
self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60' self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60'
self.addCleanup(mock.patch.stopall)
uuid = 'neutron.openstack.common.uuidutils.generate_uuid' uuid = 'neutron.openstack.common.uuidutils.generate_uuid'
self.uuid_patch = mock.patch(uuid, return_value=self.uuid) self.uuid_patch = mock.patch(uuid, return_value=self.uuid)
self.mock_uuid = self.uuid_patch.start() self.mock_uuid = self.uuid_patch.start()
@ -310,15 +301,6 @@ class TestMeteringPluginL3AgentScheduler(
self.topic = 'metering_agent' self.topic = 'metering_agent'
def tearDown(self):
self.uuid_patch.stop()
self.cast_patch.stop()
self.context_patch.stop()
self.l3routers_patch.stop()
del test_config['extension_manager']
del test_config['plugin_name_v2']
super(TestMeteringPluginL3AgentScheduler, self).tearDown()
def test_add_metering_label_rpc_call(self): def test_add_metering_label_rpc_call(self):
second_uuid = 'e27fe2df-376e-4ac7-ae13-92f050a21f84' second_uuid = 'e27fe2df-376e-4ac7-ae13-92f050a21f84'
expected = {'args': {'routers': [{'status': 'ACTIVE', expected = {'args': {'routers': [{'status': 'ACTIVE',

7
neutron/tests/unit/test_agent_ext_plugin.py
View File

@ -23,7 +23,6 @@ from webob import exc
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common import constants from neutron.common import constants
from neutron.common.test_lib import test_config
from neutron.common import topics from neutron.common import topics
from neutron import context from neutron import context
from neutron.db import agents_db from neutron.db import agents_db
@ -169,8 +168,7 @@ class AgentDBTestCase(AgentDBTestMixIn,
def setUp(self): def setUp(self):
self.adminContext = context.get_admin_context() self.adminContext = context.get_admin_context()
test_config['plugin_name_v2'] = ( plugin = 'neutron.tests.unit.test_agent_ext_plugin.TestAgentPlugin'
'neutron.tests.unit.test_agent_ext_plugin.TestAgentPlugin')
# for these tests we need to enable overlapping ips # for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True) cfg.CONF.set_default('allow_overlapping_ips', True)
# Save the original RESOURCE_ATTRIBUTE_MAP # Save the original RESOURCE_ATTRIBUTE_MAP
@ -178,10 +176,9 @@ class AgentDBTestCase(AgentDBTestMixIn,
for resource, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.iteritems(): for resource, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.iteritems():
self.saved_attr_map[resource] = attrs.copy() self.saved_attr_map[resource] = attrs.copy()
ext_mgr = AgentTestExtensionManager() ext_mgr = AgentTestExtensionManager()
test_config['extension_manager'] = ext_mgr
self.addCleanup(self.restore_resource_attribute_map) self.addCleanup(self.restore_resource_attribute_map)
self.addCleanup(cfg.CONF.reset) self.addCleanup(cfg.CONF.reset)
super(AgentDBTestCase, self).setUp() super(AgentDBTestCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
def restore_resource_attribute_map(self): def restore_resource_attribute_map(self):
# Restore the originak RESOURCE_ATTRIBUTE_MAP # Restore the originak RESOURCE_ATTRIBUTE_MAP

3
neutron/tests/unit/test_db_plugin.py
View File

@ -99,7 +99,7 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase):
self._tenant_id = 'test-tenant' self._tenant_id = 'test-tenant'
if not plugin: if not plugin:
plugin = test_config.get('plugin_name_v2', DB_PLUGIN_KLASS) plugin = DB_PLUGIN_KLASS
# Create the default configurations # Create the default configurations
args = ['--config-file', etcdir('neutron.conf.test')] args = ['--config-file', etcdir('neutron.conf.test')]
@ -152,7 +152,6 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase):
native_sorting_attr_name, False)) native_sorting_attr_name, False))
self._skip_native_sorting = not _is_native_sorting_support() self._skip_native_sorting = not _is_native_sorting_support()
ext_mgr = ext_mgr or test_config.get('extension_manager')
if ext_mgr: if ext_mgr:
self.ext_api = test_extensions.setup_extensions_middleware(ext_mgr) self.ext_api = test_extensions.setup_extensions_middleware(ext_mgr)

16
neutron/tests/unit/test_extension_allowedaddresspairs.py
View File

@ -15,7 +15,6 @@
from neutron.api.v2 import attributes as attr from neutron.api.v2 import attributes as attr
from neutron.common.test_lib import test_config
from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import allowedaddresspairs_db as addr_pair_db
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import portsecurity_db from neutron.db import portsecurity_db
@ -29,8 +28,8 @@ DB_PLUGIN_KLASS = ('neutron.tests.unit.test_extension_allowedaddresspairs.'
class AllowedAddressPairTestCase(test_db_plugin.NeutronDbPluginV2TestCase): class AllowedAddressPairTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self, plugin=None): def setUp(self, plugin=None, ext_mgr=None):
super(AllowedAddressPairTestCase, self).setUp() super(AllowedAddressPairTestCase, self).setUp(plugin)
# Check if a plugin supports security groups # Check if a plugin supports security groups
plugin_obj = NeutronManager.get_plugin() plugin_obj = NeutronManager.get_plugin()
@ -90,13 +89,10 @@ class AllowedAddressPairTestPlugin(portsecurity_db.PortSecurityDbMixin,
class AllowedAddressPairDBTestCase(AllowedAddressPairTestCase): class AllowedAddressPairDBTestCase(AllowedAddressPairTestCase):
def setUp(self, plugin=None): def setUp(self, plugin=None, ext_mgr=None):
test_config['plugin_name_v2'] = DB_PLUGIN_KLASS plugin = plugin or DB_PLUGIN_KLASS
super(AllowedAddressPairDBTestCase, self).setUp() super(AllowedAddressPairDBTestCase,
self).setUp(plugin=plugin, ext_mgr=ext_mgr)
def tearDown(self):
del test_config['plugin_name_v2']
super(AllowedAddressPairDBTestCase, self).tearDown()
class TestAllowedAddressPairs(AllowedAddressPairDBTestCase): class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):

7
neutron/tests/unit/test_extension_ext_net.py
View File

@ -21,7 +21,6 @@ import itertools
import testtools import testtools
from webob import exc from webob import exc
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.extensions import external_net as external_net from neutron.extensions import external_net as external_net
@ -64,11 +63,9 @@ class ExtNetDBTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
fmt, name, admin_state_up, arg_list=arg_list, **new_args) fmt, name, admin_state_up, arg_list=arg_list, **new_args)
def setUp(self): def setUp(self):
test_config['plugin_name_v2'] = ( plugin = 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin'
'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin')
ext_mgr = ExtNetTestExtensionManager() ext_mgr = ExtNetTestExtensionManager()
test_config['extension_manager'] = ext_mgr super(ExtNetDBTestCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
super(ExtNetDBTestCase, self).setUp()
def _set_net_external(self, net_id): def _set_net_external(self, net_id):
self._update('networks', net_id, self._update('networks', net_id,

18
neutron/tests/unit/test_extension_extraroute.py
View File

@ -19,7 +19,6 @@ import contextlib
from oslo.config import cfg from oslo.config import cfg
from webob import exc from webob import exc
from neutron.common.test_lib import test_config
from neutron.db import extraroute_db from neutron.db import extraroute_db
from neutron.extensions import extraroute from neutron.extensions import extraroute
from neutron.extensions import l3 from neutron.extensions import l3
@ -460,20 +459,16 @@ class ExtraRouteDBTestCaseBase(object):
class ExtraRouteDBIntTestCase(test_l3.L3NatDBIntTestCase, class ExtraRouteDBIntTestCase(test_l3.L3NatDBIntTestCase,
ExtraRouteDBTestCaseBase): ExtraRouteDBTestCaseBase):
def setUp(self, plugin=None): def setUp(self, plugin=None, ext_mgr=None):
if not plugin: if not plugin:
plugin = ('neutron.tests.unit.test_extension_extraroute.' plugin = ('neutron.tests.unit.test_extension_extraroute.'
'TestExtraRouteIntPlugin') 'TestExtraRouteIntPlugin')
test_config['plugin_name_v2'] = plugin
# for these tests we need to enable overlapping ips # for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True) cfg.CONF.set_default('allow_overlapping_ips', True)
cfg.CONF.set_default('max_routes', 3) cfg.CONF.set_default('max_routes', 3)
ext_mgr = ExtraRouteTestExtensionManager() ext_mgr = ExtraRouteTestExtensionManager()
test_config['extension_manager'] = ext_mgr super(test_l3.L3BaseForIntTests, self).setUp(plugin=plugin,
# L3NatDBIntTestCase will overwrite plugin_name_v2, ext_mgr=ext_mgr)
# so we don't need to setUp on the class here
super(test_l3.L3BaseForIntTests, self).setUp()
# Set to None to reload the drivers # Set to None to reload the drivers
notifier_api._drivers = None notifier_api._drivers = None
cfg.CONF.set_override("notification_driver", [test_notifier.__name__]) cfg.CONF.set_override("notification_driver", [test_notifier.__name__])
@ -487,8 +482,7 @@ class ExtraRouteDBSepTestCase(test_l3.L3NatDBSepTestCase,
ExtraRouteDBTestCaseBase): ExtraRouteDBTestCaseBase):
def setUp(self): def setUp(self):
# the plugin without L3 support # the plugin without L3 support
test_config['plugin_name_v2'] = ( plugin = 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin'
'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin')
# the L3 service plugin # the L3 service plugin
l3_plugin = ('neutron.tests.unit.test_extension_extraroute.' l3_plugin = ('neutron.tests.unit.test_extension_extraroute.'
'TestExtraRouteL3NatServicePlugin') 'TestExtraRouteL3NatServicePlugin')
@ -498,10 +492,8 @@ class ExtraRouteDBSepTestCase(test_l3.L3NatDBSepTestCase,
cfg.CONF.set_default('allow_overlapping_ips', True) cfg.CONF.set_default('allow_overlapping_ips', True)
cfg.CONF.set_default('max_routes', 3) cfg.CONF.set_default('max_routes', 3)
ext_mgr = ExtraRouteTestExtensionManager() ext_mgr = ExtraRouteTestExtensionManager()
test_config['extension_manager'] = ext_mgr
# L3NatDBSepTestCase will overwrite plugin_name_v2,
# so we don't need to setUp on the class here
super(test_l3.L3BaseForSepTests, self).setUp( super(test_l3.L3BaseForSepTests, self).setUp(
plugin=plugin, ext_mgr=ext_mgr,
service_plugins=service_plugins) service_plugins=service_plugins)
# Set to None to reload the drivers # Set to None to reload the drivers

11
neutron/tests/unit/test_extension_portsecurity.py
View File

@ -15,7 +15,6 @@
from neutron.api.v2 import attributes as attr from neutron.api.v2 import attributes as attr
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import portsecurity_db from neutron.db import portsecurity_db
@ -31,7 +30,7 @@ DB_PLUGIN_KLASS = ('neutron.tests.unit.test_extension_portsecurity.'
class PortSecurityTestCase(test_db_plugin.NeutronDbPluginV2TestCase): class PortSecurityTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self, plugin=None): def setUp(self, plugin=None):
super(PortSecurityTestCase, self).setUp() super(PortSecurityTestCase, self).setUp(plugin)
# Check if a plugin supports security groups # Check if a plugin supports security groups
plugin_obj = NeutronManager.get_plugin() plugin_obj = NeutronManager.get_plugin()
@ -161,12 +160,8 @@ class PortSecurityTestPlugin(db_base_plugin_v2.NeutronDbPluginV2,
class PortSecurityDBTestCase(PortSecurityTestCase): class PortSecurityDBTestCase(PortSecurityTestCase):
def setUp(self, plugin=None): def setUp(self, plugin=None):
test_config['plugin_name_v2'] = plugin or DB_PLUGIN_KLASS plugin = plugin or DB_PLUGIN_KLASS
super(PortSecurityDBTestCase, self).setUp() super(PortSecurityDBTestCase, self).setUp(plugin)
def tearDown(self):
del test_config['plugin_name_v2']
super(PortSecurityDBTestCase, self).tearDown()
class TestPortSecurity(PortSecurityDBTestCase): class TestPortSecurity(PortSecurityDBTestCase):

9
neutron/tests/unit/test_extension_security_group.py
View File

@ -21,7 +21,6 @@ import webob.exc
from neutron.api.v2 import attributes as attr from neutron.api.v2 import attributes as attr
from neutron.common import constants as const from neutron.common import constants as const
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
from neutron.db import securitygroups_db from neutron.db import securitygroups_db
@ -239,11 +238,11 @@ class SecurityGroupTestPlugin(db_base_plugin_v2.NeutronDbPluginV2,
class SecurityGroupDBTestCase(SecurityGroupsTestCase): class SecurityGroupDBTestCase(SecurityGroupsTestCase):
def setUp(self, plugin=None): def setUp(self, plugin=None, ext_mgr=None):
plugin = plugin or DB_PLUGIN_KLASS plugin = plugin or DB_PLUGIN_KLASS
ext_mgr = SecurityGroupTestExtensionManager() ext_mgr = ext_mgr or SecurityGroupTestExtensionManager()
test_config['extension_manager'] = ext_mgr super(SecurityGroupDBTestCase,
super(SecurityGroupDBTestCase, self).setUp(plugin) self).setUp(plugin=plugin, ext_mgr=ext_mgr)
class TestSecurityGroups(SecurityGroupDBTestCase): class TestSecurityGroups(SecurityGroupDBTestCase):

21
neutron/tests/unit/test_l3_plugin.py
View File

@ -31,7 +31,6 @@ from neutron.api.v2 import attributes
from neutron.common import config from neutron.common import config
from neutron.common import constants as l3_constants from neutron.common import constants as l3_constants
from neutron.common import exceptions as q_exc from neutron.common import exceptions as q_exc
from neutron.common.test_lib import test_config
from neutron import context from neutron import context
from neutron.db import api as qdbapi from neutron.db import api as qdbapi
from neutron.db import db_base_plugin_v2 from neutron.db import db_base_plugin_v2
@ -1728,12 +1727,11 @@ class L3AgentDbTestCaseBase(L3NatTestCaseMixin):
class L3BaseForIntTests(test_db_plugin.NeutronDbPluginV2TestCase): class L3BaseForIntTests(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self, plugin=None, ext_mgr=None, service_plugins=None): def setUp(self, plugin=None, ext_mgr=None, service_plugins=None):
test_config['plugin_name_v2'] = ( if not plugin:
'neutron.tests.unit.test_l3_plugin.TestL3NatIntPlugin') plugin = 'neutron.tests.unit.test_l3_plugin.TestL3NatIntPlugin'
# for these tests we need to enable overlapping ips # for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True) cfg.CONF.set_default('allow_overlapping_ips', True)
ext_mgr = ext_mgr or L3TestExtensionManager() ext_mgr = ext_mgr or L3TestExtensionManager()
test_config['extension_manager'] = ext_mgr
super(L3BaseForIntTests, self).setUp(plugin=plugin, ext_mgr=ext_mgr, super(L3BaseForIntTests, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
service_plugins=service_plugins) service_plugins=service_plugins)
@ -1743,16 +1741,15 @@ class L3BaseForIntTests(test_db_plugin.NeutronDbPluginV2TestCase):
def tearDown(self): def tearDown(self):
test_notifier.NOTIFICATIONS = [] test_notifier.NOTIFICATIONS = []
del test_config['extension_manager']
super(L3BaseForIntTests, self).tearDown() super(L3BaseForIntTests, self).tearDown()
class L3BaseForSepTests(test_db_plugin.NeutronDbPluginV2TestCase): class L3BaseForSepTests(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self): def setUp(self, plugin=None, ext_mgr=None):
# the plugin without L3 support # the plugin without L3 support
test_config['plugin_name_v2'] = ( if not plugin:
'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin') plugin = 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin'
# the L3 service plugin # the L3 service plugin
l3_plugin = ('neutron.tests.unit.test_l3_plugin.' l3_plugin = ('neutron.tests.unit.test_l3_plugin.'
'TestL3NatServicePlugin') 'TestL3NatServicePlugin')
@ -1760,9 +1757,10 @@ class L3BaseForSepTests(test_db_plugin.NeutronDbPluginV2TestCase):
# for these tests we need to enable overlapping ips # for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True) cfg.CONF.set_default('allow_overlapping_ips', True)
ext_mgr = L3TestExtensionManager() if not ext_mgr:
test_config['extension_manager'] = ext_mgr ext_mgr = L3TestExtensionManager()
super(L3BaseForSepTests, self).setUp(service_plugins=service_plugins) super(L3BaseForSepTests, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
service_plugins=service_plugins)
# Set to None to reload the drivers # Set to None to reload the drivers
notifier_api._drivers = None notifier_api._drivers = None
@ -1770,7 +1768,6 @@ class L3BaseForSepTests(test_db_plugin.NeutronDbPluginV2TestCase):
def tearDown(self): def tearDown(self):
test_notifier.NOTIFICATIONS = [] test_notifier.NOTIFICATIONS = []
del test_config['extension_manager']
super(L3BaseForSepTests, self).tearDown() super(L3BaseForSepTests, self).tearDown()

8
neutron/tests/unit/test_l3_schedulers.py
View File

@ -24,7 +24,6 @@ from oslo.config import cfg
from neutron.api.v2 import attributes as attr from neutron.api.v2 import attributes as attr
from neutron.common import constants from neutron.common import constants
from neutron.common.test_lib import test_config
from neutron.common import topics from neutron.common import topics
from neutron import context as q_context from neutron import context as q_context
from neutron.db import agents_db from neutron.db import agents_db
@ -78,12 +77,9 @@ class L3SchedulerTestCase(l3_agentschedulers_db.L3AgentSchedulerDbMixin,
test_l3_plugin.L3NatTestCaseMixin): test_l3_plugin.L3NatTestCaseMixin):
def setUp(self): def setUp(self):
test_config['plugin_name_v2'] = DB_PLUGIN_KLASS
ext_mgr = L3SchedulerTestExtensionManager() ext_mgr = L3SchedulerTestExtensionManager()
test_config['extension_manager'] = ext_mgr super(L3SchedulerTestCase, self).setUp(plugin=DB_PLUGIN_KLASS,
ext_mgr=ext_mgr)
super(L3SchedulerTestCase, self).setUp()
self.adminContext = q_context.get_admin_context() self.adminContext = q_context.get_admin_context()
self.plugin = manager.NeutronManager.get_plugin() self.plugin = manager.NeutronManager.get_plugin()

9
neutron/tests/unit/test_neutron_manager.py
View File

@ -23,7 +23,6 @@ import fixtures
from oslo.config import cfg from oslo.config import cfg
from neutron.common import config from neutron.common import config
from neutron.common.test_lib import test_config
from neutron.manager import NeutronManager from neutron.manager import NeutronManager
from neutron.manager import validate_post_plugin_load from neutron.manager import validate_post_plugin_load
from neutron.manager import validate_pre_plugin_load from neutron.manager import validate_pre_plugin_load
@ -65,9 +64,7 @@ class NeutronManagerTestCase(base.BaseTestCase):
fixtures.MonkeyPatch('neutron.manager.NeutronManager._instance')) fixtures.MonkeyPatch('neutron.manager.NeutronManager._instance'))
def test_service_plugin_is_loaded(self): def test_service_plugin_is_loaded(self):
cfg.CONF.set_override("core_plugin", cfg.CONF.set_override("core_plugin", DB_PLUGIN_KLASS)
test_config.get('plugin_name_v2',
DB_PLUGIN_KLASS))
cfg.CONF.set_override("service_plugins", cfg.CONF.set_override("service_plugins",
["neutron.tests.unit.dummy_plugin." ["neutron.tests.unit.dummy_plugin."
"DummyServicePlugin"]) "DummyServicePlugin"])
@ -85,9 +82,7 @@ class NeutronManagerTestCase(base.BaseTestCase):
"DummyServicePlugin", "DummyServicePlugin",
"neutron.tests.unit.dummy_plugin." "neutron.tests.unit.dummy_plugin."
"DummyServicePlugin"]) "DummyServicePlugin"])
cfg.CONF.set_override("core_plugin", cfg.CONF.set_override("core_plugin", DB_PLUGIN_KLASS)
test_config.get('plugin_name_v2',
DB_PLUGIN_KLASS))
self.assertRaises(ValueError, NeutronManager.get_instance) self.assertRaises(ValueError, NeutronManager.get_instance)
def test_service_plugin_conflicts_with_core_plugin(self): def test_service_plugin_conflicts_with_core_plugin(self):