]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - test/test-network/systemd-networkd-tests.py
codespell: fix spelling errors
[thirdparty/systemd.git] / test / test-network / systemd-networkd-tests.py
index 13f6f4e1deec980dbdd6cbdad1778ce178e2c017..806f860eb73331712a9570e337ff3d5822d2d97d 100755 (executable)
@@ -71,7 +71,6 @@ def expectedFailureIfRoutingPolicyIPProtoIsNotAvailable():
     return f
 
 def setUpModule():
-
     os.makedirs(network_unit_file_path, exist_ok=True)
     os.makedirs(networkd_ci_path, exist_ok=True)
 
@@ -186,8 +185,10 @@ class Utilities():
         if sleep_sec > 0:
             time.sleep(sleep_sec)
 
-    def wait_online(self, links_with_operstate, timeout='20s'):
-        args = [wait_online_bin, f' --timeout={timeout}'] + [f'--interface={link}' for link in links_with_operstate]
+    def wait_online(self, links_with_operstate, timeout='20s', bool_any=False):
+        args = [wait_online_bin, f'--timeout={timeout}'] + [f'--interface={link}' for link in links_with_operstate]
+        if bool_any:
+            args += ['--any']
         subprocess.check_call(args)
 
 class NetworkdNetDevTests(unittest.TestCase, Utilities):
@@ -201,8 +202,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         'erspan98',
         'erspan99',
         'geneve99',
+        'gretap96',
         'gretap98',
         'gretap99',
+        'gretun96',
         'gretun97',
         'gretun98',
         'gretun99',
@@ -214,6 +217,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         'ip6tnl97',
         'ip6tnl98',
         'ip6tnl99',
+        'ipiptun96',
         'ipiptun97',
         'ipiptun98',
         'ipiptun99',
@@ -221,6 +225,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         'isataptun99',
         'macvlan99',
         'macvtap99',
+        'sittun96',
         'sittun97',
         'sittun98',
         'sittun99',
@@ -244,7 +249,9 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
     units = [
         '10-dropin-test.netdev',
         '11-dummy.netdev',
+        '11-dummy.network',
         '12-dummy.netdev',
+        '15-name-conflict-test.netdev',
         '21-macvlan.netdev',
         '21-macvtap.netdev',
         '21-vlan-test1.network',
@@ -254,8 +261,15 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-bond.netdev',
         '25-bond-balanced-tlb.netdev',
         '25-bridge.netdev',
+        '25-bridge.network',
         '25-erspan-tunnel-local-any.netdev',
         '25-erspan-tunnel.netdev',
+        '25-fou-gretap.netdev',
+        '25-fou-gre.netdev',
+        '25-fou-ipip.netdev',
+        '25-fou-ipproto-gre.netdev',
+        '25-fou-ipproto-ipip.netdev',
+        '25-fou-sit.netdev',
         '25-geneve.netdev',
         '25-gretap-tunnel-local-any.netdev',
         '25-gretap-tunnel.netdev',
@@ -276,6 +290,9 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-ipip-tunnel.netdev',
         '25-ipvlan.netdev',
         '25-isatap-tunnel.netdev',
+        '25-macsec.key',
+        '25-macsec.netdev',
+        '25-macsec.network',
         '25-sit-tunnel-local-any.netdev',
         '25-sit-tunnel-remote-any.netdev',
         '25-sit-tunnel.netdev',
@@ -293,9 +310,12 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-vxlan.netdev',
         '25-wireguard-23-peers.netdev',
         '25-wireguard-23-peers.network',
+        '25-wireguard-preshared-key.txt',
         '25-wireguard-private-key.txt',
         '25-wireguard.netdev',
+        '25-wireguard.network',
         '6rd.network',
+        'erspan.network',
         'gre.network',
         'gretap.network',
         'gretun.network',
@@ -305,6 +325,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         'ipip.network',
         'ipvlan.network',
         'isatap.network',
+        'macsec.network',
         'macvlan.network',
         'macvtap.network',
         'sit.network',
@@ -320,11 +341,13 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         self.remove_unit_from_networkd_path(self.units)
 
     def test_dropin(self):
-        self.copy_unit_to_networkd_unit_path('10-dropin-test.netdev')
+        self.copy_unit_to_networkd_unit_path('10-dropin-test.netdev', '15-name-conflict-test.netdev')
         self.start_networkd()
 
         self.assertTrue(self.link_exits('dropin-test'))
 
+        # This also tests NetDev.Name= conflict and basic networkctl functionalities
+
         output = subprocess.check_output(['ip', 'link', 'show', 'dropin-test']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, '00:50:56:c0:00:28')
@@ -352,6 +375,22 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         else:
             print('ethtool does not support driver field at least for dummy interfaces, skipping test for Driver field of networkctl.')
 
+    def test_wait_online_any(self):
+        self.copy_unit_to_networkd_unit_path('25-bridge.netdev', '25-bridge.network', '11-dummy.netdev', '11-dummy.network')
+        self.start_networkd(0)
+
+        self.wait_online(['bridge99', 'test1:degraded'], bool_any=True)
+        self.assertTrue(self.link_exits('bridge99'))
+        self.assertTrue(self.link_exits('test1'))
+
+        output = subprocess.check_output(['networkctl', 'status', 'bridge99']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'State: (?:off|no-carrier) \(configuring\)')
+
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'State: degraded \(configured\)')
+
     def test_bridge(self):
         self.copy_unit_to_networkd_unit_path('25-bridge.netdev')
         self.start_networkd()
