openstack/python-cinderclient
Code Issues Proposed changes

Merge "Clean the redundant code in shell.py"

Browse Source
This commit is contained in:
Jenkins
2017-08-01 19:14:16 +00:00
committed by Gerrit Code Review
parent 130397a128 c6504502ed
commit d7d7e50126
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cinderclient/shell.py
View File

@@ -1,4 +1,3 @@
# Copyright 2011-2014 OpenStack Foundation # Copyright 2011-2014 OpenStack Foundation
# All Rights Reserved. # All Rights Reserved.
# #
@@ -25,15 +24,12 @@ import getpass
import logging import logging
import sys import sys
import requests
import six
from keystoneauth1 import discover from keystoneauth1 import discover
from keystoneauth1 import loading from keystoneauth1 import exceptions
from keystoneauth1 import session
from keystoneauth1.identity import v2 as v2_auth from keystoneauth1.identity import v2 as v2_auth
from keystoneauth1.identity import v3 as v3_auth from keystoneauth1.identity import v3 as v3_auth
from keystoneauth1.exceptions import DiscoveryFailure from keystoneauth1 import loading
from keystoneauth1 import session
from oslo_utils import encodeutils from oslo_utils import encodeutils
from oslo_utils import importutils from oslo_utils import importutils
osprofiler_profiler = importutils.try_import("osprofiler.profiler") # noqa osprofiler_profiler = importutils.try_import("osprofiler.profiler") # noqa
@@ -42,17 +38,16 @@ import six
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
import cinderclient import cinderclient
from cinderclient import _i18n
from cinderclient._i18n import _
from cinderclient import api_versions from cinderclient import api_versions
from cinderclient import client from cinderclient import client
from cinderclient import exceptions as exc from cinderclient import exceptions as exc
from cinderclient import utils from cinderclient import utils
from cinderclient import _i18n
from cinderclient._i18n import _
# Enable i18n lazy translation # Enable i18n lazy translation
_i18n.enable_lazy() _i18n.enable_lazy()
DEFAULT_MAJOR_OS_VOLUME_API_VERSION = "3" DEFAULT_MAJOR_OS_VOLUME_API_VERSION = "3"
DEFAULT_CINDER_ENDPOINT_TYPE = 'publicURL' DEFAULT_CINDER_ENDPOINT_TYPE = 'publicURL'
V1_SHELL = 'cinderclient.v1.shell' V1_SHELL = 'cinderclient.v1.shell'
@@ -879,7 +874,7 @@ class OpenStackCinderShell(object):
ks_discover = discover.Discover(session=session, url=auth_url) ks_discover = discover.Discover(session=session, url=auth_url)
v2_auth_url = ks_discover.url_for('2.0') v2_auth_url = ks_discover.url_for('2.0')
v3_auth_url = ks_discover.url_for('3.0') v3_auth_url = ks_discover.url_for('3.0')
except DiscoveryFailure: except exceptions.DiscoveryFailure:
# Discovery response mismatch. Raise the error # Discovery response mismatch. Raise the error
raise raise
except Exception: except Exception: