Merge pull request #20778 from yuwata/network-ipv6-token

network: rework IPv6 address generation mode
2021-10-07 23:24:00 +09:00
parent 17175882d7 fe2a8b3d3f
commit 6830c3a553
22 changed files with 1081 additions and 840 deletions
@@ -247,6 +247,7 @@ PreferredLifetimeSec=
 AddressAutoconfiguration=
 ValidLifetimeSec=
 Assign=
+Token=
 RouteMetric=
 [IPv6RoutePrefix]
 Route=
@@ -359,6 +360,7 @@ RouteAllowList=
 RouteDenyList=
 DenyList=
 BlackList=
+Token=
 [DHCPServer]
 EmitNTP=
 PoolSize=
@@ -3,4 +3,6 @@ Name=veth99

 [Network]
 IPv6AcceptRA=true
-IPv6Token=prefixstable
+
+[IPv6AcceptRA]
+Token=prefixstable
@@ -3,4 +3,6 @@ Name=veth99

 [Network]
 IPv6AcceptRA=true
-IPv6Token=prefixstable:2002:da8:1::
+
+[IPv6AcceptRA]
+Token=prefixstable:2002:da8:1::
@@ -3,8 +3,10 @@ Name=veth99

 [Network]
 IPv6AcceptRA=true
-IPv6Token=::1a:2b:3c:4d
-IPv6Token=static:::fa:de:ca:fe
-IPv6Token=::1a:2b:3c:4d
-IPv6Token=static:::1a:2b:3c:4d
-IPv6Token=::fa:de:ca:fe
+
+[IPv6AcceptRA]
+Token=::1a:2b:3c:4d
+Token=static:::fa:de:ca:fe
+Token=::1a:2b:3c:4d
+Token=static:::1a:2b:3c:4d
+Token=::fa:de:ca:fe
@@ -14,6 +14,8 @@ Prefix=2001:db8:0:1::/64
 [IPv6Prefix]
 Prefix=2001:db8:0:2::/64
 Assign=yes
+Token=::1a:2b:3c:4d
+Token=static:::fa:de:ca:fe

 [IPv6Prefix]
 Prefix=2001:db8:0:3::/64
@@ -4895,7 +4895,8 @@ class NetworkdIPv6PrefixTests(unittest.TestCase, Utilities):
        output = check_output('ip address show dev veth99')
        print(output)
        self.assertNotIn('inet6 2001:db8:0:1:', output)
-        self.assertIn('inet6 2001:db8:0:2:', output)
+        self.assertIn('inet6 2001:db8:0:2:1a:2b:3c:4d', output)
+        self.assertIn('inet6 2001:db8:0:2:fa:de:ca:fe', output)
        self.assertNotIn('inet6 2001:db8:0:3:', output)

        output = check_output(*resolvectl_cmd, 'dns', 'veth-peer', env=env)