x/vmware-nsx
Code Issues Proposed changes

NSX|v: Fix create_dhcp_binding error handling

Browse Source 
create_dhcp_binding may fail with timeout or other types of exceptions
which do not have a response field.
This patch checks its existince before trying to decode it.

Change-Id: Ie62d3965a10bf07795c1bd56b7c6191eb5c73251
This commit is contained in:
Adit Sarfaty 2018-04-23 14:22:56 +03:00
parent d8d07fea97
commit d17f3aad1b
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
vmware_nsx/plugins/nsx_v/vshield/edge_utils.py
View File

@ -1879,28 +1879,30 @@ class EdgeManager(object):
except nsxapi_exc.VcnsApiException as e:
with excutils.save_and_reraise_exception():
binding_id = None
desc = jsonutils.loads(e.response)
if desc.get('errorCode') == (
vcns_const.NSX_ERROR_DHCP_DUPLICATE_MAC):
bindings = get_dhcp_binding_mappings(self.nsxv_manager,
edge_id)
binding_id = bindings.get(binding['macAddress'].lower())
LOG.debug("Duplicate MAC for %s with binding %s",
binding['macAddress'], binding_id)
elif desc.get('errorCode') == (
vcns_const.NSX_ERROR_DHCP_OVERLAPPING_IP):
bindings = get_dhcp_binding_mappings_for_ips(
self.nsxv_manager, edge_id)
binding_id = bindings.get(binding['ipAddress'])
LOG.debug("Overlapping IP %s with binding %s",
binding['ipAddress'], binding_id)
elif desc.get('errorCode') == (
vcns_const.NSX_ERROR_DHCP_DUPLICATE_HOSTNAME):
bindings = get_dhcp_binding_mappings_for_hostname(
self.nsxv_manager, edge_id)
binding_id = bindings.get(binding['hostname'])
LOG.debug("Overlapping hostname %s with binding %s",
binding['hostname'], binding_id)
if e.response:
desc = jsonutils.loads(e.response)
if desc.get('errorCode') == (
vcns_const.NSX_ERROR_DHCP_DUPLICATE_MAC):
bindings = get_dhcp_binding_mappings(self.nsxv_manager,
edge_id)
binding_id = bindings.get(
binding['macAddress'].lower())
LOG.debug("Duplicate MAC for %s with binding %s",
binding['macAddress'], binding_id)
elif desc.get('errorCode') == (
vcns_const.NSX_ERROR_DHCP_OVERLAPPING_IP):
bindings = get_dhcp_binding_mappings_for_ips(
self.nsxv_manager, edge_id)
binding_id = bindings.get(binding['ipAddress'])
LOG.debug("Overlapping IP %s with binding %s",
binding['ipAddress'], binding_id)
elif desc.get('errorCode') == (
vcns_const.NSX_ERROR_DHCP_DUPLICATE_HOSTNAME):
bindings = get_dhcp_binding_mappings_for_hostname(
self.nsxv_manager, edge_id)
binding_id = bindings.get(binding['hostname'])
LOG.debug("Overlapping hostname %s with binding %s",
binding['hostname'], binding_id)
if binding_id:
self.nsxv_manager.vcns.delete_dhcp_binding(
edge_id, binding_id)