Merge "use stevedore to load extensions"

2 files changed, 24 insertions, 16 deletions

diff --git a/novaclient/client.py b/novaclient/client.py
index 4b3e2281..6c15f04d 100644
--- a/novaclient/client.py
+++ b/novaclient/client.py
@@ -28,7 +28,7 @@ from keystoneauth1 import adapter
 from keystoneauth1 import identity
 from keystoneauth1 import session as ksession
 from oslo_utils import importutils
-import pkg_resources
+import stevedore
 
 import novaclient
 from novaclient import api_versions
@@ -176,12 +176,15 @@ def _discover_via_python_path():
             yield name, module
 
 
-def _discover_via_entry_points():
-    for ep in pkg_resources.iter_entry_points('novaclient.extension'):
-        name = ep.name
-        module = ep.load()
+def _make_discovery_manager():
+    # This function provides a place to mock out the entry point scan
+    return stevedore.ExtensionManager('novaclient.extension')
+
 
-        yield name, module
+def _discover_via_entry_points():
+    mgr = _make_discovery_manager()
+    for extension in mgr:
+        yield extension.name, extension.plugin
 
 
 def _get_client_class_and_version(version):
diff --git a/novaclient/tests/unit/test_discover.py b/novaclient/tests/unit/test_discover.py
index 9bbbe391..d5fa5400 100644
--- a/novaclient/tests/unit/test_discover.py
+++ b/novaclient/tests/unit/test_discover.py
@@ -17,7 +17,8 @@ import imp
 import inspect
 from unittest import mock
 
-import pkg_resources
+import stevedore
+from stevedore import extension
 
 from novaclient import client
 from novaclient.tests.unit import utils
@@ -27,16 +28,20 @@ class DiscoverTest(utils.TestCase):
 
     def test_discover_via_entry_points(self):
 
-        def mock_iter_entry_points(group):
-            if group == 'novaclient.extension':
-                fake_ep = mock.Mock()
-                fake_ep.name = 'foo'
-                fake_ep.module = imp.new_module('foo')
-                fake_ep.load.return_value = fake_ep.module
-                return [fake_ep]
+        def mock_mgr():
+            fake_ep = mock.Mock()
+            fake_ep.name = 'foo'
+            fake_ep.module = imp.new_module('foo')
+            fake_ep.load.return_value = fake_ep.module
+            fake_ext = extension.Extension(
+                name='foo',
+                entry_point=fake_ep,
+                plugin=fake_ep.module,
+                obj=None,
+            )
+            return stevedore.ExtensionManager.make_test_instance([fake_ext])
 
-        @mock.patch.object(pkg_resources, 'iter_entry_points',
-                           mock_iter_entry_points)
+        @mock.patch.object(client, '_make_discovery_manager', mock_mgr)
         def test():
             for name, module in client._discover_via_entry_points():
                 self.assertEqual('foo', name)