openstack
/
neutron
Code Issues Proposed changes

Optimize query in _select_dhcp_ips_for_network_ids 

Only query the DB for relevant columns instead of
all of the port columns.

 Conflicts:
        neutron/db/securitygroups_rpc_base.py

Partial-Bug: #1373851
(cherry picked from commit 8d430a7f2e)

Change-Id: I32cd4a0bc6799ce77cea13188676308e3e641d19
This commit is contained in:
Yaguang Tang 2014-11-14 14:07:43 +08:00
parent 8bceb5579e
commit 90e841998b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/securitygroups_rpc_base.py
View File

@ -207,7 +207,7 @@ class SecurityGroupServerRpcCallbackMixin(object):
def _select_dhcp_ips_for_network_ids(self, context, network_ids):
if not network_ids:
return {}
query = context.session.query(models_v2.Port,
query = context.session.query(models_v2.Port.network_id,
models_v2.IPAllocation.ip_address)
query = query.join(models_v2.IPAllocation)
query = query.filter(models_v2.Port.network_id.in_(network_ids))
@ -218,8 +218,8 @@ class SecurityGroupServerRpcCallbackMixin(object):
for network_id in network_ids:
ips[network_id] = []
for port, ip in query:
ips[port['network_id']].append(ip)
for network_id, ip in query:
ips[network_id].append(ip)
return ips
def _convert_remote_group_id_to_ip_prefix(self, context, ports):