@@ -404,16 +443,16 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8')
         print(output)
-        self.assertTrue(output, ' mtu 2004 ')
+        self.assertRegex(output, ' mtu 2004 ')
 
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'vlan99']).rstrip().decode('utf-8')
         print(output)
-        self.assertTrue(output, ' mtu 2000 ')
-        self.assertTrue(output, 'REORDER_HDR')
-        self.assertTrue(output, 'LOOSE_BINDING')
-        self.assertTrue(output, 'GVRP')
-        self.assertTrue(output, 'MVRP')
-        self.assertTrue(output, ' id 99 ')
+        self.assertRegex(output, ' mtu 2000 ')
+        self.assertRegex(output, 'REORDER_HDR')
+        self.assertRegex(output, 'LOOSE_BINDING')
+        self.assertRegex(output, 'GVRP')
+        self.assertRegex(output, 'MVRP')
+        self.assertRegex(output, ' id 99 ')
 
         output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'test1']).rstrip().decode('utf-8')
         print(output)
@@ -439,11 +478,11 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8')
         print(output)
-        self.assertTrue(output, ' mtu 2000 ')
+        self.assertRegex(output, ' mtu 2000 ')
 
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macvlan99']).rstrip().decode('utf-8')
         print(output)
-        self.assertTrue(output, ' mtu 2000 ')
+        self.assertRegex(output, ' mtu 2000 ')
 
     @expectedFailureIfModuleIsNotAvailable('ipvlan')
     def test_ipvlan(self):
@@ -492,38 +531,37 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     @expectedFailureIfModuleIsNotAvailable('wireguard')
     def test_wireguard(self):
-        self.copy_unit_to_networkd_unit_path('25-wireguard.netdev')
-        self.start_networkd()
+        self.copy_unit_to_networkd_unit_path('25-wireguard.netdev', '25-wireguard.network',
+                                             '25-wireguard-23-peers.netdev', '25-wireguard-23-peers.network',
+                                             '25-wireguard-preshared-key.txt', '25-wireguard-private-key.txt')
+        self.start_networkd(0)
+        self.wait_online(['wg99:carrier', 'wg98:routable'])
+
+        self.assertTrue(self.link_exits('wg99'))
+        self.assertTrue(self.link_exits('wg98'))
 
         if shutil.which('wg'):
             subprocess.call('wg')
