x/vmware-nsx
Code Issues Proposed changes

Remove redundant codes

Browse Source 
the code is redundant, it should be removed

Change-Id: I050bfc0b4d72037510dc2f3d729a564869a374c2
Closes-Bug: #1265132
This commit is contained in:
shihanzhang 2013-12-31 15:22:40 +08:00
parent 791481224c
commit 824fb53a79
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/db/l3_db.py
View File

@ -196,13 +196,12 @@ class L3_NAT_db_mixin(l3.RouterPluginBase):
if fip_count: if fip_count:
raise l3.RouterExternalGatewayInUseByFloatingIp( raise l3.RouterExternalGatewayInUseByFloatingIp(
router_id=router_id, net_id=gw_port['network_id']) router_id=router_id, net_id=gw_port['network_id'])
if gw_port and gw_port['network_id'] != network_id: with context.session.begin(subtransactions=True):
with context.session.begin(subtransactions=True): router.gw_port = None
router.gw_port = None context.session.add(router)
context.session.add(router) self._core_plugin.delete_port(context.elevated(),
self._core_plugin.delete_port(context.elevated(), gw_port['id'],
gw_port['id'], l3_port_check=False)
l3_port_check=False)
if network_id is not None and (gw_port is None or if network_id is not None and (gw_port is None or
gw_port['network_id'] != network_id): gw_port['network_id'] != network_id):