From 0aefa2274db62c5313b855cf854df2023ce7c02b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 24 May 2019 00:09:55 +0900 Subject: [PATCH] test-network: add more tests for LinkLocalAddressing=yes on various netdevs --- test/test-network/conf/21-vlan.network | 1 + test/test-network/conf/25-macsec.network | 1 + test/test-network/conf/25-netdevsim.netdev | 3 +++ test/test-network/conf/macsec.network | 1 + .../conf/netdev-link-local-addressing-yes.network | 3 +++ test/test-network/conf/vxlan-test1.network | 1 + test/test-network/conf/vxlan.network | 1 + test/test-network/systemd-networkd-tests.py | 14 +++++++------- 8 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 test/test-network/conf/25-netdevsim.netdev diff --git a/test/test-network/conf/21-vlan.network b/test/test-network/conf/21-vlan.network index 0cd901d..3edc59e 100644 --- a/test/test-network/conf/21-vlan.network +++ b/test/test-network/conf/21-vlan.network @@ -4,3 +4,4 @@ Name=vlan99 [Network] IPv6AcceptRA=false Address=192.168.23.5/24 +LinkLocalAddressing=yes diff --git a/test/test-network/conf/25-macsec.network b/test/test-network/conf/25-macsec.network index 7037048..6def92f 100644 --- a/test/test-network/conf/25-macsec.network +++ b/test/test-network/conf/25-macsec.network @@ -4,3 +4,4 @@ Name=macsec99 [Network] IPv6AcceptRA=no Address=10.1.2.3/16 +LinkLocalAddressing=yes diff --git a/test/test-network/conf/25-netdevsim.netdev b/test/test-network/conf/25-netdevsim.netdev new file mode 100644 index 0000000..899f2d9 --- /dev/null +++ b/test/test-network/conf/25-netdevsim.netdev @@ -0,0 +1,3 @@ +[NetDev] +Kind=netdevsim +Name=netdevsim99 diff --git a/test/test-network/conf/macsec.network b/test/test-network/conf/macsec.network index d1360a5..5558547 100644 --- a/test/test-network/conf/macsec.network +++ b/test/test-network/conf/macsec.network @@ -6,4 +6,5 @@ MACAddress=00:50:56:c0:00:19 [Network] IPv6AcceptRA=no +LinkLocalAddressing=yes MACsec=macsec99 diff --git a/test/test-network/conf/netdev-link-local-addressing-yes.network b/test/test-network/conf/netdev-link-local-addressing-yes.network index 1a109ef..ffe9ae4 100644 --- a/test/test-network/conf/netdev-link-local-addressing-yes.network +++ b/test/test-network/conf/netdev-link-local-addressing-yes.network @@ -6,6 +6,9 @@ Name=macvtap99 Name=veth99 Name=veth-peer Name=vcan99 +Name=vrf99 +Name=geneve99 +Name=ipiptun99 [Network] LinkLocalAddressing=yes diff --git a/test/test-network/conf/vxlan-test1.network b/test/test-network/conf/vxlan-test1.network index 3288087..aaffb64 100644 --- a/test/test-network/conf/vxlan-test1.network +++ b/test/test-network/conf/vxlan-test1.network @@ -3,4 +3,5 @@ Name=test1 [Network] IPv6AcceptRA=false +LinkLocalAddressing=yes VXLAN=vxlan99 diff --git a/test/test-network/conf/vxlan.network b/test/test-network/conf/vxlan.network index 1b63785..fc8ac47 100644 --- a/test/test-network/conf/vxlan.network +++ b/test/test-network/conf/vxlan.network @@ -3,6 +3,7 @@ Name=vxlan99 [Network] IPv6AcceptRA=no +LinkLocalAddressing=yes [BridgeFDB] MACAddress=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 7331107..f5b13e9 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -456,7 +456,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '21-vlan.network', '21-vlan-test1.network') self.start_networkd(0) - self.wait_online(['test1', 'vlan99']) + self.wait_online(['test1:degraded', 'vlan99:routable']) output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1'], universal_newlines=True).rstrip() print(output) @@ -592,10 +592,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): @expectedFailureIfModuleIsNotAvailable('vrf') def test_vrf(self): - self.copy_unit_to_networkd_unit_path('25-vrf.netdev') + self.copy_unit_to_networkd_unit_path('25-vrf.netdev', 'netdev-link-local-addressing-yes.network') self.start_networkd(0) - self.wait_online(['vrf99:off']) + self.wait_online(['vrf99:carrier']) @expectedFailureIfModuleIsNotAvailable('vcan') def test_vcan(self): @@ -636,10 +636,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'CJQUtcS9emY2fLYqDlpSZiE/QJyHkPWr\+WHtZLZ90FU=') def test_geneve(self): - self.copy_unit_to_networkd_unit_path('25-geneve.netdev') + self.copy_unit_to_networkd_unit_path('25-geneve.netdev', 'netdev-link-local-addressing-yes.network') self.start_networkd(0) - self.wait_online(['geneve99:off']) + self.wait_online(['geneve99:degraded']) output = subprocess.check_output(['ip', '-d', 'link', 'show', 'geneve99'], universal_newlines=True).rstrip() print(output) @@ -873,10 +873,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'oseq') def test_tunnel_independent(self): - self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev') + self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev', 'netdev-link-local-addressing-yes.network') self.start_networkd(0) - self.wait_online(['ipiptun99:off']) + self.wait_online(['ipiptun99:carrier']) @expectedFailureIfModuleIsNotAvailable('fou') def test_fou(self): -- 2.7.4