diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-05 04:43:27 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-05 16:39:39 +0900 |
| commit | 6f94379833d10b484371cf6587f1b429d1072b82 (patch) | |
| tree | a1edb81e3efce530181aee93bcad5e64d35579b3 | |
| parent | 3a1df8c4cb3f520eef5e4c2bcc5a0e5a7de79307 (diff) | |
| download | systemd-6f94379833d10b484371cf6587f1b429d1072b82.tar.gz | |
test-network: add tests for BridgeVLAN
| -rw-r--r-- | test/test-network/conf/26-bridge-vlan-master.network | 8 | ||||
| -rw-r--r-- | test/test-network/conf/26-bridge-vlan-slave.network | 9 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 22 |
3 files changed, 39 insertions, 0 deletions
diff --git a/test/test-network/conf/26-bridge-vlan-master.network b/test/test-network/conf/26-bridge-vlan-master.network new file mode 100644 index 0000000000..8493e32525 --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-master.network @@ -0,0 +1,8 @@ +[Match] +Name=bridge99 + +[Network] +IPv6AcceptRA=false + +[BridgeVLAN] +VLAN=4060-4094 diff --git a/test/test-network/conf/26-bridge-vlan-slave.network b/test/test-network/conf/26-bridge-vlan-slave.network new file mode 100644 index 0000000000..ba50508afb --- /dev/null +++ b/test/test-network/conf/26-bridge-vlan-slave.network @@ -0,0 +1,9 @@ +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no +Bridge=bridge99 + +[BridgeVLAN] +VLAN=4064-4094 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 849ea97b48..ba8fb7255f 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1861,6 +1861,8 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): '26-bridge.netdev', '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network', + '26-bridge-vlan-master.network', + '26-bridge-vlan-slave.network', 'bridge99-ignore-carrier-loss.network', 'bridge99.network'] @@ -1877,6 +1879,26 @@ class NetworkdBridgeTests(unittest.TestCase, Utilities): remove_unit_from_networkd_path(self.units) stop_networkd(show_logs=True) + def test_bridge_vlan(self): + copy_unit_to_networkd_unit_path('11-dummy.netdev', '26-bridge-vlan-slave.network', + '26-bridge.netdev', '26-bridge-vlan-master.network') + start_networkd() + wait_online(['test1:enslaved', 'bridge99:degraded']) + + output = check_output('bridge vlan show dev test1') + print(output) + self.assertNotRegex(output, '4063') + for i in range(4064, 4095): + self.assertRegex(output, f'{i}') + self.assertNotRegex(output, '4095') + + output = check_output('bridge vlan show dev bridge99') + print(output) + self.assertNotRegex(output, '4059') + for i in range(4060, 4095): + self.assertRegex(output, f'{i}') + self.assertNotRegex(output, '4095') + def test_bridge_property(self): copy_unit_to_networkd_unit_path('11-dummy.netdev', '12-dummy.netdev', '26-bridge.netdev', '26-bridge-slave-interface-1.network', '26-bridge-slave-interface-2.network', |