x
/
vmware-nsx
Code Issues Proposed changes

Merge "NSX-v3: fix update_router_firewall error handling"

This commit is contained in:
Zuul 2018-01-18 02:32:53 +00:00 committed by Gerrit Code Review
parent f97b3055df c1ea586d6e
commit fe2c87adbd
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -3521,21 +3521,24 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
# find the backend router id in the DB
nsx_router_id = nsx_db.get_nsx_router_id(context.session, router_id)
if nsx_router_id is None:
LOG.error("Didn't find nsx router for router %s", router_id)
raise self.driver_exception(driver=self.driver_name)
msg = _("Didn't find nsx router for router %s") % router_id
LOG.error(msg)
raise nsx_exc.NsxPluginException(err_msg=msg)
# get the FW section id of the backend router
try:
section_id = self.nsxlib.logical_router.get_firewall_section_id(
nsx_router_id)
except Exception as e:
LOG.error("Failed to find router firewall section for router "
"%(id)s: %(e)s", {'id': router_id, 'e': e})
raise self.driver_exception(driver=self.driver_name)
msg = (_("Failed to find router firewall section for router "
"%(id)s: %(e)s") % {'id': router_id, 'e': e})
LOG.error(msg)
raise nsx_exc.NsxPluginException(err_msg=msg)
if section_id is None:
LOG.error("Failed to find router firewall section for router "
"%(id)s.", {'id': router_id})
raise self.driver_exception(driver=self.driver_name)
msg = (_("Failed to find router firewall section for router "
"%(id)s.") % {'id': router_id})
LOG.error(msg)
raise nsx_exc.NsxPluginException(err_msg=msg)
return nsx_router_id, section_id