+
             output = subprocess.check_output(['wg', 'show', 'wg99', 'listen-port']).rstrip().decode('utf-8')
-            self.assertTrue(output, '51820')
+            self.assertRegex(output, '51820')
             output = subprocess.check_output(['wg', 'show', 'wg99', 'fwmark']).rstrip().decode('utf-8')
-            self.assertTrue(output, '0x4d2')
+            self.assertRegex(output, '0x4d2')
             output = subprocess.check_output(['wg', 'show', 'wg99', 'allowed-ips']).rstrip().decode('utf-8')
-            self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t192.168.26.0/24 fd31:bf08:57cb::/48')
+            self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=\t192.168.26.0/24 fd31:bf08:57cb::/48')
+            self.assertRegex(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc=\tfdbc:bae2:7871:e1fe:793:8636::/96 fdbc:bae2:7871:500:e1fe:793:8636:dad1/128')
             output = subprocess.check_output(['wg', 'show', 'wg99', 'persistent-keepalive']).rstrip().decode('utf-8')
-            self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t20')
+            self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=\t20')
             output = subprocess.check_output(['wg', 'show', 'wg99', 'endpoints']).rstrip().decode('utf-8')
-            self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t192.168.27.3:51820')
+            self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=\t192.168.27.3:51820')
             output = subprocess.check_output(['wg', 'show', 'wg99', 'private-key']).rstrip().decode('utf-8')
-            self.assertTrue(output, 'EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong=')
+            self.assertRegex(output, 'EEGlnEPYJV//kbvvIqxKkQwOiS\+UENyPncC4bF46ong=')
+            output = subprocess.check_output(['wg', 'show', 'wg99', 'preshared-keys']).rstrip().decode('utf-8')
+            self.assertRegex(output, 'RDf\+LSpeEre7YEIKaxg\+wbpsNV7du\+ktR99uBEtIiCA=  IIWIV17wutHv7t4cR6pOT91z6NSz/T8Arh0yaywhw3M=')
+            self.assertRegex(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc=     cPLOy1YUrEI0EMMIycPJmOo0aTu3RZnw8bL5meVD6m0=')
 
-        self.assertTrue(self.link_exits('wg99'))
-
-    @expectedFailureIfModuleIsNotAvailable('wireguard')
-    def test_wireguard_23_peers(self):
-        self.copy_unit_to_networkd_unit_path('25-wireguard-23-peers.netdev', '25-wireguard-23-peers.network',
-                                             '25-wireguard-private-key.txt')
-        self.start_networkd()
-
-        if shutil.which('wg'):
-            subprocess.call('wg')
             output = subprocess.check_output(['wg', 'show', 'wg98', 'private-key']).rstrip().decode('utf-8')
-            self.assertTrue(output, 'CJQUtcS9emY2fLYqDlpSZiE/QJyHkPWr+WHtZLZ90FU=')
-
-        self.assertTrue(self.link_exits('wg98'))
+            self.assertRegex(output, 'CJQUtcS9emY2fLYqDlpSZiE/QJyHkPWr\+WHtZLZ90FU=')
 
     def test_geneve(self):
         self.copy_unit_to_networkd_unit_path('25-geneve.netdev')
@@ -533,10 +571,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'geneve99']).rstrip().decode('utf-8')
         print(output)
-        self.assertTrue(output, '192.168.22.1')
-        self.assertTrue(output, '6082')
-        self.assertTrue(output, 'udpcsum')
-        self.assertTrue(output, 'udp6zerocsumrx')
+        self.assertRegex(output, '192.168.22.1')
+        self.assertRegex(output, '6082')
+        self.assertRegex(output, 'udpcsum')
+        self.assertRegex(output, 'udp6zerocsumrx')
 
     def test_ipip_tunnel(self):
         self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ipip-tunnel.netdev', 'ipip.network',
