x/vmware-nsx
Code Issues Proposed changes

Avoid extra query when overlapping IPs are disabled

Browse Source 
Bug 1124363

Change-Id: I431d19a987e18ec2648d9cb0aad185e5ba68f830
This commit is contained in:
Salvatore Orlando 2013-02-13 10:07:24 -08:00
parent 13f4ed7524
commit ba43260108
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
quantum/db/db_base_plugin_v2.py
View File

@ -688,8 +688,9 @@ class QuantumDbPluginV2(quantum_plugin_base_v2.QuantumPluginBaseV2):
""" """
new_subnet_ipset = netaddr.IPSet([new_subnet_cidr]) new_subnet_ipset = netaddr.IPSet([new_subnet_cidr])
subnet_list = network.subnets if cfg.CONF.allow_overlapping_ips:
if not cfg.CONF.allow_overlapping_ips: subnet_list = network.subnets
else:
subnet_list = self._get_all_subnets(context) subnet_list = self._get_all_subnets(context)
for subnet in subnet_list: for subnet in subnet_list:
if (netaddr.IPSet([subnet.cidr]) & new_subnet_ipset): if (netaddr.IPSet([subnet.cidr]) & new_subnet_ipset):