x/vmware-nsx
Code Issues Proposed changes

Merge "Revert "Move router db call ahead of backend call""

Browse Source
This commit is contained in:
Jenkins 2016-02-24 04:24:10 +00:00 committed by Gerrit Code Review
commit 4e636f176d
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1459,8 +1459,6 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
else: else:
raise l3.RouterInterfaceNotFoundForSubnet(router_id=router_id, raise l3.RouterInterfaceNotFoundForSubnet(router_id=router_id,
subnet_id=subnet_id) subnet_id=subnet_id)
info = super(NsxV3Plugin, self).remove_router_interface(
context, router_id, interface_info)
try: try:
# TODO(berlin): Revocate announce the subnet on tier0 if # TODO(berlin): Revocate announce the subnet on tier0 if
# enable_snat is False # enable_snat is False
@ -1492,12 +1490,8 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
"%(net_id)s not found at the backend"), "%(net_id)s not found at the backend"),
{'router_id': router_id, {'router_id': router_id,
'net_id': subnet['network_id']}) 'net_id': subnet['network_id']})
except nsx_exc.ManagerError: info = super(NsxV3Plugin, self).remove_router_interface(
with excutils.save_and_reraise_exception(): context, router_id, interface_info)
LOG.exception(_LE("Failed to update router %(id)s at the "
"backend. The error would lead to mapping "
"inconsistency on this router!"),
{'id': router_id})
# Ensure the connection to the 'metadata access network' is removed # Ensure the connection to the 'metadata access network' is removed
# (with the network) if this the last subnet on the router. # (with the network) if this the last subnet on the router.
nsx_rpc.handle_router_metadata_access(self, context, router_id) nsx_rpc.handle_router_metadata_access(self, context, router_id)