diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-21 14:40:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-21 14:40:55 +0000 |
| commit | 9a6c4253d65539746e977ec605ccbc5032a97c9a (patch) | |
| tree | 570395c26a455a10a5535431652b45afec1548a7 | |
| parent | 92f700f50883c6a2537f520f3d67fdef7449ce8e (diff) | |
| parent | 2d3bcebf7fc0f053072a93f61d866b2d35a818a6 (diff) | |
| download | python-cinderclient-9a6c4253d65539746e977ec605ccbc5032a97c9a.tar.gz | |
Merge "Clean up some old v1 API references"
| -rw-r--r-- | cinderclient/shell.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 09a55b8..7722556 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -49,7 +49,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 " @@ -355,12 +354,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) |