diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index 1584b7e1208..2d1d885d50b 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -140,6 +140,9 @@ class NeutronDbPluginV2(db_base_plugin_common.DbBasePluginCommon, __native_pagination_support = True __native_sorting_support = True + def has_native_datastore(self): + return True + def __new__(cls, *args, **kwargs): model_query.register_hook( models_v2.Port, diff --git a/neutron/manager.py b/neutron/manager.py index 614ea92de3f..3b2ce67b4a2 100644 --- a/neutron/manager.py +++ b/neutron/manager.py @@ -179,7 +179,11 @@ class NeutronManager(object): def _get_default_service_plugins(self): """Get default service plugins to be loaded.""" - return constants.DEFAULT_SERVICE_PLUGINS.keys() + core_plugin = directory.get_plugin() + if core_plugin.has_native_datastore(): + return constants.DEFAULT_SERVICE_PLUGINS.keys() + else: + return [] def _load_service_plugins(self): """Loads service plugins. diff --git a/neutron/neutron_plugin_base_v2.py b/neutron/neutron_plugin_base_v2.py index 58cd83cdffe..6afce91d031 100644 --- a/neutron/neutron_plugin_base_v2.py +++ b/neutron/neutron_plugin_base_v2.py @@ -410,3 +410,10 @@ class NeutronPluginBaseV2(base_services.WorkerBase): """ return (self.__class__.start_rpc_state_reports_listener != NeutronPluginBaseV2.start_rpc_state_reports_listener) + + def has_native_datastore(self): + """Return True if the plugin uses Neutron's native datastore. + + .. note:: plugins like ML2 should override this method and return True. + """ + return False