openstack/ironic
Code Issues Proposed changes

Merge "Use NamedExtensionManager for drivers"

Browse Source
This commit is contained in:
Zuul 2017-12-19 03:18:52 +00:00 committed by Gerrit Code Review
commit 77246085af
2 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ironic/common/driver_factory.py
View File

@ -17,7 +17,7 @@ import collections
from oslo_concurrency import lockutils from oslo_concurrency import lockutils
from oslo_log import log from oslo_log import log
from stevedore import dispatch from stevedore import named
from ironic.common import exception from ironic.common import exception
from ironic.common.i18n import _ from ironic.common.i18n import _
@ -495,31 +495,23 @@ class BaseDriverFactory(object):
raise exception.DriverLoadError(driver=ep.name, reason=exc) raise exception.DriverLoadError(driver=ep.name, reason=exc)
raise exc raise exc
def _check_func(ext): def missing_callback(names):
return ext.name in cls._enabled_driver_list
cls._extension_manager = (
dispatch.NameDispatchExtensionManager(
cls._entrypoint_name,
_check_func,
invoke_on_load=True,
on_load_failure_callback=_catch_driver_not_found,
propagate_map_exceptions=True))
# NOTE(deva): if we were unable to load any configured driver, perhaps
# because it is not present on the system, raise an error.
if (sorted(cls._enabled_driver_list) !=
sorted(cls._extension_manager.names())):
found = cls._extension_manager.names()
names = [n for n in cls._enabled_driver_list if n not in found]
# just in case more than one could not be found ...
names = ', '.join(names) names = ', '.join(names)
raise exception.DriverNotFoundInEntrypoint( raise exception.DriverNotFoundInEntrypoint(
names=names, entrypoint=cls._entrypoint_name) names=names, entrypoint=cls._entrypoint_name)
cls._extension_manager = (
named.NamedExtensionManager(
cls._entrypoint_name,
cls._enabled_driver_list,
invoke_on_load=True,
on_load_failure_callback=_catch_driver_not_found,
propagate_map_exceptions=True,
on_missing_entrypoints_callback=missing_callback))
# warn for any untested/unsupported/deprecated drivers or interfaces # warn for any untested/unsupported/deprecated drivers or interfaces
cls._extension_manager.map(cls._extension_manager.names(), if cls._enabled_driver_list:
_warn_if_unsupported) cls._extension_manager.map(_warn_if_unsupported)
LOG.info(cls._logging_template, cls._extension_manager.names()) LOG.info(cls._logging_template, cls._extension_manager.names())

12
ironic/tests/unit/common/test_driver_factory.py
View File

@ -14,7 +14,7 @@
import mock import mock
from oslo_utils import uuidutils from oslo_utils import uuidutils
from stevedore import dispatch from stevedore import named
from ironic.common import driver_factory from ironic.common import driver_factory
from ironic.common import exception from ironic.common import exception
@ -45,7 +45,7 @@ class DriverLoadTestCase(db_base.DbTestCase):
def test_driver_load_error_if_driver_enabled(self): def test_driver_load_error_if_driver_enabled(self):
self.config(enabled_drivers=['fake']) self.config(enabled_drivers=['fake'])
with mock.patch.object(dispatch.NameDispatchExtensionManager, with mock.patch.object(named.NamedExtensionManager,
'__init__', self._fake_init_driver_err): '__init__', self._fake_init_driver_err):
self.assertRaises( self.assertRaises(
exception.DriverLoadError, exception.DriverLoadError,
@ -53,20 +53,20 @@ class DriverLoadTestCase(db_base.DbTestCase):
def test_wrap_in_driver_load_error_if_driver_enabled(self): def test_wrap_in_driver_load_error_if_driver_enabled(self):
self.config(enabled_drivers=['fake']) self.config(enabled_drivers=['fake'])
with mock.patch.object(dispatch.NameDispatchExtensionManager, with mock.patch.object(named.NamedExtensionManager,
'__init__', self._fake_init_name_err): '__init__', self._fake_init_name_err):
self.assertRaises( self.assertRaises(
exception.DriverLoadError, exception.DriverLoadError,
driver_factory.DriverFactory._init_extension_manager) driver_factory.DriverFactory._init_extension_manager)
@mock.patch.object(dispatch.NameDispatchExtensionManager, 'names', @mock.patch.object(named.NamedExtensionManager, 'names',
autospec=True) autospec=True)
def test_no_driver_load_error_if_driver_disabled(self, mock_em): def test_no_driver_load_error_if_driver_disabled(self, mock_em):
self.config(enabled_drivers=[]) self.config(enabled_drivers=[])
with mock.patch.object(dispatch.NameDispatchExtensionManager, with mock.patch.object(named.NamedExtensionManager,
'__init__', self._fake_init_driver_err): '__init__', self._fake_init_driver_err):
driver_factory.DriverFactory._init_extension_manager() driver_factory.DriverFactory._init_extension_manager()
self.assertEqual(3, mock_em.call_count) self.assertEqual(1, mock_em.call_count)
@mock.patch.object(driver_factory.LOG, 'warning', autospec=True) @mock.patch.object(driver_factory.LOG, 'warning', autospec=True)
def test_driver_duplicated_entry(self, mock_log): def test_driver_duplicated_entry(self, mock_log):