From 824fb53a79e1f4191cedcaa10e899e49392df9e2 Mon Sep 17 00:00:00 2001 From: shihanzhang Date: Tue, 31 Dec 2013 15:22:40 +0800 Subject: [PATCH] Remove redundant codes the code is redundant, it should be removed Change-Id: I050bfc0b4d72037510dc2f3d729a564869a374c2 Closes-Bug: #1265132 --- neutron/db/l3_db.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index ab6017f5c2..71be3c41d0 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -196,13 +196,12 @@ class L3_NAT_db_mixin(l3.RouterPluginBase): if fip_count: raise l3.RouterExternalGatewayInUseByFloatingIp( 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): - router.gw_port = None - context.session.add(router) - self._core_plugin.delete_port(context.elevated(), - gw_port['id'], - l3_port_check=False) + with context.session.begin(subtransactions=True): + router.gw_port = None + context.session.add(router) + self._core_plugin.delete_port(context.elevated(), + gw_port['id'], + l3_port_check=False) if network_id is not None and (gw_port is None or gw_port['network_id'] != network_id):