From 266d4e4c31098b2049354a7973b0e2ed1042d8e8 Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Fri, 24 Oct 2014 13:32:13 +0900
Subject: [PATCH] ofagent: Remove obsolete bridge_mappings (plugin side)

For ofagent, it has been superseded by physical_interface_mappings
and was planned to be removed in Kilo.

Related: blueprint ofagent-physical-interface-mappings
Change-Id: I1f7cbcde429a03e7e918dc224d8cbd8c6aa47049
---
 neutron/plugins/ml2/drivers/mech_ofagent.py   |  8 +--
 .../unit/ml2/drivers/test_l2population.py     |  4 +-
 .../unit/ml2/drivers/test_ofagent_mech.py     | 64 -------------------
 3 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/neutron/plugins/ml2/drivers/mech_ofagent.py b/neutron/plugins/ml2/drivers/mech_ofagent.py
index 3b7b7e27e..3deb5e338 100644
--- a/neutron/plugins/ml2/drivers/mech_ofagent.py
+++ b/neutron/plugins/ml2/drivers/mech_ofagent.py
@@ -50,16 +50,13 @@ class OfagentMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
             vif_details)
 
     def check_segment_for_agent(self, segment, agent):
-        bridge_mappings = agent['configurations'].get('bridge_mappings', {})
         interface_mappings = agent['configurations'].get('interface_mappings',
                                                          {})
         tunnel_types = agent['configurations'].get('tunnel_types', [])
         LOG.debug("Checking segment: %(segment)s "
-                  "for bridge_mappings: %(bridge_mappings)s "
-                  "and interface_mappings: %(interface_mappings)s "
+                  "for interface_mappings: %(interface_mappings)s "
                   "with tunnel_types: %(tunnel_types)s",
                   {'segment': segment,
-                   'bridge_mappings': bridge_mappings,
                    'interface_mappings': interface_mappings,
                    'tunnel_types': tunnel_types})
         network_type = segment[api.NETWORK_TYPE]
@@ -67,6 +64,5 @@ class OfagentMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
             network_type == p_const.TYPE_LOCAL or
             network_type in tunnel_types or
             (network_type in [p_const.TYPE_FLAT, p_const.TYPE_VLAN] and
-                (segment[api.PHYSICAL_NETWORK] in bridge_mappings
-                or segment[api.PHYSICAL_NETWORK] in interface_mappings))
+                segment[api.PHYSICAL_NETWORK] in interface_mappings)
         )
diff --git a/neutron/tests/unit/ml2/drivers/test_l2population.py b/neutron/tests/unit/ml2/drivers/test_l2population.py
index fa5a8be99..db9ce7fb4 100644
--- a/neutron/tests/unit/ml2/drivers/test_l2population.py
+++ b/neutron/tests/unit/ml2/drivers/test_l2population.py
@@ -80,7 +80,7 @@ L2_AGENT_5 = {
     'topic': constants.L2_AGENT_TOPIC,
     'configurations': {'tunneling_ip': '20.0.0.5',
                        'tunnel_types': [],
-                       'bridge_mappings': {'physnet1': 'br'},
+                       'interface_mappings': {'physnet1': 'eth9'},
                        'l2pop_network_types': ['vlan']},
     'agent_type': constants.AGENT_TYPE_OFA,
     'tunnel_type': [],
@@ -799,4 +799,4 @@ class TestL2PopulationRpcTestCase(test_plugin.Ml2PluginV2TestCase):
                                   'remove_fdb_entries')) as (upd_port_down,
                                                              rem_fdb_entries):
             l2pop_mech.delete_port_postcommit(mock.Mock())
-            self.assertTrue(upd_port_down.called)
\ No newline at end of file
+            self.assertTrue(upd_port_down.called)
diff --git a/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py b/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py
index 8c62e1e79..f40626741 100644
--- a/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py
+++ b/neutron/tests/unit/ml2/drivers/test_ofagent_mech.py
@@ -92,67 +92,3 @@ class OfagentMechanismSGDisabledLocalTestCase(
     OfagentMechanismSGDisabledBaseTestCase,
     base.AgentMechanismLocalTestCase):
     pass
-
-
-# The following tests are for deprecated "bridge_mappings".
-# TODO(yamamoto): Remove them.
-
-class OfagentMechanismPhysBridgeTestCase(base.AgentMechanismBaseTestCase):
-    VIF_TYPE = portbindings.VIF_TYPE_OVS
-    VIF_DETAILS = {portbindings.CAP_PORT_FILTER: True,
-                   portbindings.OVS_HYBRID_PLUG: True}
-    AGENT_TYPE = constants.AGENT_TYPE_OFA
-
-    GOOD_MAPPINGS = {'fake_physical_network': 'fake_bridge'}
-    GOOD_TUNNEL_TYPES = ['gre', 'vxlan']
-    GOOD_CONFIGS = {'bridge_mappings': GOOD_MAPPINGS,
-                    'tunnel_types': GOOD_TUNNEL_TYPES}
-
-    BAD_MAPPINGS = {'wrong_physical_network': 'wrong_bridge'}
-    BAD_TUNNEL_TYPES = ['bad_tunnel_type']
-    BAD_CONFIGS = {'bridge_mappings': BAD_MAPPINGS,
-                   'tunnel_types': BAD_TUNNEL_TYPES}
-
-    AGENTS = [{'alive': True,
-               'configurations': GOOD_CONFIGS}]
-    AGENTS_DEAD = [{'alive': False,
-                    'configurations': GOOD_CONFIGS}]
-    AGENTS_BAD = [{'alive': False,
-                   'configurations': GOOD_CONFIGS},
-                  {'alive': True,
-                   'configurations': BAD_CONFIGS}]
-
-    def setUp(self):
-        super(OfagentMechanismPhysBridgeTestCase, self).setUp()
-        self.driver = mech_ofagent.OfagentMechanismDriver()
-        self.driver.initialize()
-
-
-class OfagentMechanismPhysBridgeGenericTestCase(
-        OfagentMechanismPhysBridgeTestCase,
-        base.AgentMechanismGenericTestCase):
-    pass
-
-
-class OfagentMechanismPhysBridgeLocalTestCase(
-        OfagentMechanismPhysBridgeTestCase,
-        base.AgentMechanismLocalTestCase):
-    pass
-
-
-class OfagentMechanismPhysBridgeFlatTestCase(
-        OfagentMechanismPhysBridgeTestCase,
-        base.AgentMechanismFlatTestCase):
-    pass
-
-
-class OfagentMechanismPhysBridgeVlanTestCase(
-        OfagentMechanismPhysBridgeTestCase,
-        base.AgentMechanismVlanTestCase):
-    pass
-
-
-class OfagentMechanismPhysBridgeGreTestCase(
-        OfagentMechanismPhysBridgeTestCase,
-        base.AgentMechanismGreTestCase):
-    pass
-- 
2.45.2