Revert "Fix 'router_gateway' port status can't be updated"

This patch breaks multinode fullstack tests and in my opinion
is generally speaking wrong. I've added a comment to explain
in the patch that's being reverted.

This reverts commit with change ID:
If428eadadfd36a9b19ea75920120e48ac49659f2

Change-Id: I73b7825ccc26847ef03d60d6154d544a9145f7e5

diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index ca52b216257ef81c729ceab8d5a136ec2bc92b60..054c1fb6b6db1f6194ed6f1e4f3a32dd2791cee7 100644 (file)
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@ -858,7 +858,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         br_names = []
         for bridge in ovs_bridges:
             bridge_id = ovs.get_bridge_external_bridge_id(bridge)
-            if bridge_id and bridge_id != bridge:
+            if bridge_id != bridge:
                 br_names.append(bridge)
         ovs_bridges.difference_update(br_names)
         ancillary_bridges = []

diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index b3ab4fa3efb70a57b35ba6098dec79e7ea20e41c..99621826af983441877f8981a0bb9822b0a08d47 100644 (file)
--- a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
@@ -1238,32 +1238,6 @@ class AncillaryBridgesTest(object):
         actual = self.mock_scan_ancillary_ports(vif_port_set, registered_ports)
         self.assertEqual(expected, actual)
 
-    def _test_ancillary_bridges_external(self, external_bridge_id=None):
-        bridges = ['br-int', 'br-tun', 'br-ex']
-        with mock.patch.object(self.mod_agent.OVSNeutronAgent,
-                               'setup_integration_br'),\
-                mock.patch('neutron.agent.linux.utils.get_interface_mac',
-                           return_value='00:00:00:00:00:01'),\
-                mock.patch('neutron.agent.common.ovs_lib.BaseOVS.get_bridges',
-                           return_value=bridges),\
-                mock.patch('neutron.agent.common.ovs_lib.BaseOVS.'
-                           'get_bridge_external_bridge_id',
-                           return_value=external_bridge_id),\
-                mock.patch('neutron.agent.common.ovs_lib.OVSBridge.'
-                           'get_vif_ports', return_value=[]):
-            self.agent = self.mod_agent.OVSNeutronAgent(self._bridge_classes(),
-                                                        **self.kwargs)
-            self.agent.enable_tunneling = True
-            ancillary_bridges = self.agent.setup_ancillary_bridges(
-                'br-int', 'br-tun')
-            self.assertEqual(1, len(ancillary_bridges))
-
-    def test_ancillary_bridges_external_bridge_id(self):
-        self._test_ancillary_bridges_external('br-ex')
-
-    def test_ancillary_bridges_external_bridge_id_none(self):
-        self._test_ancillary_bridges_external()
-
 
 class AncillaryBridgesTestOFCtl(AncillaryBridgesTest,
                                 ovs_test_base.OVSOFCtlTestBase):