@@ -571,12 +609,24 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun99']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gre remote 10.65.223.239 local 10.65.223.238 dev dummy98')
+        self.assertRegex(output, 'ikey 1.2.3.103')
+        self.assertRegex(output, 'okey 1.2.4.103')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun98']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gre remote 10.65.223.239 local any dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.104')
+        self.assertRegex(output, 'okey 0.0.0.104')
+        self.assertNotRegex(output, 'iseq')
+        self.assertNotRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun97']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gre remote any local 10.65.223.238 dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.105')
+        self.assertRegex(output, 'okey 0.0.0.105')
+        self.assertNotRegex(output, 'iseq')
+        self.assertNotRegex(output, 'oseq')
 
     def test_ip6gre_tunnel(self):
         self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gre-tunnel.netdev', 'ip6gretun.network',
@@ -610,9 +660,17 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap99']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gretap remote 10.65.223.239 local 10.65.223.238 dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.106')
+        self.assertRegex(output, 'okey 0.0.0.106')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap98']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gretap remote 10.65.223.239 local any dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.107')
+        self.assertRegex(output, 'okey 0.0.0.107')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
 
     def test_ip6gretap_tunnel(self):
         self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gretap-tunnel.netdev', 'ip6gretap.network',
@@ -735,20 +793,29 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     @expectedFailureIfERSPANModuleIsNotAvailable()
     def test_erspan_tunnel(self):
-        self.copy_unit_to_networkd_unit_path('25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev')
+        self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'erspan.network',
+                                             '25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev')
         self.start_networkd()
 
+        self.assertTrue(self.link_exits('dummy98'))
         self.assertTrue(self.link_exits('erspan99'))
         self.assertTrue(self.link_exits('erspan98'))
 
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan99']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'erspan remote 172.16.1.100 local 172.16.1.200')
-        self.assertRegex(output, '101')
+        self.assertRegex(output, 'ikey 0.0.0.101')
+        self.assertRegex(output, 'okey 0.0.0.101')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan98']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'erspan remote 172.16.1.100 local any')
         self.assertRegex(output, '102')
+        self.assertRegex(output, 'ikey 0.0.0.102')
+        self.assertRegex(output, 'okey 0.0.0.102')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
 
     def test_tunnel_independent(self):
         self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev')
@@ -756,6 +823,43 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
         self.assertTrue(self.link_exits('ipiptun99'))
 
+    @expectedFailureIfModuleIsNotAvailable('fou')
+    def test_fou(self):
+        # The following redundant check is necessary for CentOS CI.
+        # Maybe, error handling in lookup_id() in sd-netlink/generic-netlink.c needs to be updated.
+        self.assertTrue(is_module_available('fou'))
+
+        self.copy_unit_to_networkd_unit_path('25-fou-ipproto-ipip.netdev', '25-fou-ipproto-gre.netdev',
+                                             '25-fou-ipip.netdev', '25-fou-sit.netdev',
+                                             '25-fou-gre.netdev', '25-fou-gretap.netdev')
+        self.start_networkd()
+
+        self.assertTrue(self.link_exits('ipiptun96'))
+        self.assertTrue(self.link_exits('sittun96'))
+        self.assertTrue(self.link_exits('gretun96'))
+        self.assertTrue(self.link_exits('gretap96'))
+
+        output = subprocess.check_output(['ip', 'fou', 'show']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'port 55555 ipproto 4')
+        self.assertRegex(output, 'port 55556 ipproto 47')
+
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipiptun96']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55555')
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'sittun96']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55555')
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun96']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'encap fou encap-sport 1001 encap-dport 55556')
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap96']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'encap fou encap-sport auto encap-dport 55556')
+
+        subprocess.call(['ip', 'fou', 'del', 'port', '55555'])
+        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()
@@ -775,6 +879,35 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'remcsumrx')
         self.assertRegex(output, 'gbp')
 
