openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Add a way to discover only contrib extensions"

This commit is contained in:
Jenkins 2016-03-01 00:48:38 +00:00 committed by Gerrit Code Review
parent 66b4085c9e c18ccb1bfa
commit eb461f082b
2 changed files with 67 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
novaclient/client.py
View File

@ -727,19 +727,24 @@ def _construct_http_client(username=None, password=None, project_id=None,
api_version=api_version)
def discover_extensions(version):
def discover_extensions(version, only_contrib=False):
"""Returns the list of extensions, which can be discovered by python path,
contrib path and by entry-point 'novaclient.extension'.
:param version: api version
:type version: str or novaclient.api_versions.APIVersion
:param only_contrib: search only in contrib directory or not
:type only_contrib: bool
"""
if not isinstance(version, api_versions.APIVersion):
version = api_versions.get_api_version(version)
extensions = []
for name, module in itertools.chain(
_discover_via_python_path(),
_discover_via_contrib_path(version),
_discover_via_entry_points()):
extension = ext.Extension(name, module)
extensions.append(extension)
return extensions
if only_contrib:
chain = _discover_via_contrib_path(version)
else:
chain = itertools.chain(_discover_via_python_path(),
_discover_via_contrib_path(version),
_discover_via_entry_points())
return [ext.Extension(name, module) for name, module in chain]
def _discover_via_python_path():

51
novaclient/tests/unit/test_client.py
View File

@ -22,6 +22,7 @@ from keystoneauth1 import adapter
import mock
import requests
import novaclient.api_versions
import novaclient.client
import novaclient.extension
from novaclient.tests.unit import utils
@ -454,3 +455,53 @@ class SessionClientTest(utils.TestCase):
client.request("http://no.where", 'GET')
self.assertEqual(1, len(client.times))
self.assertEqual('GET http://no.where', client.times[0][0])
class DiscoverExtensionTest(utils.TestCase):
@mock.patch("novaclient.client._discover_via_entry_points")
@mock.patch("novaclient.client._discover_via_contrib_path")
@mock.patch("novaclient.client._discover_via_python_path")
@mock.patch("novaclient.extension.Extension")
def test_discover_all(self, mock_extension,
mock_discover_via_python_path,
mock_discover_via_contrib_path,
mock_discover_via_entry_points):
def make_gen(start, end):
def f(*args, **kwargs):
for i in range(start, end):
yield "name-%s" % i, i
return f
mock_discover_via_python_path.side_effect = make_gen(0, 3)
mock_discover_via_contrib_path.side_effect = make_gen(3, 5)
mock_discover_via_entry_points.side_effect = make_gen(5, 6)
version = novaclient.api_versions.APIVersion("2.0")
result = novaclient.client.discover_extensions(version)
self.assertEqual([mock.call("name-%s" % i, i) for i in range(0, 6)],
mock_extension.call_args_list)
mock_discover_via_python_path.assert_called_once_with()
mock_discover_via_contrib_path.assert_called_once_with(version)
mock_discover_via_entry_points.assert_called_once_with()
self.assertEqual([mock_extension()] * 6, result)
@mock.patch("novaclient.client._discover_via_entry_points")
@mock.patch("novaclient.client._discover_via_contrib_path")
@mock.patch("novaclient.client._discover_via_python_path")
@mock.patch("novaclient.extension.Extension")
def test_discover_only_contrib(self, mock_extension,
mock_discover_via_python_path,
mock_discover_via_contrib_path,
mock_discover_via_entry_points):
mock_discover_via_contrib_path.return_value = [("name", "module")]
version = novaclient.api_versions.APIVersion("2.0")
novaclient.client.discover_extensions(version, only_contrib=True)
mock_discover_via_contrib_path.assert_called_once_with(version)
self.assertFalse(mock_discover_via_python_path.called)
self.assertFalse(mock_discover_via_entry_points.called)
mock_extension.assert_called_once_with("name", "module")