Make test service_plugins override simple
Just make things simple and give a chance to accept that
ordered 'service_plugins' list or tuple for the base test
class NeutronDbPluginV2TestCase.
Change-Id: I7c352ede811703e3a96848378b92cbbf5e109228
Related-Bug: #1809238
(cherry picked from commit 76c2881201
)
This commit is contained in:
parent
ef8ecef922
commit
21bbe03619
|
@ -128,11 +128,15 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase):
|
|||
'DhcpAgentNotifyAPI').start()
|
||||
# Update the plugin
|
||||
self.setup_coreplugin(plugin, load_plugins=False)
|
||||
cfg.CONF.set_override(
|
||||
'service_plugins',
|
||||
[test_lib.test_config.get(key, default)
|
||||
for key, default in (service_plugins or {}).items()]
|
||||
)
|
||||
if isinstance(service_plugins, (list, tuple)):
|
||||
# Sometimes we needs these test service_plugins to be ordered.
|
||||
cfg.CONF.set_override('service_plugins', service_plugins)
|
||||
else:
|
||||
cfg.CONF.set_override(
|
||||
'service_plugins',
|
||||
[test_lib.test_config.get(key, default)
|
||||
for key, default in (service_plugins or {}).items()]
|
||||
)
|
||||
|
||||
cfg.CONF.set_override('base_mac', "12:34:56:78:00:00")
|
||||
cfg.CONF.set_override('max_dns_nameservers', 2)
|
||||
|
|
Loading…
Reference in New Issue