+    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')
+        self.start_networkd(0)
+
+        self.wait_online(['dummy98:degraded', 'macsec99:routable'])
+
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macsec99']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'macsec99@dummy98')
+        self.assertRegex(output, 'macsec sci [0-9a-f]*000b')
+        self.assertRegex(output, 'encrypt on')
+
+        output = subprocess.check_output(['ip', 'macsec', 'show', 'macsec99']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'encrypt on')
+        self.assertRegex(output, 'TXSC: [0-9a-f]*000b on SA 1')
+        self.assertRegex(output, '0: PN [0-9]*, state on, key 01000000000000000000000000000000')
+        self.assertRegex(output, '1: PN [0-9]*, state on, key 02030000000000000000000000000000')
+        self.assertRegex(output, 'RXSC: c619528fe6a00100, state on')
+        self.assertRegex(output, '0: PN [0-9]*, state on, key 02030405000000000000000000000000')
+        self.assertRegex(output, '1: PN [0-9]*, state on, key 02030405060000000000000000000000')
+        self.assertRegex(output, '2: PN [0-9]*, state off, key 02030405060700000000000000000000')
+        self.assertRegex(output, '3: PN [0-9]*, state off, key 02030405060708000000000000000000')
+        self.assertNotRegex(output, 'key 02030405067080900000000000000000')
+        self.assertRegex(output, 'RXSC: 8c16456c83a90002, state on')
+        self.assertRegex(output, '0: PN [0-9]*, state off, key 02030400000000000000000000000000')
+
+
 class NetworkdL2TPTests(unittest.TestCase, Utilities):
 
     links =[
@@ -868,9 +1001,6 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         '11-dummy.netdev',
         '12-dummy.netdev',
         '23-active-slave.network',
-        '23-bond199.network',
-        '23-primary-slave.network',
-        '23-test1-bond199.network',
         '25-address-link-section.network',
         '25-address-preferred-lifetime-zero-ipv6.network',
         '25-address-static.network',
@@ -883,13 +1013,8 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         '25-link-local-addressing-no.network',
         '25-link-local-addressing-yes.network',
         '25-link-section-unmanaged.network',
-        '25-route-gateway.network',
-        '25-route-gateway-on-link.network',
         '25-route-ipv6-src.network',
-        '25-route-reverse-order.network',
-        '25-route-section.network',
-        '25-route-tcp-window-settings.network',
-        '25-route-type.network',
+        '25-route-static.network',
         '25-sysctl-disable-ipv6.network',
         '25-sysctl.network',
         'configure-without-carrier.network',
@@ -967,28 +1092,6 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         self.assertRegex(output, '192.168.0.1')
         self.assertRegex(output, 'routable')
 
-    def test_bond_active_slave(self):
-        self.copy_unit_to_networkd_unit_path('23-active-slave.network', '23-bond199.network', '25-bond-active-backup-slave.netdev', '12-dummy.netdev')
-        self.start_networkd()
-
-        self.assertTrue(self.link_exits('dummy98'))
-        self.assertTrue(self.link_exits('bond199'))
-
-        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199']).rstrip().decode('utf-8')
-        print(output)
-        self.assertRegex(output, 'active_slave dummy98')
-
-    def test_bond_primary_slave(self):
-        self.copy_unit_to_networkd_unit_path('23-primary-slave.network', '23-test1-bond199.network', '25-bond-active-backup-slave.netdev', '11-dummy.netdev')
-        self.start_networkd()
-
-        self.assertTrue(self.link_exits('test1'))
-        self.assertTrue(self.link_exits('bond199'))
-
-        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199']).rstrip().decode('utf-8')
-        print(output)
-        self.assertRegex(output, 'primary test1')
-
     def test_routing_policy_rule(self):
         self.copy_unit_to_networkd_unit_path('routing-policy-rule-test1.network', '11-dummy.netdev')
 
@@ -1074,100 +1177,46 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
 
         subprocess.call(['ip', 'rule', 'del', 'table', '7'])
 
-    def test_ip_route(self):
-        self.copy_unit_to_networkd_unit_path('25-route-section.network', '12-dummy.netdev')
-        self.start_networkd()
-
-        self.assertTrue(self.link_exits('dummy98'))
-
-        output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'dummy98']).rstrip().decode('utf-8')
-        print(output)
-        self.assertRegex(output, '192.168.0.1')
-        self.assertRegex(output, 'static')
-        self.assertRegex(output, '192.168.0.0/24')
-
-    def test_ip_route_reverse(self):
-        self.copy_unit_to_networkd_unit_path('25-route-reverse-order.network', '12-dummy.netdev')
-        self.start_networkd()
+    def test_route_static(self):
+        self.copy_unit_to_networkd_unit_path('25-route-static.network', '12-dummy.netdev')
+        self.start_networkd(0)
 
