diff options
| author | Tobias Jungel <Tobias.Jungel@gmail.com> | 2018-11-02 02:31:20 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-02 02:31:20 +0100 |
| commit | 99f68ef02d1e136457c2b0fd1a375050ff965af3 (patch) | |
| tree | e820715240042c1671f0ca30ef7ed271e3e806ad /test | |
| parent | Merge pull request #10607 from yuwata/fix-10605 (diff) | |
| download | systemd-99f68ef02d1e136457c2b0fd1a375050ff965af3.tar.xz systemd-99f68ef02d1e136457c2b0fd1a375050ff965af3.zip | |
networkd: add missing bonding options (#10542)
Add support for bonding options system prio, port key and actor system mac.
These options exist in the linux kernel since 4.2
(torvalds/linux@171a42c38c6e1)
Details:
https://www.kernel.org/doc/Documentation/networking/bonding.txt
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-network/conf/25-bond.netdev | 5 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 19 |
2 files changed, 16 insertions, 8 deletions
diff --git a/test/test-network/conf/25-bond.netdev b/test/test-network/conf/25-bond.netdev index 10599108af..61c54c4de0 100644 --- a/test/test-network/conf/25-bond.netdev +++ b/test/test-network/conf/25-bond.netdev @@ -11,3 +11,8 @@ UpDelaySec=2s DownDelaySec=2s ResendIGMP=4 MinLinks=1 +AdActorSysPrio=1218 +AdUserPortKey=811 +AdActorSystem=00:11:22:33:44:55 +# feed the sanitizer +AdActorSystem=00:11:22:33:44:55 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index fc347c6008..a0db6eeb93 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -173,14 +173,17 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertTrue(self.link_exits('bond99')) - self.assertEqual('802.3ad 4', self.read_link_attr('bond99', 'bonding', 'mode')) - self.assertEqual('layer3+4 1', self.read_link_attr('bond99', 'bonding', 'xmit_hash_policy')) - self.assertEqual('1000', self.read_link_attr('bond99', 'bonding', 'miimon')) - self.assertEqual('fast 1', self.read_link_attr('bond99', 'bonding', 'lacp_rate')) - self.assertEqual('2000', self.read_link_attr('bond99', 'bonding', 'updelay')) - self.assertEqual('2000', self.read_link_attr('bond99', 'bonding', 'downdelay')) - self.assertEqual('4', self.read_link_attr('bond99', 'bonding', 'resend_igmp')) - self.assertEqual('1', self.read_link_attr('bond99', 'bonding', 'min_links')) + self.assertEqual('802.3ad 4', self.read_link_attr('bond99', 'bonding', 'mode')) + self.assertEqual('layer3+4 1', self.read_link_attr('bond99', 'bonding', 'xmit_hash_policy')) + self.assertEqual('1000', self.read_link_attr('bond99', 'bonding', 'miimon')) + self.assertEqual('fast 1', self.read_link_attr('bond99', 'bonding', 'lacp_rate')) + self.assertEqual('2000', self.read_link_attr('bond99', 'bonding', 'updelay')) + self.assertEqual('2000', self.read_link_attr('bond99', 'bonding', 'downdelay')) + self.assertEqual('4', self.read_link_attr('bond99', 'bonding', 'resend_igmp')) + self.assertEqual('1', self.read_link_attr('bond99', 'bonding', 'min_links')) + self.assertEqual('1218', self.read_link_attr('bond99', 'bonding', 'ad_actor_sys_prio')) + self.assertEqual('811', self.read_link_attr('bond99', 'bonding', 'ad_user_port_key')) + self.assertEqual('00:11:22:33:44:55', self.read_link_attr('bond99', 'bonding', 'ad_actor_system')) def test_vlan(self): self.copy_unit_to_networkd_unit_path('21-vlan.netdev', '11-dummy.netdev', '21-vlan.network') |