openstack/cinder
Code Issues Proposed changes

Merge "Revert "Handle correct exception raised by python-novaclient""

Browse Source
This commit is contained in:
Jenkins 2015-10-29 14:10:53 +00:00 committed by Gerrit Code Review
commit aa6265b108
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/compute/nova.py
View File

@ -163,7 +163,7 @@ class API(base.Base):
def has_extension(self, context, extension, timeout=None):
try:
nova_exts = nova_client.discover_extensions(NOVA_API_VERSION)
except (nova_exceptions.RequestTimeout, request_exceptions.Timeout):
except request_exceptions.Timeout:
raise exception.APITimeout(service='Nova')
return extension in [e.name for e in nova_exts]
@ -196,5 +196,5 @@ class API(base.Base):
timeout=timeout).servers.get(server_id)
except nova_exceptions.NotFound:
raise exception.ServerNotFound(uuid=server_id)
except (nova_exceptions.RequestTimeout, request_exceptions.Timeout):
except request_exceptions.Timeout:
raise exception.APITimeout(service='Nova')

2
requirements.txt
View File

@ -35,7 +35,7 @@ pycrypto>=2.6
pyparsing>=2.0.1
python-barbicanclient>=3.3.0
python-glanceclient>=0.18.0
python-novaclient>=2.29.0
python-novaclient!=2.33.0,>=2.29.0
python-swiftclient>=2.2.0
requests!=2.8.0,>=2.5.2
retrying!=1.3.0,>=1.2.3 # Apache-2.0