From 3b461d4402c7539b387721bad663b5bc72c3c59b Mon Sep 17 00:00:00 2001 From: Dongcan Ye Date: Wed, 21 Jun 2017 10:07:50 +0800 Subject: [PATCH] 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 --- neutron/db/l3_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index 196980393be..0b4499246b5 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -1071,7 +1071,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase, models_v2.IPAllocation.subnet_id == internal_subnet['id'] ).join(gw_port, gw_port.device_id == RouterPort.router_id).filter( 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() first_router_id = None @@ -1768,7 +1768,7 @@ class L3RpcNotifierMixin(object): subnet_id = updated['id'] query = context.session.query(models_v2.Port).filter_by( 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( models_v2.IPAllocation.subnet_id == subnet_id) router_ids = set(port['device_id'] for port in query)