summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGinnis <sean.mcginnis@gmail.com>2020-06-02 17:35:53 -0500
committerSean McGinnis <sean.mcginnis@gmail.com>2020-06-02 17:35:53 -0500
commit2d3bcebf7fc0f053072a93f61d866b2d35a818a6 (patch)
tree6bfd80788eb34a5932576dddc5bf6abe2008475a
parent185aa9471f5a0880779dd26def5ce71072caac8f (diff)
downloadpython-cinderclient-2d3bcebf7fc0f053072a93f61d866b2d35a818a6.tar.gz
Clean up some old v1 API references
This removes some code that was still pointing to the V1 API. No need to add release note or additional announcements since this was all removed long ago, and if anyone would have gone down this code path it would have just blown up trying to import the v1 code that is no longer there. Change-Id: I7d239d3fe3d879e4c391e83cae1e394cf1f5e6eb Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
-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)