-        self.assertTrue(self.link_exits('dummy98'))
+        self.wait_online(['dummy98:routable'])
 
         output = subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8')
         print(output)
-        self.assertRegex(output, '2001:1234:5:8fff:ff:ff:ff:ff')
-        self.assertRegex(output, '2001:1234:5:8f63::1')
-
-    def test_ip_route_blackhole_unreachable_prohibit(self):
-        self.copy_unit_to_networkd_unit_path('25-route-type.network', '12-dummy.netdev')
-        self.start_networkd()
-
-        self.assertTrue(self.link_exits('dummy98'))
-
-        output = subprocess.check_output(['ip', 'route', 'list']).rstrip().decode('utf-8')
-        print(output)
-        self.assertRegex(output, 'blackhole')
-        self.assertRegex(output, 'unreachable')
-        self.assertRegex(output, 'prohibit')
-
-        subprocess.call(['ip', 'route', 'del', 'blackhole', '202.54.1.2'])
-        subprocess.call(['ip', 'route', 'del', 'unreachable', '202.54.1.3'])
-        subprocess.call(['ip', 'route', 'del', 'prohibit', '202.54.1.4'])
+        self.assertRegex(output, '2001:1234:5:8fff:ff:ff:ff:ff proto static')
+        self.assertRegex(output, '2001:1234:5:8f63::1 proto kernel')
 
-    def test_ip_route_tcp_window(self):
-        self.copy_unit_to_networkd_unit_path('25-route-tcp-window-settings.network', '11-dummy.netdev')
-        self.start_networkd()
-
-        self.assertTrue(self.link_exits('test1'))
+        output = subprocess.check_output(['ip', '-6', 'route', 'show', 'dev', 'dummy98', 'default']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'default via 2001:1234:5:8fff:ff:ff:ff:ff proto static metric 1024 pref medium')
 
-        output = subprocess.check_output(['ip', 'route', 'list']).rstrip().decode('utf-8')
+        output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8')
         print(output)
-        self.assertRegex(output, 'initcwnd 20')
-        self.assertRegex(output, 'initrwnd 30')
+        self.assertRegex(output, '149.10.124.48/28 proto kernel scope link src 149.10.124.58')
+        self.assertRegex(output, '149.10.124.64 proto static scope link')
+        self.assertRegex(output, '192.168.1.1 proto static initcwnd 20')
+        self.assertRegex(output, '192.168.1.2 proto static initrwnd 30')
 
-    def test_ip_route_gateway(self):
-        self.copy_unit_to_networkd_unit_path('25-route-gateway.network', '12-dummy.netdev')
-        self.start_networkd()
-
-        self.assertTrue(self.link_exits('dummy98'))
+        output = subprocess.check_output(['ip', '-4', 'route', 'show', 'dev', 'dummy98', 'default']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'default via 149.10.125.65 proto static onlink')
+        self.assertRegex(output, 'default via 149.10.124.64 proto static')
 
