openstack
/
neutron
Code Issues Proposed changes

Using constants in local 

In l3_db, we had already defined DEVICE_OWNER_ROUTER_GW from
neutron_lib, we can avoid import that module again.

TrivialFix

Change-Id: I7e7339e7f8d4201d3ca50cf24d08ee965ec099a0
This commit is contained in:
Dongcan Ye 2017-06-21 10:07:50 +08:00
parent 9d9ae5af4a
commit 3b461d4402
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/l3_db.py
View File

@ -1071,7 +1071,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
models_v2.IPAllocation.subnet_id == internal_subnet['id'] models_v2.IPAllocation.subnet_id == internal_subnet['id']
).join(gw_port, gw_port.device_id == RouterPort.router_id).filter( ).join(gw_port, gw_port.device_id == RouterPort.router_id).filter(
gw_port.network_id == external_network_id, gw_port.network_id == external_network_id,
gw_port.device_owner == constants.DEVICE_OWNER_ROUTER_GW gw_port.device_owner == DEVICE_OWNER_ROUTER_GW
).distinct() ).distinct()
first_router_id = None first_router_id = None
@ -1768,7 +1768,7 @@ class L3RpcNotifierMixin(object):
subnet_id = updated['id'] subnet_id = updated['id']
query = context.session.query(models_v2.Port).filter_by( query = context.session.query(models_v2.Port).filter_by(
network_id=network_id, network_id=network_id,
device_owner=constants.DEVICE_OWNER_ROUTER_GW) device_owner=DEVICE_OWNER_ROUTER_GW)
query = query.join(models_v2.Port.fixed_ips).filter( query = query.join(models_v2.Port.fixed_ips).filter(
models_v2.IPAllocation.subnet_id == subnet_id) models_v2.IPAllocation.subnet_id == subnet_id)
router_ids = set(port['device_id'] for port in query) router_ids = set(port['device_id'] for port in query)