From 1c862fe05aae20e64030099677ea7573a58e9217 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 3 May 2019 06:08:55 +0200 Subject: [PATCH] test-network: add tests for BridgeFDB.Destination= --- test/test-network/conf/vxlan-test1.network | 6 ++++++ test/test-network/conf/vxlan.network | 16 ++++++++++++++-- test/test-network/systemd-networkd-tests.py | 16 ++++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 test/test-network/conf/vxlan-test1.network diff --git a/test/test-network/conf/vxlan-test1.network b/test/test-network/conf/vxlan-test1.network new file mode 100644 index 00000000000..32880873c2d --- /dev/null +++ b/test/test-network/conf/vxlan-test1.network @@ -0,0 +1,6 @@ +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=false +VXLAN=vxlan99 diff --git a/test/test-network/conf/vxlan.network b/test/test-network/conf/vxlan.network index 80b405574c6..1b63785d153 100644 --- a/test/test-network/conf/vxlan.network +++ b/test/test-network/conf/vxlan.network @@ -1,5 +1,17 @@ [Match] -Name=test1 +Name=vxlan99 [Network] -VXLAN=vxlan99 +IPv6AcceptRA=no + +[BridgeFDB] +MACAddress=00:11:22:33:44:55 +Destination=10.0.0.5 + +[BridgeFDB] +MACAddress=00:11:22:33:44:66 +Destination=10.0.0.6 + +[BridgeFDB] +MACAddress=00:11:22:33:44:77 +Destination=10.0.0.7 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 806f860eb73..73c0edb38e4 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -331,6 +331,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): 'sit.network', 'vti6.network', 'vti.network', + 'vxlan-test1.network', 'vxlan.network'] def setUp(self): @@ -861,14 +862,15 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): subprocess.call(['ip', 'fou', 'del', 'port', '55556']) def test_vxlan(self): - self.copy_unit_to_networkd_unit_path('25-vxlan.netdev', 'vxlan.network', '11-dummy.netdev') - self.start_networkd() + self.copy_unit_to_networkd_unit_path('25-vxlan.netdev', 'vxlan.network', + '11-dummy.netdev', 'vxlan-test1.network') + self.start_networkd(0) - self.assertTrue(self.link_exits('vxlan99')) + self.wait_online(['test1:degraded', 'vxlan99:degraded']) output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vxlan99']).rstrip().decode('utf-8') print(output) - self.assertRegex(output, "999") + self.assertRegex(output, '999') self.assertRegex(output, '5555') self.assertRegex(output, 'l2miss') self.assertRegex(output, 'l3miss') @@ -879,6 +881,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'remcsumrx') self.assertRegex(output, 'gbp') + output = subprocess.check_output(['bridge', 'fdb', 'show', 'dev', 'vxlan99']).rstrip().decode('utf-8') + print(output) + self.assertRegex(output, '00:11:22:33:44:55 dst 10.0.0.5 self permanent') + self.assertRegex(output, '00:11:22:33:44:66 dst 10.0.0.6 self permanent') + self.assertRegex(output, '00:11:22:33:44:77 dst 10.0.0.7 self permanent') + def test_macsec(self): self.copy_unit_to_networkd_unit_path('25-macsec.netdev', '25-macsec.network', '25-macsec.key', 'macsec.network', '12-dummy.netdev') -- 2.39.2