Base OSC plugin support

Enable magnumclient OSC plugin support.
This patch set does the following:

 - Establishes OSC plugin structure for commands and unit tests
 - Creates the OSC plugin
 - Adds OSC to test-requirements.txt

This fixes are mainly copied from python-neutronclient.

Partial-Implements: blueprint openstackclient-support
Change-Id: I8f7ccde7d1417416ada5fe5e88832db7520efa6f
This commit is contained in:
OTSUKA, Yuanying 2016-07-22 13:55:02 +09:00
parent f2c49d203b
commit f49ef213d8
6 changed files with 89 additions and 0 deletions

View File

View File

@ -0,0 +1,56 @@
# 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 logging
from osc_lib import utils
LOG = logging.getLogger(__name__)
DEFAULT_API_VERSION = '1'
API_VERSION_OPTION = 'os_container_infra_api_version'
API_NAME = 'container_infra'
API_VERSIONS = {
'1': 'magnumclient.v1.client.Client',
}
def make_client(instance):
"""Returns a magnum client."""
magnum_client = utils.get_client_class(
API_NAME,
instance._api_version[API_NAME],
API_VERSIONS)
LOG.debug('Instantiating magnum client: %s', magnum_client)
client = magnum_client(session=instance.session,
region_name=instance._region_name,
interface=instance._interface,
insecure=instance._insecure,
ca_cert=instance._cacert)
return client
def build_option_parser(parser):
"""Hook to add global options"""
parser.add_argument(
'--os-container-infra-api-version',
metavar='<container-infra-api-version>',
default=utils.env(
'OS_CONTAINER_INFRA_API_VERSION',
default=DEFAULT_API_VERSION),
help='Container-Infra API version, default=' +
DEFAULT_API_VERSION +
' (Env: OS_CONTAINER_INFRA_API_VERSION)')
return parser

View File

View File

@ -0,0 +1,27 @@
# 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 argparse
import mock
from openstackclient.tests import utils
class TestMagnumClientOSCV1(utils.TestCommand):
def setUp(self):
super(TestMagnumClientOSCV1, self).setUp()
self.namespace = argparse.Namespace()
self.app.client_manager.session = mock.Mock()
self.app.client_manager.magnumclient = mock.Mock()
self.magnumclient = self.app.client_manager.magnumclient

View File

@ -26,6 +26,11 @@ packages =
console_scripts =
magnum = magnumclient.shell:main
openstack.cli.extension =
container_infra = magnumclient.osc.plugin
openstack.container_infra.v1 =
[build_sphinx]
source-dir = doc/source
build-dir = doc/build

View File

@ -6,6 +6,7 @@ bandit>=1.0.1 # Apache-2.0
coverage>=3.6 # Apache-2.0
discover # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
python-openstackclient>=2.1.0 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0