openstack/python-ironicclient
Code Issues Proposed changes

Merge "Fix import of ironicclient and reformat docstring"

Browse Source
This commit is contained in:
Jenkins
2016-10-11 23:53:38 +00:00
committed by Gerrit Code Review
parent 126cdb9723 11eae85a31
commit 23e1a53570
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ironicclient/shell.py
View File

@@ -26,7 +26,6 @@ from oslo_utils import encodeutils
import six import six
import ironicclient import ironicclient
from ironicclient import client as iroclient
from ironicclient.common import cliutils from ironicclient.common import cliutils
from ironicclient.common import http from ironicclient.common import http
from ironicclient.common.i18n import _ from ironicclient.common.i18n import _
@@ -381,7 +380,7 @@ class IronicShell(object):
for key in client_args: for key in client_args:
kwargs[key] = getattr(args, key) kwargs[key] = getattr(args, key)
kwargs['os_ironic_api_version'] = os_ironic_api_version kwargs['os_ironic_api_version'] = os_ironic_api_version
client = iroclient.get_client(api_major_version, **kwargs) client = ironicclient.client.get_client(api_major_version, **kwargs)
try: try:
args.func(client, args) args.func(client, args)

5
ironicclient/v1/shell.py
View File

@@ -33,8 +33,9 @@ def enhance_parser(parser, subparsers, cmd_mapper):
Take a basic (nonversioned) parser and enhance it with Take a basic (nonversioned) parser and enhance it with
commands and options specific for this version of API. commands and options specific for this version of API.
:param parser: top level parser :param subparsers: top level :param parser: top level parser
parser's subparsers collection where subcommands will go :param subparsers: top level parser's subparsers collection
where subcommands will go
""" """
for command_module in COMMAND_MODULES: for command_module in COMMAND_MODULES:
utils.define_commands_from_module(subparsers, command_module, utils.define_commands_from_module(subparsers, command_module,