summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorTobias Jungel <tobias.jungel@bisdn.de>2019-03-10 21:25:24 +0100
committerLennart Poettering <lennart@poettering.net>2019-03-13 16:27:22 +0100
commit7f15b7146019cfe4aa74db17f12e1f05bea9703b (patch)
tree96ca8279973a590c55b8dc3909bc4071c972c48a /test
parent183e8c0beac3d47aa9171b9d6897283f606bb971 (diff)
downloadsystemd-7f15b7146019cfe4aa74db17f12e1f05bea9703b.tar.gz
networkd: Add bridge port capabilities
This PR adds the configuration switches for multicast flooding, neighbor suppression and learning of a bridge port.
Diffstat (limited to 'test')
-rw-r--r--test/fuzz/fuzz-network-parser/directives.network3
-rw-r--r--test/test-network/conf/26-bridge-slave-interface-1.network3
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py4
3 files changed, 10 insertions, 0 deletions
diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index 9a60eb712d..7d78081504 100644
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -7,6 +7,9 @@ FastLeave=
Priority=
AllowPortToBeRoot=
MulticastToUnicast=
+MulticastFlood=
+NeighborSuppression=
+Learning=
[Match]
KernelVersion=
Type=
diff --git a/test/test-network/conf/26-bridge-slave-interface-1.network b/test/test-network/conf/26-bridge-slave-interface-1.network
index 81b372fb6d..1f8c5b5648 100644
--- a/test/test-network/conf/26-bridge-slave-interface-1.network
+++ b/test/test-network/conf/26-bridge-slave-interface-1.network
@@ -9,4 +9,7 @@ Cost=400
HairPin = true
FastLeave = true
UnicastFlood = true
+MulticastFlood = false
MulticastToUnicast = true
+NeighborSuppression = true
+Learning = false
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index f43acb1f3c..d0e0bc0442 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1293,7 +1293,11 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities):
self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'hairpin_mode'), '1')
self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'path_cost'), '400')
self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'unicast_flood'), '1')
+ self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'multicast_flood'), '0')
self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'multicast_fast_leave'), '1')
+ if (os.path.exists('/sys/devices/virtual/net/bridge99/lower_dummy98/brport/neigh_suppress')):
+ self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'neigh_suppress'), '1')
+ self.assertEqual(self.read_bridge_port_attr('bridge99', 'dummy98', 'learning'), '0')
# CONFIG_BRIDGE_IGMP_SNOOPING=y
if (os.path.exists('/sys/devices/virtual/net/bridge00/lower_dummy98/brport/multicast_to_unicast')):