x/vmware-nsx
Code Issues Proposed changes

Merge "NSXv: Resume router port delete when edge missing"

Browse Source
This commit is contained in:
Jenkins 2016-11-28 08:27:15 +00:00 committed by Gerrit Code Review
commit f0a960274b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -2979,8 +2979,12 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
# TODO(berlin): Add fw rules if fw service is supported
fake_fw = {'firewall_rule_list': fake_fw_rules}
edge_utils.update_firewall(self.nsx_v, context, router_id, fake_fw,
allow_external=allow_external)
try:
edge_utils.update_firewall(self.nsx_v, context, router_id, fake_fw,
allow_external=allow_external)
except vsh_exc.ResourceNotFound:
LOG.error(_LE("Failed to update firewall for router %s"),
router_id)
# Security group handling section #
def _delete_nsx_security_group(self, nsx_sg_id):

5
vmware_nsx/plugins/nsx_v/vshield/edge_appliance_driver.py
View File

@ -338,6 +338,11 @@ class EdgeApplianceDriver(object):
{'vnic_index': index, 'edge_id': edge_id})
try:
self.vcns.delete_interface(edge_id, index)
except exceptions.ResourceNotFound:
LOG.error(_LE('Failed to delete vnic %(vnic_index)s on edge '
'%(edge_id)s: edge was not found'),
{'vnic_index': index,
'edge_id': edge_id})
except exceptions.VcnsApiException:
with excutils.save_and_reraise_exception():
LOG.exception(_LE("Failed to delete vnic %(vnic_index)s: "