summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cinderclient/shell.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index acbccda..e11478b 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -48,7 +48,6 @@ from cinderclient import utils
DEFAULT_MAJOR_OS_VOLUME_API_VERSION = "3"
DEFAULT_CINDER_ENDPOINT_TYPE = 'publicURL'
-V1_SHELL = 'cinderclient.v1.shell'
V2_SHELL = 'cinderclient.v2.shell'
V3_SHELL = 'cinderclient.v3.shell'
HINT_HELP_MSG = (" [hint: use '--os-volume-api-version' flag to show help "
@@ -354,12 +353,10 @@ class OpenStackCinderShell(object):
self.subcommands = {}
subparsers = parser.add_subparsers(metavar='<subcommand>')
- if version.ver_major == 2:
- actions_module = importutils.import_module(V2_SHELL)
- elif version.ver_major == 3:
+ if version.ver_major == 3:
actions_module = importutils.import_module(V3_SHELL)
else:
- actions_module = importutils.import_module(V1_SHELL)
+ actions_module = importutils.import_module(V2_SHELL)
self._find_actions(subparsers, actions_module, version, do_help,
input_args)