From 67658607cf69ad2274d8f32680042ca210c7db86 Mon Sep 17 00:00:00 2001 From: Assaf Muller Date: Fri, 26 Jun 2015 17:17:14 -0400 Subject: [PATCH] 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 --- .../openvswitch/agent/ovs_neutron_agent.py | 2 +- .../agent/test_ovs_neutron_agent.py | 26 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) 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 ca52b2162..054c1fb6b 100644 --- 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 b3ab4fa3e..99621826a 100644 --- 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): -- 2.45.2