Support Extensions to Trove Client
extensions on the contrib path (i.e. troveclient/v1/contrib/*.py), extensions on the python path that follow the naming convention of *_python_troveclient_ext, and entry-points will now be discovered and loaded. due to the mismatch of the api version and the troveclient package name, '1.0' vs. '1', the client has been patched to look for contrib in troveclient/v1 vs. the standard troveclient/v1_0 Change-Id: I3ea7bb5ba471b0d421581dcfda7216f429cb7b65 Closes-Bug: #1267577
This commit is contained in:
parent
c02198edc0
commit
fce98a9173
39
troveclient/extension.py
Normal file
39
troveclient/extension.py
Normal file
@ -0,0 +1,39 @@
|
||||
# Copyright 2011 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from troveclient import base
|
||||
from troveclient import utils
|
||||
|
||||
|
||||
class Extension(utils.HookableMixin):
|
||||
"""Extension descriptor."""
|
||||
|
||||
SUPPORTED_HOOKS = ('__pre_parse_args__', '__post_parse_args__')
|
||||
|
||||
def __init__(self, name, module):
|
||||
self.name = name
|
||||
self.module = module
|
||||
self._parse_extension_module()
|
||||
|
||||
def _parse_extension_module(self):
|
||||
self.manager_class = None
|
||||
for attr_name, attr_value in self.module.__dict__.items():
|
||||
if attr_name in self.SUPPORTED_HOOKS:
|
||||
self.add_hook(attr_name, attr_value)
|
||||
elif utils.safe_issubclass(attr_value, base.Manager):
|
||||
self.manager_class = attr_value
|
||||
|
||||
def __repr__(self):
|
||||
return "<Extension '%s'>" % self.name
|
@ -31,9 +31,11 @@ import pkgutil
|
||||
import sys
|
||||
import logging
|
||||
|
||||
import pkg_resources
|
||||
import six
|
||||
|
||||
import troveclient
|
||||
import troveclient.extension
|
||||
from troveclient import client
|
||||
from troveclient.openstack.common import strutils
|
||||
from troveclient.openstack.common.apiclient import exceptions as exc
|
||||
@ -276,28 +278,33 @@ class OpenStackTroveShell(object):
|
||||
def _discover_extensions(self, version):
|
||||
extensions = []
|
||||
for name, module in itertools.chain(
|
||||
self._discover_via_python_path(version),
|
||||
self._discover_via_contrib_path(version)):
|
||||
self._discover_via_python_path(),
|
||||
self._discover_via_contrib_path(version),
|
||||
self._discover_via_entry_points()):
|
||||
|
||||
extension = troveclient.extension.Extension(name, module)
|
||||
extensions.append(extension)
|
||||
|
||||
return extensions
|
||||
|
||||
def _discover_via_python_path(self, version):
|
||||
for (module_loader, name, ispkg) in pkgutil.iter_modules():
|
||||
if name.endswith('python_troveclient_ext'):
|
||||
def _discover_via_python_path(self):
|
||||
for (module_loader, name, _ispkg) in pkgutil.iter_modules():
|
||||
if name.endswith('_python_troveclient_ext'):
|
||||
if not hasattr(module_loader, 'load_module'):
|
||||
# Python 2.6 compat: actually get an ImpImporter obj
|
||||
module_loader = module_loader.find_module(name)
|
||||
|
||||
module = module_loader.load_module(name)
|
||||
if hasattr(module, 'extension_name'):
|
||||
name = module.extension_name
|
||||
|
||||
yield name, module
|
||||
|
||||
def _discover_via_contrib_path(self, version):
|
||||
module_path = os.path.dirname(os.path.abspath(__file__))
|
||||
version_str = "v%s" % version.replace('.', '_')
|
||||
ext_path = os.path.join(module_path, version_str, 'contrib')
|
||||
version_pkg = 'v1' if version_str == 'v1_0' else version_str
|
||||
ext_path = os.path.join(module_path, version_pkg, 'contrib')
|
||||
ext_glob = os.path.join(ext_path, "*.py")
|
||||
|
||||
for ext_path in glob.iglob(ext_glob):
|
||||
@ -309,6 +316,13 @@ class OpenStackTroveShell(object):
|
||||
module = imp.load_source(name, ext_path)
|
||||
yield name, module
|
||||
|
||||
def _discover_via_entry_points(self):
|
||||
for ep in pkg_resources.iter_entry_points('troveclient.extension'):
|
||||
name = ep.name
|
||||
module = ep.load()
|
||||
|
||||
yield name, module
|
||||
|
||||
def _add_bash_completion_subparser(self, subparsers):
|
||||
subparser = subparsers.add_parser(
|
||||
'bash_completion',
|
||||
|
80
troveclient/tests/test_discover.py
Normal file
80
troveclient/tests/test_discover.py
Normal file
@ -0,0 +1,80 @@
|
||||
# Copyright 2012 OpenStack Foundation
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import imp
|
||||
import inspect
|
||||
|
||||
import mock
|
||||
import pkg_resources
|
||||
import testtools
|
||||
|
||||
import troveclient.shell
|
||||
|
||||
|
||||
class DiscoverTest(testtools.TestCase):
|
||||
|
||||
def test_discover_via_entry_points(self):
|
||||
|
||||
def mock_iter_entry_points(group):
|
||||
if group == 'troveclient.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]
|
||||
|
||||
@mock.patch.object(pkg_resources, 'iter_entry_points',
|
||||
mock_iter_entry_points)
|
||||
def test():
|
||||
shell = troveclient.shell.OpenStackTroveShell()
|
||||
for name, module in shell._discover_via_entry_points():
|
||||
self.assertEqual(name, 'foo')
|
||||
self.assertTrue(inspect.ismodule(module))
|
||||
|
||||
test()
|
||||
|
||||
def test_discover_extensions(self):
|
||||
|
||||
def mock_discover_via_python_path(self):
|
||||
yield 'foo', imp.new_module('foo')
|
||||
|
||||
def mock_discover_via_contrib_path(self, version):
|
||||
yield 'bar', imp.new_module('bar')
|
||||
|
||||
def mock_discover_via_entry_points(self):
|
||||
yield 'baz', imp.new_module('baz')
|
||||
|
||||
@mock.patch.object(troveclient.shell.OpenStackTroveShell,
|
||||
'_discover_via_python_path',
|
||||
mock_discover_via_python_path)
|
||||
@mock.patch.object(troveclient.shell.OpenStackTroveShell,
|
||||
'_discover_via_contrib_path',
|
||||
mock_discover_via_contrib_path)
|
||||
@mock.patch.object(troveclient.shell.OpenStackTroveShell,
|
||||
'_discover_via_entry_points',
|
||||
mock_discover_via_entry_points)
|
||||
def test():
|
||||
shell = troveclient.shell.OpenStackTroveShell()
|
||||
extensions = shell._discover_extensions('1.0')
|
||||
self.assertEqual(len(extensions), 3)
|
||||
names = sorted(['foo', 'bar', 'baz'])
|
||||
sorted_extensions = sorted(extensions, key=lambda ext: ext.name)
|
||||
for i in range(len(names)):
|
||||
ext = sorted_extensions[i]
|
||||
name = names[i]
|
||||
self.assertEqual(ext.name, name)
|
||||
self.assertTrue(inspect.ismodule(ext.module))
|
||||
|
||||
test()
|
@ -247,6 +247,18 @@ class HookableMixin(object):
|
||||
hook_func(*args, **kwargs)
|
||||
|
||||
|
||||
def safe_issubclass(*args):
|
||||
"""Like issubclass, but will just return False if not a class."""
|
||||
|
||||
try:
|
||||
if issubclass(*args):
|
||||
return True
|
||||
except TypeError:
|
||||
pass
|
||||
|
||||
return False
|
||||
|
||||
|
||||
# http://code.activestate.com/recipes/
|
||||
# 577257-slugify-make-a-string-usable-in-a-url-or-filename/
|
||||
def slugify(value):
|
||||
|
Loading…
Reference in New Issue
Block a user