From: Salvatore Orlando <salv.orlando@gmail.com>
Date: Wed, 13 Feb 2013 18:07:24 +0000 (-0800)
Subject: Avoid extra query when overlapping IPs are disabled
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=50cee94a808c0eb4d9af36a8da0026ba4f362d6d;p=openstack-build%2Fneutron-build.git

Avoid extra query when overlapping IPs are disabled

Bug 1124363

Change-Id: I431d19a987e18ec2648d9cb0aad185e5ba68f830
---

diff --git a/quantum/db/db_base_plugin_v2.py b/quantum/db/db_base_plugin_v2.py
index 8960629ee..fb34bf835 100644
--- a/quantum/db/db_base_plugin_v2.py
+++ b/quantum/db/db_base_plugin_v2.py
@@ -688,8 +688,9 @@ class QuantumDbPluginV2(quantum_plugin_base_v2.QuantumPluginBaseV2):
 
         """
         new_subnet_ipset = netaddr.IPSet([new_subnet_cidr])
-        subnet_list = network.subnets
-        if not cfg.CONF.allow_overlapping_ips:
+        if cfg.CONF.allow_overlapping_ips:
+            subnet_list = network.subnets
+        else:
             subnet_list = self._get_all_subnets(context)
         for subnet in subnet_list:
             if (netaddr.IPSet([subnet.cidr]) & new_subnet_ipset):