From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 13 Nov 2021 06:52:03 +0000 (+0900)
Subject: test-network: add testcases for Token=prefixstable with UUID
X-Git-Tag: v250-rc1~264^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a2e124b085138bc34b6d2a156f706586b928d61;p=thirdparty%2Fsystemd.git

test-network: add testcases for Token=prefixstable with UUID
---

diff --git a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network b/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network
index 7613a8258d0..eda4ce19153 100644
--- a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network
+++ b/test/test-network/conf/ipv6-prefix-veth-token-prefixstable-without-address.network
@@ -7,3 +7,4 @@ IPv6AcceptRA=true
 
 [IPv6AcceptRA]
 Token=prefixstable
+Token=prefixstable,86b123b969ba4b7eb8b3d8605123525a
diff --git a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network b/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network
index 02056d335b5..ac507004014 100644
--- a/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network
+++ b/test/test-network/conf/ipv6-prefix-veth-token-prefixstable.network
@@ -7,7 +7,12 @@ IPv6AcceptRA=true
 
 [IPv6AcceptRA]
 Token=prefixstable:2002:da8:1::
+Token=prefixstable:2002:da8:1::,86b123b969ba4b7eb8b3d8605123525a
 # invalid tokens
+Token=prefixstable:2002:da8:1::,00000000000000000000000000000000
+Token=prefixstable:2002:da8:1::,
+Token=prefixstable,00000000000000000000000000000000
+Token=prefixstable,
 Token=prefixstable@
 Token=static
 Token=static:
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index a68055086c8..58ca5b54461 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -3951,8 +3951,8 @@ class NetworkdRATests(unittest.TestCase, Utilities):
 
         output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env)
         print(output)
-        self.assertRegex(output, '2002:da8:1:0')
-        self.assertRegex(output, '2002:da8:2:0.*78:9abc') # EUI
+        self.assertIn('2002:da8:1:0:b47e:7975:fc7a:7d6e', output)
+        self.assertIn('2002:da8:2:0:1034:56ff:fe78:9abc', output) # EUI64
 
     def test_ipv6_token_prefixstable_without_address(self):
         copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix.network', 'ipv6-prefix-veth-token-prefixstable-without-address.network')
@@ -3961,8 +3961,8 @@ class NetworkdRATests(unittest.TestCase, Utilities):
 
         output = check_output(*networkctl_cmd, '-n', '0', 'status', 'veth99', env=env)
         print(output)
-        self.assertRegex(output, '2002:da8:1:0')
-        self.assertRegex(output, '2002:da8:2:0')
+        self.assertIn('2002:da8:1:0:b47e:7975:fc7a:7d6e', output)
+        self.assertIn('2002:da8:2:0:f689:561a:8eda:7443', output)
 
 class NetworkdDHCPServerTests(unittest.TestCase, Utilities):
     links = [