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 8960629ee155295e9ceb71e01fc0b4e2c33b98bd..fb34bf835f6d06a1393751d4ba0cc78bcef095a3 100644 (file)
--- 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):