x
/
vmware-nsx
Code Issues Proposed changes

NSX|V3+P: Fix HTTP response code for cluster down 

This change removes ManagerError from fault translation. ManagerError
is too generic and would pull in all child classes to be translated
as bad request, which is not correct for temporary errors such as
ClusterUnavailable. Explicit child classes should be added to the map
instead.

Change-Id: I5fb4bbcabd6540f30f4d30732bfb704680b5ffa9
This commit is contained in:
Anna Khmelnitsky 2019-04-26 17:26:33 -07:00 committed by Adit Sarfaty
parent cdf0647104
commit 79dd8edae5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/plugins/common_v3/plugin.py
View File

@ -158,7 +158,7 @@ class NsxPluginV3Base(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
Exceptions specific to the NSX Plugin are mapped to standard
HTTP Exceptions.
"""
faults.FAULT_MAP.update({nsx_lib_exc.ManagerError:
faults.FAULT_MAP.update({nsx_lib_exc.InvalidInput:
webob.exc.HTTPBadRequest,
nsx_lib_exc.ServiceClusterUnavailable:
webob.exc.HTTPServiceUnavailable,

4
vmware_nsx/tests/unit/nsx_v3/test_plugin.py
View File

@ -786,14 +786,14 @@ class TestNetworksV2(test_plugin.TestNetworksV2, NsxV3PluginTestCaseMixin):
# Fail the backend update
with mock.patch("vmware_nsxlib.v3.core_resources."
"NsxLibLogicalSwitch.update",
side_effect=nsxlib_exc.ManagerError):
side_effect=nsxlib_exc.InvalidInput):
args = {'network': {'description': 'test rollback'}}
req = self.new_update_request('networks', args,
net['network']['id'], fmt='json')
res = self.deserialize('json', req.get_response(self.api))
# should fail with the nsxlib error (meaning that the rollback
# did not fail)
self.assertEqual('ManagerError',
self.assertEqual('InvalidInput',
res['NeutronError']['type'])