-        output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'dummy98', 'default']).rstrip().decode('utf-8')
+        output = subprocess.check_output(['ip', 'route', 'show', 'type', 'blackhole']).rstrip().decode('utf-8')
         print(output)
-        self.assertRegex(output, 'default')
-        self.assertRegex(output, 'via')
-        self.assertRegex(output, '149.10.124.64')
-        self.assertRegex(output, 'proto')
-        self.assertRegex(output, 'static')
+        self.assertRegex(output, 'blackhole 202.54.1.2 proto static')
 
-        output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'dummy98', 'src', '149.10.124.58']).rstrip().decode('utf-8')
+        output = subprocess.check_output(['ip', 'route', 'show', 'type', 'unreachable']).rstrip().decode('utf-8')
         print(output)
-        self.assertRegex(output, '149.10.124.48/28')
-        self.assertRegex(output, 'proto')
-        self.assertRegex(output, 'kernel')
-        self.assertRegex(output, 'scope')
-        self.assertRegex(output, 'link')
-
-    def test_ip_route_gateway_on_link(self):
-        self.copy_unit_to_networkd_unit_path('25-route-gateway-on-link.network', '12-dummy.netdev')
-        self.start_networkd()
+        self.assertRegex(output, 'unreachable 202.54.1.3 proto static')
 
-        self.assertTrue(self.link_exits('dummy98'))
-
-        output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'dummy98', 'default']).rstrip().decode('utf-8')
+        output = subprocess.check_output(['ip', 'route', 'show', 'type', 'prohibit']).rstrip().decode('utf-8')
         print(output)
-        self.assertRegex(output, 'default')
-        self.assertRegex(output, 'via')
-        self.assertRegex(output, '149.10.125.65')
-        self.assertRegex(output, 'proto')
-        self.assertRegex(output, 'static')
-        self.assertRegex(output, 'onlink')
+        self.assertRegex(output, 'prohibit 202.54.1.4 proto static')
 
-        output = subprocess.check_output(['ip', 'route', 'list', 'dev', 'dummy98', 'src', '149.10.124.58']).rstrip().decode('utf-8')
-        print(output)
-        self.assertRegex(output, '149.10.124.48/28')
-        self.assertRegex(output, 'proto')
-        self.assertRegex(output, 'kernel')
-        self.assertRegex(output, 'scope')
-        self.assertRegex(output, 'link')
+        subprocess.call(['ip', 'route', 'del', 'blackhole', '202.54.1.2'])
+        subprocess.call(['ip', 'route', 'del', 'unreachable', '202.54.1.3'])
+        subprocess.call(['ip', 'route', 'del', 'prohibit', '202.54.1.4'])
 
     def test_ip_route_ipv6_src_route(self):
         # a dummy device does not make the addresses go through tentative state, so we
@@ -1229,13 +1278,12 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
     def test_link_local_addressing(self):
         self.copy_unit_to_networkd_unit_path('25-link-local-addressing-yes.network', '11-dummy.netdev',
                                              '25-link-local-addressing-no.network', '12-dummy.netdev')
-        self.start_networkd()
+        self.start_networkd(0)
+        self.wait_online(['test1:degraded', 'dummy98:carrier'])
 
         self.assertTrue(self.link_exits('test1'))
         self.assertTrue(self.link_exits('dummy98'))
 
-        time.sleep(10)
-
         output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'test1']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'inet .* scope link')
@@ -1281,14 +1329,15 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
             test1_addr_gen_mode = '0'
 
         if os.path.exists(os.path.join(os.path.join(network_sysctl_ipv6_path, 'test1'), 'addr_gen_mode')):
