# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# 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
# a plugin-specific testing mechanism should import this dictionary
# and override the values in it if needed (e.g., run_tests.py in
# neutron/plugins/openvswitch/ )
-test_config = {
- "plugin_name": "",
- "default_net_op_status": constants.NET_STATUS_ACTIVE,
- "default_port_op_status": constants.PORT_STATUS_ACTIVE,
-}
+test_config = {}
import contextlib
import copy
-import os
from mock import patch
from oslo.config import cfg
from neutron import context
from neutron.extensions import l3
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.plugins.bigswitch.extensions import routerrule
from neutron.tests.unit.bigswitch import fake_server
_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):
def get_resources(self):
def setUp(self):
self.setup_patches()
- test_l3_plugin.L3NatDBIntTestCase.setUp = new_L3_setUp
- super(RouterDBTestCase, self).setUp()
+ self.setup_config_files()
+ 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()
def tearDown(self):
super(RouterDBTestCase, self).tearDown()
- del test_config['plugin_name_v2']
del test_config['config_files']
- test_l3_plugin.L3NatDBIntTestCase.setUp = origSetUp
def test_router_remove_router_interface_wrong_subnet_returns_400(self):
with self.router() as r:
from neutron.api import extensions as neutron_extensions
from neutron.api.v2 import attributes
-from neutron.common.test_lib import test_config
from neutron import context
import neutron.db.api as db
from neutron.plugins.cisco.db import n1kv_db_v2
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__)
self.addCleanup(cfg.CONF.reset)
ext_mgr = NetworkProfileTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
- self.addCleanup(self.restore_test_config)
# Save the original RESOURCE_ATTRIBUTE_MAP
self.saved_attr_map = {}
n1kv_profile.EXTENDED_ATTRIBUTES_2_0["ports"])
self.addCleanup(self.restore_resource_attribute_map)
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.
self._make_test_profile()
self._make_test_policy_profile()
# Restore the original RESOURCE_ATTRIBUTE_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):
self._make_network('json',
'some_net',
'port_added': added, 'port_removed': removed}
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._set_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.ofc = fake_ofc_manager.patch_ofc_manager()
import webob.exc
from neutron.api.v2 import attributes
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.plugins.nec.common import exceptions as nexc
from neutron.plugins.nec.extensions import packetfilter
_nec_ini = NEC_PLUGIN_PF_INI
def setUp(self):
- test_config['extension_manager'] = PacketfilterExtensionManager()
- super(TestNecPluginPacketFilter, self).setUp()
+ ext_mgr = PacketfilterExtensionManager()
+ super(TestNecPluginPacketFilter, self).setUp(ext_mgr=ext_mgr)
def _create_packet_filter(self, fmt, net_id, expected_res_status=None,
arg_list=None, **kwargs):
plugin_str = PLUGIN_NAME
def setUp(self):
- test_config['plugin_name_v2'] = PLUGIN_NAME
test_config['config_files'] = [get_fake_conf('nsx.ini.full.test')]
# mock nvp api client
def setUp(self):
self.adminContext = context.get_admin_context()
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)
# Save the original RESOURCE_ATTRIBUTE_MAP
self.saved_attr_map = {}
for resource, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.iteritems():
self.saved_attr_map[resource] = attrs.copy()
ext_mgr = MacLearningExtensionManager()
- test_config['extension_manager'] = ext_mgr
# mock nvp api client
self.fc = fake_nvpapiclient.FakeClient(STUBS_PATH)
self.mock_nvpapi = mock.patch(NVPAPI_NAME, autospec=True)
self.addCleanup(patch_sync.stop)
self.addCleanup(self.restore_resource_attribute_map)
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):
# Restore the original RESOURCE_ATTRIBUTE_MAP
from neutron.api.extensions import PluginAwareExtensionManager
from neutron.api.v2 import attributes
from neutron.common import config
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.db import api as db_api
from neutron.db import db_base_plugin_v2
class NetworkGatewayDbTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
"""Unit tests for Network Gateway DB support."""
- def setUp(self):
- test_config['plugin_name_v2'] = '%s.%s' % (
- __name__, TestNetworkGatewayPlugin.__name__)
- ext_mgr = TestExtensionManager()
- test_config['extension_manager'] = ext_mgr
+ def setUp(self, plugin=None, ext_mgr=None):
+ if not plugin:
+ plugin = '%s.%s' % (__name__, TestNetworkGatewayPlugin.__name__)
+ if not ext_mgr:
+ ext_mgr = TestExtensionManager()
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,
devices=None, arg_list=None, **kwargs):
self.mock_instance.return_value.get_nvp_version.return_value = (
NVPVersion("2.9"))
self.mock_instance.return_value.request.side_effect = _fake_request
- plugin = plugin or PLUGIN_NAME
super(NiciraPluginV2TestCase, self).setUp(plugin=plugin,
ext_mgr=ext_mgr)
cfg.CONF.set_override('metadata_mode', None, 'NSX')
pass
-class TestNiciraAllowedAddressPairs(test_addr_pair.TestAllowedAddressPairs,
- NiciraPluginV2TestCase):
+class TestNiciraAllowedAddressPairs(NiciraPluginV2TestCase,
+ test_addr_pair.TestAllowedAddressPairs):
pass
def _restore_l3_attribute_map(self):
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 = {}
for item in l3.RESOURCE_ATTRIBUTE_MAP:
self._l3_attribute_map_bk[item] = (
def setUp(self):
ext_mgr = test_l3_plugin.L3TestExtensionManager()
- test_lib.test_config['extension_manager'] = ext_mgr
- super(NiciraNeutronNVPOutOfSync, self).setUp()
+ super(NiciraNeutronNVPOutOfSync, self).setUp(ext_mgr=ext_mgr)
def test_delete_network_not_in_nvp(self):
res = self._create_network('json', 'net1', True)
constants.NET_STATUS_ERROR)
-class TestNiciraNetworkGateway(test_l2_gw.NetworkGatewayDbTestCase,
- NiciraPluginV2TestCase):
+class TestNiciraNetworkGateway(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)
- super(TestNiciraNetworkGateway, self).setUp()
+ super(TestNiciraNetworkGateway,
+ self).setUp(plugin=plugin, ext_mgr=ext_mgr)
def test_create_network_gateway_name_exceeds_40_chars(self):
name = 'this_is_a_gateway_whose_name_is_longer_than_40_chars'
import mock
from neutron.api.v2 import attributes as attr
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.db import agents_db
from neutron.db import l3_agentschedulers_db
def setUp(self):
service_plugins = {'metering_plugin_name': DB_METERING_PLUGIN_KLASS}
- test_config['plugin_name_v2'] = ('neutron.tests.unit.test_l3_plugin.'
- 'TestL3NatIntPlugin')
+ plugin = 'neutron.tests.unit.test_l3_plugin.TestL3NatIntPlugin'
ext_mgr = MeteringTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
- super(TestMeteringPlugin, self).setUp(service_plugins=service_plugins)
+ super(TestMeteringPlugin, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
+ service_plugins=service_plugins)
+
+ self.addCleanup(mock.patch.stopall)
self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60'
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):
second_uuid = 'e27fe2df-376e-4ac7-ae13-92f050a21f84'
expected = {'args': {'routers': [{'status': 'ACTIVE',
def setUp(self):
service_plugins = {'metering_plugin_name': DB_METERING_PLUGIN_KLASS}
-
plugin_str = ('neutron.tests.unit.services.metering.'
'test_metering_plugin.TestRouteIntPlugin')
- test_config['plugin_name_v2'] = plugin_str
-
ext_mgr = MeteringTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
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.addCleanup(mock.patch.stopall)
+
uuid = 'neutron.openstack.common.uuidutils.generate_uuid'
self.uuid_patch = mock.patch(uuid, return_value=self.uuid)
self.mock_uuid = self.uuid_patch.start()
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):
second_uuid = 'e27fe2df-376e-4ac7-ae13-92f050a21f84'
expected = {'args': {'routers': [{'status': 'ACTIVE',
from neutron.api.v2 import attributes
from neutron.common import constants
-from neutron.common.test_lib import test_config
from neutron.common import topics
from neutron import context
from neutron.db import agents_db
def setUp(self):
self.adminContext = context.get_admin_context()
- test_config['plugin_name_v2'] = (
- 'neutron.tests.unit.test_agent_ext_plugin.TestAgentPlugin')
+ plugin = 'neutron.tests.unit.test_agent_ext_plugin.TestAgentPlugin'
# for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True)
# Save the original RESOURCE_ATTRIBUTE_MAP
for resource, attrs in attributes.RESOURCE_ATTRIBUTE_MAP.iteritems():
self.saved_attr_map[resource] = attrs.copy()
ext_mgr = AgentTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
self.addCleanup(self.restore_resource_attribute_map)
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):
# Restore the originak RESOURCE_ATTRIBUTE_MAP
self._tenant_id = 'test-tenant'
if not plugin:
- plugin = test_config.get('plugin_name_v2', DB_PLUGIN_KLASS)
+ plugin = DB_PLUGIN_KLASS
# Create the default configurations
args = ['--config-file', etcdir('neutron.conf.test')]
native_sorting_attr_name, False))
self._skip_native_sorting = not _is_native_sorting_support()
- ext_mgr = ext_mgr or test_config.get('extension_manager')
if ext_mgr:
self.ext_api = test_extensions.setup_extensions_middleware(ext_mgr)
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 db_base_plugin_v2
from neutron.db import portsecurity_db
class AllowedAddressPairTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
- def setUp(self, plugin=None):
- super(AllowedAddressPairTestCase, self).setUp()
+ def setUp(self, plugin=None, ext_mgr=None):
+ super(AllowedAddressPairTestCase, self).setUp(plugin)
# Check if a plugin supports security groups
plugin_obj = NeutronManager.get_plugin()
class AllowedAddressPairDBTestCase(AllowedAddressPairTestCase):
- def setUp(self, plugin=None):
- test_config['plugin_name_v2'] = DB_PLUGIN_KLASS
- super(AllowedAddressPairDBTestCase, self).setUp()
-
- def tearDown(self):
- del test_config['plugin_name_v2']
- super(AllowedAddressPairDBTestCase, self).tearDown()
+ def setUp(self, plugin=None, ext_mgr=None):
+ plugin = plugin or DB_PLUGIN_KLASS
+ super(AllowedAddressPairDBTestCase,
+ self).setUp(plugin=plugin, ext_mgr=ext_mgr)
class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):
import testtools
from webob import exc
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.db import models_v2
from neutron.extensions import external_net as external_net
fmt, name, admin_state_up, arg_list=arg_list, **new_args)
def setUp(self):
- test_config['plugin_name_v2'] = (
- 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin')
+ plugin = 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin'
ext_mgr = ExtNetTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
- super(ExtNetDBTestCase, self).setUp()
+ super(ExtNetDBTestCase, self).setUp(plugin=plugin, ext_mgr=ext_mgr)
def _set_net_external(self, net_id):
self._update('networks', net_id,
from oslo.config import cfg
from webob import exc
-from neutron.common.test_lib import test_config
from neutron.db import extraroute_db
from neutron.extensions import extraroute
from neutron.extensions import l3
class ExtraRouteDBIntTestCase(test_l3.L3NatDBIntTestCase,
ExtraRouteDBTestCaseBase):
- def setUp(self, plugin=None):
+ def setUp(self, plugin=None, ext_mgr=None):
if not plugin:
plugin = ('neutron.tests.unit.test_extension_extraroute.'
'TestExtraRouteIntPlugin')
- test_config['plugin_name_v2'] = plugin
# for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True)
cfg.CONF.set_default('max_routes', 3)
ext_mgr = ExtraRouteTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
- # L3NatDBIntTestCase will overwrite plugin_name_v2,
- # so we don't need to setUp on the class here
- super(test_l3.L3BaseForIntTests, self).setUp()
-
+ super(test_l3.L3BaseForIntTests, self).setUp(plugin=plugin,
+ ext_mgr=ext_mgr)
# Set to None to reload the drivers
notifier_api._drivers = None
cfg.CONF.set_override("notification_driver", [test_notifier.__name__])
ExtraRouteDBTestCaseBase):
def setUp(self):
# the plugin without L3 support
- test_config['plugin_name_v2'] = (
- 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin')
+ plugin = 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin'
# the L3 service plugin
l3_plugin = ('neutron.tests.unit.test_extension_extraroute.'
'TestExtraRouteL3NatServicePlugin')
cfg.CONF.set_default('allow_overlapping_ips', True)
cfg.CONF.set_default('max_routes', 3)
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(
+ plugin=plugin, ext_mgr=ext_mgr,
service_plugins=service_plugins)
# Set to None to reload the drivers
from neutron.api.v2 import attributes as attr
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.db import db_base_plugin_v2
from neutron.db import portsecurity_db
class PortSecurityTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self, plugin=None):
- super(PortSecurityTestCase, self).setUp()
+ super(PortSecurityTestCase, self).setUp(plugin)
# Check if a plugin supports security groups
plugin_obj = NeutronManager.get_plugin()
class PortSecurityDBTestCase(PortSecurityTestCase):
def setUp(self, plugin=None):
- test_config['plugin_name_v2'] = plugin or DB_PLUGIN_KLASS
- super(PortSecurityDBTestCase, self).setUp()
-
- def tearDown(self):
- del test_config['plugin_name_v2']
- super(PortSecurityDBTestCase, self).tearDown()
+ plugin = plugin or DB_PLUGIN_KLASS
+ super(PortSecurityDBTestCase, self).setUp(plugin)
class TestPortSecurity(PortSecurityDBTestCase):
from neutron.api.v2 import attributes as attr
from neutron.common import constants as const
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.db import db_base_plugin_v2
from neutron.db import securitygroups_db
class SecurityGroupDBTestCase(SecurityGroupsTestCase):
- def setUp(self, plugin=None):
+ def setUp(self, plugin=None, ext_mgr=None):
plugin = plugin or DB_PLUGIN_KLASS
- ext_mgr = SecurityGroupTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
- super(SecurityGroupDBTestCase, self).setUp(plugin)
+ ext_mgr = ext_mgr or SecurityGroupTestExtensionManager()
+ super(SecurityGroupDBTestCase,
+ self).setUp(plugin=plugin, ext_mgr=ext_mgr)
class TestSecurityGroups(SecurityGroupDBTestCase):
from neutron.common import config
from neutron.common import constants as l3_constants
from neutron.common import exceptions as q_exc
-from neutron.common.test_lib import test_config
from neutron import context
from neutron.db import api as qdbapi
from neutron.db import db_base_plugin_v2
class L3BaseForIntTests(test_db_plugin.NeutronDbPluginV2TestCase):
def setUp(self, plugin=None, ext_mgr=None, service_plugins=None):
- test_config['plugin_name_v2'] = (
- 'neutron.tests.unit.test_l3_plugin.TestL3NatIntPlugin')
+ if not plugin:
+ plugin = 'neutron.tests.unit.test_l3_plugin.TestL3NatIntPlugin'
# for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True)
ext_mgr = ext_mgr or L3TestExtensionManager()
- test_config['extension_manager'] = ext_mgr
super(L3BaseForIntTests, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
service_plugins=service_plugins)
def tearDown(self):
test_notifier.NOTIFICATIONS = []
- del test_config['extension_manager']
super(L3BaseForIntTests, self).tearDown()
class L3BaseForSepTests(test_db_plugin.NeutronDbPluginV2TestCase):
- def setUp(self):
+ def setUp(self, plugin=None, ext_mgr=None):
# the plugin without L3 support
- test_config['plugin_name_v2'] = (
- 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin')
+ if not plugin:
+ plugin = 'neutron.tests.unit.test_l3_plugin.TestNoL3NatPlugin'
# the L3 service plugin
l3_plugin = ('neutron.tests.unit.test_l3_plugin.'
'TestL3NatServicePlugin')
# for these tests we need to enable overlapping ips
cfg.CONF.set_default('allow_overlapping_ips', True)
- ext_mgr = L3TestExtensionManager()
- test_config['extension_manager'] = ext_mgr
- super(L3BaseForSepTests, self).setUp(service_plugins=service_plugins)
+ if not ext_mgr:
+ ext_mgr = L3TestExtensionManager()
+ super(L3BaseForSepTests, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
+ service_plugins=service_plugins)
# Set to None to reload the drivers
notifier_api._drivers = None
def tearDown(self):
test_notifier.NOTIFICATIONS = []
- del test_config['extension_manager']
super(L3BaseForSepTests, self).tearDown()
from neutron.api.v2 import attributes as attr
from neutron.common import constants
-from neutron.common.test_lib import test_config
from neutron.common import topics
from neutron import context as q_context
from neutron.db import agents_db
test_l3_plugin.L3NatTestCaseMixin):
def setUp(self):
- test_config['plugin_name_v2'] = DB_PLUGIN_KLASS
-
ext_mgr = L3SchedulerTestExtensionManager()
- test_config['extension_manager'] = ext_mgr
-
- super(L3SchedulerTestCase, self).setUp()
+ super(L3SchedulerTestCase, self).setUp(plugin=DB_PLUGIN_KLASS,
+ ext_mgr=ext_mgr)
self.adminContext = q_context.get_admin_context()
self.plugin = manager.NeutronManager.get_plugin()
from oslo.config import cfg
from neutron.common import config
-from neutron.common.test_lib import test_config
from neutron.manager import NeutronManager
from neutron.manager import validate_post_plugin_load
from neutron.manager import validate_pre_plugin_load
fixtures.MonkeyPatch('neutron.manager.NeutronManager._instance'))
def test_service_plugin_is_loaded(self):
- cfg.CONF.set_override("core_plugin",
- test_config.get('plugin_name_v2',
- DB_PLUGIN_KLASS))
+ cfg.CONF.set_override("core_plugin", DB_PLUGIN_KLASS)
cfg.CONF.set_override("service_plugins",
["neutron.tests.unit.dummy_plugin."
"DummyServicePlugin"])
"DummyServicePlugin",
"neutron.tests.unit.dummy_plugin."
"DummyServicePlugin"])
- cfg.CONF.set_override("core_plugin",
- test_config.get('plugin_name_v2',
- DB_PLUGIN_KLASS))
+ cfg.CONF.set_override("core_plugin", DB_PLUGIN_KLASS)
self.assertRaises(ValueError, NeutronManager.get_instance)
def test_service_plugin_conflicts_with_core_plugin(self):
Code Review / openstack-build / neutron-build.git / commitdiff