From 11eae85a318d3341f0c114f0de1aa5032baf95d2 Mon Sep 17 00:00:00 2001
From: Kyrylo Romanenko <kromanenko@mirantis.com>
Date: Wed, 28 Sep 2016 13:53:14 +0300
Subject: [PATCH] Fix import of ironicclient and reformat docstring
Fix import of ironicclient to ironicclient/shell.py.
Reformat docstring in ironicclient/v1/shell.py.
Change-Id: Iad717d139ef423bb9f93050c6ba0c20fe1912a82
---
ironicclient/shell.py | 3 +--
ironicclient/v1/shell.py | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ironicclient/shell.py b/ironicclient/shell.py
index 6d9f0446a..972cb2771 100644
--- a/ironicclient/shell.py
+++ b/ironicclient/shell.py
@@ -26,7 +26,6 @@ from oslo_utils import encodeutils
import six
import ironicclient
-from ironicclient import client as iroclient
from ironicclient.common import cliutils
from ironicclient.common import http
from ironicclient.common.i18n import _
@@ -381,7 +380,7 @@ class IronicShell(object):
for key in client_args:
kwargs[key] = getattr(args, key)
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:
args.func(client, args)
diff --git a/ironicclient/v1/shell.py b/ironicclient/v1/shell.py
index 8e1a8be2a..c386dc055 100644
--- a/ironicclient/v1/shell.py
+++ b/ironicclient/v1/shell.py
@@ -33,8 +33,9 @@ def enhance_parser(parser, subparsers, cmd_mapper):
Take a basic (nonversioned) parser and enhance it with
commands and options specific for this version of API.
- :param parser: top level parser :param subparsers: top level
- parser's subparsers collection where subcommands will go
+ :param parser: top level parser
+ :param subparsers: top level parser's subparsers collection
+ where subcommands will go
"""
for command_module in COMMAND_MODULES:
utils.define_commands_from_module(subparsers, command_module,