From 9540f8e216004a06b7bca90d0aeb3e20ca78c766 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 10 Jan 2024 15:01:26 +0900 Subject: [PATCH] test-network: add test case for MACAddress=none in .netdev and MACAddressPolicy=none in .link Prompted by #30813. --- .../test-network/conf/26-bridge-mac-master.network | 6 ++++++ test/test-network/conf/26-bridge-mac-slave.network | 7 +++++++ test/test-network/conf/26-bridge-mac.link | 6 ++++++ test/test-network/conf/26-bridge-mac.netdev | 5 +++++ test/test-network/systemd-networkd-tests.py | 14 ++++++++++++++ 5 files changed, 38 insertions(+) create mode 100644 test/test-network/conf/26-bridge-mac-master.network create mode 100644 test/test-network/conf/26-bridge-mac-slave.network create mode 100644 test/test-network/conf/26-bridge-mac.link create mode 100644 test/test-network/conf/26-bridge-mac.netdev diff --git a/test/test-network/conf/26-bridge-mac-master.network b/test/test-network/conf/26-bridge-mac-master.network new file mode 100644 index 00000000000..d08970b75bd --- /dev/null +++ b/test/test-network/conf/26-bridge-mac-master.network @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=bridge99 + +[Network] +IPv6AcceptRA=false diff --git a/test/test-network/conf/26-bridge-mac-slave.network b/test/test-network/conf/26-bridge-mac-slave.network new file mode 100644 index 00000000000..81a0b468e6e --- /dev/null +++ b/test/test-network/conf/26-bridge-mac-slave.network @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Bridge=bridge99 diff --git a/test/test-network/conf/26-bridge-mac.link b/test/test-network/conf/26-bridge-mac.link new file mode 100644 index 00000000000..82ed9373594 --- /dev/null +++ b/test/test-network/conf/26-bridge-mac.link @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Match] +OriginalName=bridge99 + +[Link] +MACAddressPolicy=none diff --git a/test/test-network/conf/26-bridge-mac.netdev b/test/test-network/conf/26-bridge-mac.netdev new file mode 100644 index 00000000000..2d26a0362e7 --- /dev/null +++ b/test/test-network/conf/26-bridge-mac.netdev @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[NetDev] +Name=bridge99 +Kind=bridge +MACAddress=none diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index b122e0a491b..5e265878432 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -4540,6 +4540,20 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): def tearDown(self): tear_down_common() + def test_bridge_mac_none(self): + copy_network_unit('12-dummy-mac.netdev', '26-bridge-mac-slave.network', + '26-bridge-mac.netdev', '26-bridge-mac-master.network', '26-bridge-mac.link') + start_networkd() + self.wait_online(['dummy98:enslaved', 'bridge99:degraded']) + + output = check_output('ip link show dev dummy98') + print(output) + self.assertIn('link/ether 12:34:56:78:9a:01', output) + + output = check_output('ip link show dev bridge99') + print(output) + self.assertIn('link/ether 12:34:56:78:9a:01', output) + def test_bridge_vlan(self): copy_network_unit('11-dummy.netdev', '26-bridge-vlan-slave.network', '26-bridge.netdev', '26-bridge-vlan-master.network', -- 2.47.3