openstack
/
neutron
Code Issues Proposed changes

Merge "Remove local DEVICE_OWNER_ROUTER_GW value"

This commit is contained in:
Zuul 2018-06-01 21:00:12 +00:00 committed by Gerrit Code Review
parent 13d1c788f3 03e74f9a8f
commit 5cab438580
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/db/external_net_db.py
View File

@ -37,9 +37,6 @@ from neutron.objects import network as net_obj
from neutron.objects import router as l3_obj
DEVICE_OWNER_ROUTER_GW = constants.DEVICE_OWNER_ROUTER_GW
def _network_filter_hook(context, original_model, conditions):
if conditions is not None and not hasattr(conditions, '__iter__'):
conditions = (conditions, )
@ -128,7 +125,7 @@ class External_net_db_mixin(object):
# (and thus, possible floating IPs) on this network before
# allow it to be update to external=False
port = context.session.query(models_v2.Port).filter_by(
device_owner=DEVICE_OWNER_ROUTER_GW,
device_owner=constants.DEVICE_OWNER_ROUTER_GW,
network_id=net_data['id']).first()
if port:
raise extnet_exc.ExternalNetworkInUse(net_id=net_id)
@ -201,7 +198,7 @@ class External_net_db_mixin(object):
# nothing to validate if the tenant didn't change
return
gw_ports = context.session.query(models_v2.Port.id).filter_by(
device_owner=DEVICE_OWNER_ROUTER_GW,
device_owner=constants.DEVICE_OWNER_ROUTER_GW,
network_id=policy['object_id'])
gw_ports = [gw_port[0] for gw_port in gw_ports]
rbac = rbac_db.NetworkRBAC