-            self.assertEqual(self.read_ipv6_sysctl_attr('test1', 'addr_gen_mode'), '0')
+            self.assertEqual(self.read_ipv6_sysctl_attr('test1', 'addr_gen_mode'), test1_addr_gen_mode)
 
         if os.path.exists(os.path.join(os.path.join(network_sysctl_ipv6_path, 'dummy98'), 'addr_gen_mode')):
             self.assertEqual(self.read_ipv6_sysctl_attr('dummy98', 'addr_gen_mode'), '1')
 
     def test_sysctl(self):
         self.copy_unit_to_networkd_unit_path('25-sysctl.network', '12-dummy.netdev')
-        self.start_networkd()
+        self.start_networkd(0)
+        self.wait_online(['dummy98:degraded'])
 
         self.assertTrue(self.link_exits('dummy98'))
 
@@ -1307,7 +1356,8 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         self.assertEqual(subprocess.call(['sysctl', 'net.ipv6.conf.all.disable_ipv6=1']), 0)
         self.assertEqual(subprocess.call(['sysctl', 'net.ipv6.conf.default.disable_ipv6=1']), 0)
 
-        self.start_networkd()
+        self.start_networkd(0)
+        self.wait_online(['dummy98:routable'])
 
         self.assertTrue(self.link_exits('dummy98'))
 
@@ -1326,7 +1376,8 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         self.assertEqual(subprocess.call(['sysctl', 'net.ipv6.conf.all.disable_ipv6=0']), 0)
         self.assertEqual(subprocess.call(['sysctl', 'net.ipv6.conf.default.disable_ipv6=0']), 0)
 
-        self.start_networkd()
+        self.start_networkd(0)
+        self.wait_online(['dummy98:routable'])
 
         self.assertTrue(self.link_exits('dummy98'))
 
@@ -1396,6 +1447,7 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
 
 class NetworkdNetWorkBondTests(unittest.TestCase, Utilities):
     links = [
+        'bond199',
         'bond99',
         'dummy98',
         'test1']
@@ -1403,6 +1455,11 @@ class NetworkdNetWorkBondTests(unittest.TestCase, Utilities):
     units = [
         '11-dummy.netdev',
         '12-dummy.netdev',
+        '23-active-slave.network',
+        '23-bond199.network',
+        '23-primary-slave.network',
+        '23-test1-bond199.network',
+        '25-bond-active-backup-slave.netdev',
         '25-bond.netdev',
         'bond99.network',
         'bond-slave.network']
@@ -1414,6 +1471,28 @@ class NetworkdNetWorkBondTests(unittest.TestCase, Utilities):
         self.link_remove(self.links)
         self.remove_unit_from_networkd_path(self.units)
 
+    def test_bond_active_slave(self):
+        self.copy_unit_to_networkd_unit_path('23-active-slave.network', '23-bond199.network', '25-bond-active-backup-slave.netdev', '12-dummy.netdev')
+        self.start_networkd()
+
+        self.assertTrue(self.link_exits('dummy98'))
+        self.assertTrue(self.link_exits('bond199'))
+
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'active_slave dummy98')
+
+    def test_bond_primary_slave(self):
+        self.copy_unit_to_networkd_unit_path('23-primary-slave.network', '23-test1-bond199.network', '25-bond-active-backup-slave.netdev', '11-dummy.netdev')
+        self.start_networkd()
+
+        self.assertTrue(self.link_exits('test1'))
+        self.assertTrue(self.link_exits('bond199'))
+
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'bond199']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'primary test1')
+
     def test_bond_operstate(self):
         self.copy_unit_to_networkd_unit_path('25-bond.netdev', '11-dummy.netdev', '12-dummy.netdev',
                                              'bond99.network','bond-slave.network')
@@ -1970,7 +2049,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities):
         print(output)
         self.assertRegex(output, '192.168.5.*')
 
-        # Stoping dnsmasq as networkd won't be allowed to renew the DHCP lease.
+        # Stopping dnsmasq as networkd won't be allowed to renew the DHCP lease.
         self.stop_dnsmasq(dnsmasq_pid_file)
 
         # Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120