From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Fri, 17 Oct 2014 06:35:44 +0000 (+0900)
Subject: ml2: remove stale _filter_nets_l3 in get_networks
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9436cbdfb2c0d113517bc6108ded7d0397a096cb;p=openstack-build%2Fneutron-build.git

ml2: remove stale _filter_nets_l3 in get_networks

The commit of 0156ec175cc047826b211727d43d5d14a3e1f2d2
change-id of I47e01a11afaf6e6bcf06da7bd713fd39b05600ff
which fixes bug 1132849 removed the call of _filter_nets_l3 methods.
But somehow the fix missed ml2 plugin.
This patch fixes ml2 plugin and removes the unused mothod.

Change-Id: I4d13223c170fd6777773970e0d22a191b98dd5ee
Closes-Bug: #1382360
---

diff --git a/neutron/db/external_net_db.py b/neutron/db/external_net_db.py
index 313d97b56..178068e14 100644
--- a/neutron/db/external_net_db.py
+++ b/neutron/db/external_net_db.py
@@ -144,18 +144,6 @@ class External_net_db_mixin(object):
         if l3plugin:
             l3plugin.delete_disassociated_floatingips(context, network_id)
 
-    def _filter_nets_l3(self, context, nets, filters):
-        vals = filters and filters.get(external_net.EXTERNAL, [])
-        if not vals:
-            return nets
-
-        ext_nets = set(en['network_id']
-                       for en in context.session.query(ExternalNetwork))
-        if vals[0]:
-            return [n for n in nets if n['id'] in ext_nets]
-        else:
-            return [n for n in nets if n['id'] not in ext_nets]
-
     def get_external_network_id(self, context):
         nets = self.get_networks(context, {external_net.EXTERNAL: [True]})
         if len(nets) > 1:
diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index d58c8074a..98b1d56c5 100644
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -615,7 +615,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
                 self.type_manager._extend_network_dict_provider(context, net)
 
             nets = self._filter_nets_provider(context, nets, filters)
-            nets = self._filter_nets_l3(context, nets, filters)
 
         return [self._fields(net, fields) for net in nets]