openstack/os-vif
Code Issues Proposed changes

Merge "Don't install iptables rules if neutron is filtering"

Browse Source
This commit is contained in:
Jenkins 2017-03-10 15:12:31 +00:00 committed by Gerrit Code Review
commit 3a2b19fab3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vif_plug_linux_bridge/linux_bridge.py
View File

@ -102,7 +102,10 @@ class LinuxBridgePlugin(plugin.PluginBase):
bridge_name, iface, mtu=mtu) bridge_name, iface, mtu=mtu)
else: else:
iface = self.config.flat_interface or network.bridge_interface iface = self.config.flat_interface or network.bridge_interface
linux_net.ensure_bridge(bridge_name, iface) # only put in iptables rules if Neutron not filtering
install_filters = not vif.has_traffic_filtering
linux_net.ensure_bridge(bridge_name, iface,
filtering=install_filters)
def unplug(self, vif, instance_info): def unplug(self, vif, instance_info):
# Nothing required to unplug a port for a VIF using standard # Nothing required to unplug a port for a VIF using standard

8
vif_plug_linux_bridge/tests/test_plugin.py
View File

@ -66,14 +66,20 @@ class PluginTest(testtools.TestCase):
address='ca:fe:de:ad:be:ef', address='ca:fe:de:ad:be:ef',
network=network, network=network,
dev_name='tap-xxx-yyy-zzz', dev_name='tap-xxx-yyy-zzz',
has_traffic_filtering=True,
bridge_name="br0") bridge_name="br0")
plugin = linux_bridge.LinuxBridgePlugin.load("linux_bridge") plugin = linux_bridge.LinuxBridgePlugin.load("linux_bridge")
plugin.plug(vif, self.instance) plugin.plug(vif, self.instance)
mock_ensure_bridge.assert_called_with("br0", "eth0") mock_ensure_bridge.assert_called_with("br0", "eth0", filtering=False)
self.assertEqual(len(mock_ensure_vlan_bridge.calls), 0) self.assertEqual(len(mock_ensure_vlan_bridge.calls), 0)
mock_ensure_bridge.reset_mock()
vif.has_traffic_filtering = False
plugin.plug(vif, self.instance)
mock_ensure_bridge.assert_called_with("br0", "eth0", filtering=True)
def test_plug_bridge_create_br_vlan_mtu_in_model(self): def test_plug_bridge_create_br_vlan_mtu_in_model(self):
self._test_plug_bridge_create_br_vlan(mtu=1234) self._test_plug_bridge_create_br_vlan(mtu=1234)