openstack/os-vif
Code Issues Proposed changes

Merge "ovs-hybrid: should permanently keep MAC entries"

Browse Source
This commit is contained in:
Jenkins
2017-09-20 16:19:18 +00:00
committed by Gerrit Code Review
parent e797ffd187 fa4ff64b86
commit 8c5adefde1
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vif_plug_ovs/linux_net.py
View File

@@ -153,6 +153,7 @@ def ensure_bridge(bridge):
processutils.execute('brctl', 'addbr', bridge)
processutils.execute('brctl', 'setfd', bridge, 0)
processutils.execute('brctl', 'stp', bridge, 'off')
processutils.execute('brctl', 'setageing', bridge, 0)
syspath = '/sys/class/net/%s/bridge/multicast_snooping'
syspath = syspath % bridge
processutils.execute('tee', syspath, process_input='0',

2
vif_plug_ovs/tests/unit/test_linux_net.py
View File

@@ -51,6 +51,7 @@ class LinuxNetTest(testtools.TestCase):
mock.call('brctl', 'addbr', 'br0'),
mock.call('brctl', 'setfd', 'br0', 0),
mock.call('brctl', 'stp', 'br0', "off"),
mock.call('brctl', 'setageing', 'br0', 0),
mock.call('tee', '/sys/class/net/br0/bridge/multicast_snooping',
check_exit_code=[0, 1], process_input='0'),
mock.call('ip', 'link', 'set', 'br0', 'up',
@@ -70,6 +71,7 @@ class LinuxNetTest(testtools.TestCase):
mock.call('brctl', 'addbr', 'br0'),
mock.call('brctl', 'setfd', 'br0', 0),
mock.call('brctl', 'stp', 'br0', "off"),
mock.call('brctl', 'setageing', 'br0', 0),
mock.call('tee', '/sys/class/net/br0/bridge/multicast_snooping',
check_exit_code=[0, 1], process_input='0'),
mock.call('tee', '/proc/sys/net/ipv6/conf/br0/disable_ipv6',