openstack/neutron
Code Issues Proposed changes

Make test service_plugins override simple

Browse Source 
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
This commit is contained in:
LIU Yulong 2018-12-17 10:35:33 +08:00
parent eeb06ce54d
commit 76c2881201
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron/tests/unit/db/test_db_base_plugin_v2.py
View File

@ -131,11 +131,15 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase):
'DhcpAgentNotifyAPI').start() 'DhcpAgentNotifyAPI').start()
# Update the plugin # Update the plugin
self.setup_coreplugin(plugin, load_plugins=False) self.setup_coreplugin(plugin, load_plugins=False)
cfg.CONF.set_override( if isinstance(service_plugins, (list, tuple)):
'service_plugins', # Sometimes we needs these test service_plugins to be ordered.
[test_lib.test_config.get(key, default) cfg.CONF.set_override('service_plugins', service_plugins)
for key, default in (service_plugins or {}).items()] 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('base_mac', "12:34:56:78:00:00")
cfg.CONF.set_override('max_dns_nameservers', 2) cfg.CONF.set_override('max_dns_nameservers', 2)