test-network: drop 25-nlmon.network

diff --git a/test/test-network/conf/25-nlmon.network b/test/test-network/conf/25-nlmon.network
deleted file mode 100644 (file)
index 8247f65..0000000
--- a/test/test-network/conf/25-nlmon.network
+++ /dev/null
@@ -1,6 +0,0 @@
-[Match]
-Name=nlmon99
-
-[Network]
-LinkLocalAddressing=yes
-IPv6AcceptRA=no

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 2e874249a29203b165cb7851b64dc2547da69401..b76bfb3bd3bfcdf8509d205fa45068c80e35f6fb 100644 (file)
--- a/test/test-network/conf/netdev-link-local-addressing-yes.network
+++ b/test/test-network/conf/netdev-link-local-addressing-yes.network
@@ -11,6 +11,7 @@ Name=vxcan-peer
 Name=vrf99
 Name=geneve99
 Name=ipiptun99
+Name=nlmon99
 
 [Network]
 LinkLocalAddressing=yes

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index cd99e5787a5328cc40f35c237954522fcac08468..01db342eafe3354f39d333202d17111db9df5f4e 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -346,7 +346,6 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-macsec.netdev',
         '25-macsec.network',
         '25-nlmon.netdev',
-        '25-nlmon.network',
         '25-sit-tunnel-local-any.netdev',
         '25-sit-tunnel-remote-any.netdev',
         '25-sit-tunnel.netdev',
@@ -1008,7 +1007,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         self.assertRegex(output, '0: PN [0-9]*, state off, key 02030400000000000000000000000000')
 
     def test_nlmon(self):
-        self.copy_unit_to_networkd_unit_path('25-nlmon.netdev', '25-nlmon.network')
+        self.copy_unit_to_networkd_unit_path('25-nlmon.netdev', 'netdev-link-local-addressing-yes.network')
         self.start_networkd()
 
         self.wait_online(['nlmon99:carrier'])