From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 1 Feb 2022 04:26:40 +0000 (+0900)
Subject: test-network: set xfrm interface ID
X-Git-Tag: v251-rc1~394^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=020483b248b45b15eb93d2ae322d7f211c61e44d;p=thirdparty%2Fsystemd.git

test-network: set xfrm interface ID

This also unifies two tests for xfrm, and checks the output of
'ip link' command.

Fixes #22329.
---

diff --git a/test/test-network/conf/25-xfrm-independent.netdev b/test/test-network/conf/25-xfrm-independent.netdev
index b2378849d16..b54c659d833 100644
--- a/test/test-network/conf/25-xfrm-independent.netdev
+++ b/test/test-network/conf/25-xfrm-independent.netdev
@@ -4,4 +4,5 @@ Kind=xfrm
 Name=xfrm99
 
 [Xfrm]
+InterfaceId=0x99
 Independent=yes
diff --git a/test/test-network/conf/25-xfrm.netdev b/test/test-network/conf/25-xfrm.netdev
index 353bfb70037..8e1d5c81221 100644
--- a/test/test-network/conf/25-xfrm.netdev
+++ b/test/test-network/conf/25-xfrm.netdev
@@ -1,4 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [NetDev]
 Kind=xfrm
-Name=xfrm99
+Name=xfrm98
+
+[Xfrm]
+InterfaceId=0x98
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 0cc9cfa96b0..ea1811bbfdd 100644
--- a/test/test-network/conf/netdev-link-local-addressing-yes.network
+++ b/test/test-network/conf/netdev-link-local-addressing-yes.network
@@ -18,7 +18,7 @@ Name=geneve99
 Name=ifb99
 Name=ipiptun99
 Name=nlmon99
-Name=xfrm99
+Name=xfrm98 xfrm99
 Name=vxlan98
 Name=hogehogehogehogehogehoge
 
diff --git a/test/test-network/conf/xfrm.network b/test/test-network/conf/xfrm.network
index c8526017335..19f22146f8a 100644
--- a/test/test-network/conf/xfrm.network
+++ b/test/test-network/conf/xfrm.network
@@ -4,4 +4,4 @@ Name=dummy98
 
 [Network]
 IPv6AcceptRA=no
-Xfrm=xfrm99
+Xfrm=xfrm98
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index ba161703935..885aaad77a4 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -886,6 +886,7 @@ class NetworkctlTests(unittest.TestCase, Utilities):
 class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     links_remove_earlier = [
+        'xfrm98',
         'xfrm99',
     ]
 
@@ -1797,20 +1798,21 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
     @expectedFailureIfModuleIsNotAvailable('xfrm_interface')
     def test_xfrm(self):
         copy_unit_to_networkd_unit_path('12-dummy.netdev', 'xfrm.network',
-                                        '25-xfrm.netdev', 'netdev-link-local-addressing-yes.network')
+                                        '25-xfrm.netdev', '25-xfrm-independent.netdev',
+                                        'netdev-link-local-addressing-yes.network')
         start_networkd()
 
-        self.wait_online(['xfrm99:degraded', 'dummy98:degraded'])
+        self.wait_online(['dummy98:degraded', 'xfrm98:degraded', 'xfrm99:degraded'])
 
-        output = check_output('ip link show dev xfrm99')
+        output = check_output('ip -d link show dev xfrm98')
         print(output)
+        self.assertIn('xfrm98@dummy98:', output)
+        self.assertIn('xfrm if_id 0x98 ', output)
 
-    @expectedFailureIfModuleIsNotAvailable('xfrm_interface')
-    def test_xfrm_independent(self):
-        copy_unit_to_networkd_unit_path('25-xfrm-independent.netdev', 'netdev-link-local-addressing-yes.network')
-        start_networkd()
-
-        self.wait_online(['xfrm99:degraded'])
+        output = check_output('ip -d link show dev xfrm99')
+        print(output)
+        self.assertIn('xfrm99@lo:', output)
+        self.assertIn('xfrm if_id 0x99 ', output)
 
     @expectedFailureIfModuleIsNotAvailable('fou')
     def test_fou(self):