openstack/python-neutronclient
Code Issues Proposed changes

Merge "Ensure to use exception per status code for all cases"

Browse Source
This commit is contained in:
Jenkins
2016-02-28 18:01:22 +00:00
committed by Gerrit Code Review
parent 787bd92e61 af1a55bfd2
commit 2bf12749bc
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
neutronclient/tests/unit/test_cli20.py
View File

@@ -713,6 +713,8 @@ class CLITestV20ExceptionHandler(CLITestV20Base):
client.exception_handler_v20, client.exception_handler_v20,
status_code, error_content) status_code, error_content)
self.assertEqual(status_code, e.status_code) self.assertEqual(status_code, e.status_code)
self.assertEqual(expected_exception.__name__,
e.__class__.__name__)
if expected_msg is None: if expected_msg is None:
if error_detail: if error_detail:
@@ -780,32 +782,36 @@ class CLITestV20ExceptionHandler(CLITestV20Base):
'UnknownError', error_msg, error_detail) 'UnknownError', error_msg, error_detail)
def test_exception_handler_v20_bad_neutron_error(self): def test_exception_handler_v20_bad_neutron_error(self):
error_content = {'NeutronError': {'unknown_key': 'UNKNOWN'}} for status_code, client_exc in exceptions.HTTP_EXCEPTION_MAP.items():
self._test_exception_handler_v20( error_content = {'NeutronError': {'unknown_key': 'UNKNOWN'}}
exceptions.NeutronClientException, 500, self._test_exception_handler_v20(
expected_msg={'unknown_key': 'UNKNOWN'}, client_exc, status_code,
error_content=error_content) expected_msg="{'unknown_key': 'UNKNOWN'}",
error_content=error_content)
def test_exception_handler_v20_error_dict_contains_message(self): def test_exception_handler_v20_error_dict_contains_message(self):
error_content = {'message': 'This is an error message'} error_content = {'message': 'This is an error message'}
self._test_exception_handler_v20( for status_code, client_exc in exceptions.HTTP_EXCEPTION_MAP.items():
exceptions.NeutronClientException, 500, self._test_exception_handler_v20(
expected_msg='This is an error message', client_exc, status_code,
error_content=error_content) expected_msg='This is an error message',
error_content=error_content)
def test_exception_handler_v20_error_dict_not_contain_message(self): def test_exception_handler_v20_error_dict_not_contain_message(self):
# 599 is not contained in HTTP_EXCEPTION_MAP.
error_content = {'error': 'This is an error message'} error_content = {'error': 'This is an error message'}
expected_msg = '%s-%s' % (500, error_content) expected_msg = '%s-%s' % (599, error_content)
self._test_exception_handler_v20( self._test_exception_handler_v20(
exceptions.NeutronClientException, 500, exceptions.NeutronClientException, 599,
expected_msg=expected_msg, expected_msg=expected_msg,
error_content=error_content) error_content=error_content)
def test_exception_handler_v20_default_fallback(self): def test_exception_handler_v20_default_fallback(self):
# 599 is not contained in HTTP_EXCEPTION_MAP.
error_content = 'This is an error message' error_content = 'This is an error message'
expected_msg = '%s-%s' % (500, error_content) expected_msg = '%s-%s' % (599, error_content)
self._test_exception_handler_v20( self._test_exception_handler_v20(
exceptions.NeutronClientException, 500, exceptions.NeutronClientException, 599,
expected_msg=expected_msg, expected_msg=expected_msg,
error_content=error_content) error_content=error_content)

44
neutronclient/v2_0/client.py
View File

@@ -47,7 +47,7 @@ def exception_handler_v20(status_code, error_content):
if isinstance(error_content, dict): if isinstance(error_content, dict):
error_dict = error_content.get('NeutronError') error_dict = error_content.get('NeutronError')
# Find real error type # Find real error type
bad_neutron_error_flag = False client_exc = None
if error_dict: if error_dict:
# If Neutron key is found, it will definitely contain # If Neutron key is found, it will definitely contain
# a 'message' and 'type' keys? # a 'message' and 'type' keys?
@@ -56,35 +56,29 @@ def exception_handler_v20(status_code, error_content):
error_message = error_dict['message'] error_message = error_dict['message']
if error_dict['detail']: if error_dict['detail']:
error_message += "\n" + error_dict['detail'] error_message += "\n" + error_dict['detail']
except Exception:
bad_neutron_error_flag = True
if not bad_neutron_error_flag:
# If corresponding exception is defined, use it. # If corresponding exception is defined, use it.
client_exc = getattr(exceptions, '%sClient' % error_type, None) client_exc = getattr(exceptions, '%sClient' % error_type, None)
# Otherwise look up per status-code client exception except Exception:
if not client_exc: error_message = "%s" % error_dict
client_exc = exceptions.HTTP_EXCEPTION_MAP.get(status_code)
if client_exc:
raise client_exc(message=error_message,
status_code=status_code)
else:
raise exceptions.NeutronClientException(
status_code=status_code, message=error_message)
else:
raise exceptions.NeutronClientException(status_code=status_code,
message=error_dict)
else: else:
message = None error_message = None
if isinstance(error_content, dict): if isinstance(error_content, dict):
message = error_content.get('message') error_message = error_content.get('message')
if message: if not error_message:
raise exceptions.NeutronClientException(status_code=status_code, # If we end up here the exception was not a neutron error
message=message) error_message = "%s-%s" % (status_code, error_content)
# If we end up here the exception was not a neutron error # If an exception corresponding to the error type is not found,
msg = "%s-%s" % (status_code, error_content) # look up per status-code client exception.
raise exceptions.NeutronClientException(status_code=status_code, if not client_exc:
message=msg) client_exc = exceptions.HTTP_EXCEPTION_MAP.get(status_code)
# If there is no exception per status-code,
# Use NeutronClientException as fallback.
if not client_exc:
client_exc = exceptions.NeutronClientException
raise client_exc(message=error_message,
status_code=status_code)
class APIParamsCall(object): class APIParamsCall(object):