x/vmware-nsx
Code Issues Proposed changes

Edge firewall: improve exception handling

Browse Source 
Improve the exception handling in the edge firewall

Partial-Bug: #1305032
Change-Id: Ib095a48dd7cb958c0c5cf5682eeb7fc93f2b55dd
This commit is contained in:
Gary Kotton 2014-04-09 02:46:52 -07:00
parent 9f8ab3bd67
commit 8e4f913df6
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/plugins/vmware/vshield/edge_firewall_driver.py
View File

@ -187,10 +187,10 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
def _get_firewall(self, context, edge_id): def _get_firewall(self, context, edge_id):
try: try:
return self.vcns.get_firewall(edge_id)[1] return self.vcns.get_firewall(edge_id)[1]
except vcns_exc.VcnsApiException as e: except vcns_exc.VcnsApiException:
with excutils.save_and_reraise_exception():
LOG.exception(_("Failed to get firewall with edge " LOG.exception(_("Failed to get firewall with edge "
"id: %s"), edge_id) "id: %s"), edge_id)
raise e
def _get_firewall_rule_next(self, context, edge_id, rule_vseid): def _get_firewall_rule_next(self, context, edge_id, rule_vseid):
# Return the firewall rule below 'rule_vseid' # Return the firewall rule below 'rule_vseid'
@ -215,12 +215,12 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
try: try:
response = self.vcns.get_firewall_rule( response = self.vcns.get_firewall_rule(
edge_id, vcns_rule_id)[1] edge_id, vcns_rule_id)[1]
except vcns_exc.VcnsApiException as e: except vcns_exc.VcnsApiException:
with excutils.save_and_reraise_exception():
LOG.exception(_("Failed to get firewall rule: %(rule_id)s " LOG.exception(_("Failed to get firewall rule: %(rule_id)s "
"with edge_id: %(edge_id)s"), { "with edge_id: %(edge_id)s"), {
'rule_id': id, 'rule_id': id,
'edge_id': edge_id}) 'edge_id': edge_id})
raise e
return self._restore_firewall_rule(context, edge_id, response) return self._restore_firewall_rule(context, edge_id, response)
def get_firewall(self, context, edge_id): def get_firewall(self, context, edge_id):
@ -231,10 +231,10 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
fw_req = self._convert_firewall(context, firewall) fw_req = self._convert_firewall(context, firewall)
try: try:
self.vcns.update_firewall(edge_id, fw_req) self.vcns.update_firewall(edge_id, fw_req)
except vcns_exc.VcnsApiException as e: except vcns_exc.VcnsApiException:
with excutils.save_and_reraise_exception():
LOG.exception(_("Failed to update firewall " LOG.exception(_("Failed to update firewall "
"with edge_id: %s"), edge_id) "with edge_id: %s"), edge_id)
raise e
fw_res = self._get_firewall(context, edge_id) fw_res = self._get_firewall(context, edge_id)
vcns_db.cleanup_vcns_edge_firewallrule_binding( vcns_db.cleanup_vcns_edge_firewallrule_binding(
context.session, edge_id) context.session, edge_id)
@ -243,10 +243,10 @@ class EdgeFirewallDriver(db_base_plugin_v2.NeutronDbPluginV2):
def delete_firewall(self, context, edge_id): def delete_firewall(self, context, edge_id):
try: try:
self.vcns.delete_firewall(edge_id) self.vcns.delete_firewall(edge_id)
except vcns_exc.VcnsApiException as e: except vcns_exc.VcnsApiException:
with excutils.save_and_reraise_exception():
LOG.exception(_("Failed to delete firewall " LOG.exception(_("Failed to delete firewall "
"with edge_id:%s"), edge_id) "with edge_id:%s"), edge_id)
raise e
vcns_db.cleanup_vcns_edge_firewallrule_binding( vcns_db.cleanup_vcns_edge_firewallrule_binding(
context.session, edge_id) context.session, edge_id)