diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-10-23 05:57:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 05:57:58 +0200 |
| commit | 9c914c0401546a67079a22c4a928814bd645b0a5 (patch) | |
| tree | b33772ffbba60d3642c595d5514a567a3c100ac7 /test | |
| parent | network: move set-MAC and set-nomaster operations out of link_up() (diff) | |
| parent | test-network: use new IPv6SendRA= setting (diff) | |
| download | systemd-9c914c0401546a67079a22c4a928814bd645b0a5.tar.xz systemd-9c914c0401546a67079a22c4a928814bd645b0a5.zip | |
Merge pull request #17357 from yuwata/network-dhcp6-pd-announce-17353
network: add an option to control announcement of delegated prefix
Diffstat (limited to 'test')
| -rw-r--r-- | test/fuzz/fuzz-network-parser/directives.network | 15 | ||||
| -rw-r--r-- | test/test-network/conf/ipv6-prefix.network | 4 | ||||
| -rw-r--r-- | test/test-network/conf/ipv6ra-prefix.network | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network index 1494daa0c1..cb0c3205a0 100644 --- a/test/fuzz/fuzz-network-parser/directives.network +++ b/test/fuzz/fuzz-network-parser/directives.network @@ -137,6 +137,7 @@ SendVendorOption= RouteMetric= [DHCPv6PrefixDelegation] SubnetId= +Announce= Assign= Token= [Route] @@ -190,6 +191,7 @@ DNSOverTLS= Bond= IPv6ProxyNDP= DNS= +DNSDefaultRoute= ActiveSlave= LLMNR= DNSSEC= @@ -207,6 +209,7 @@ ConfigureWithoutCarrier= NTP= DHCP= Domains= +IPv6SendRA= IPv6PrefixDelegation= VLAN= DHCPServer= @@ -214,6 +217,7 @@ BindCarrier= VRF= IgnoreCarrierLoss= KeepConfiguration= +DHCPv6PrefixDelegation= [IPv6Prefix] Prefix= OnLink= @@ -270,11 +274,20 @@ InvertRule= Family= SuppressPrefixLength= User= +[IPv6SendRA] +RouterPreference= +DNSLifetimeSec= +DNS= +RouterLifetimeSec= +Domains= +EmitDNS= +EmitDomains= +Managed= +OtherInformation= [IPv6PrefixDelegation] RouterPreference= DNSLifetimeSec= DNS= -DNSDefaultRoute= RouterLifetimeSec= Domains= EmitDNS= diff --git a/test/test-network/conf/ipv6-prefix.network b/test/test-network/conf/ipv6-prefix.network index 9de0e3147b..aec1d1b2c3 100644 --- a/test/test-network/conf/ipv6-prefix.network +++ b/test/test-network/conf/ipv6-prefix.network @@ -2,9 +2,9 @@ Name=veth-peer [Network] -IPv6PrefixDelegation=yes +IPv6SendRA=yes -[IPv6PrefixDelegation] +[IPv6SendRA] DNS=_link_local 2002:da8:1:0::1 DNSLifetimeSec=1min diff --git a/test/test-network/conf/ipv6ra-prefix.network b/test/test-network/conf/ipv6ra-prefix.network index 9dc32cb4da..a0ac1e4537 100644 --- a/test/test-network/conf/ipv6ra-prefix.network +++ b/test/test-network/conf/ipv6ra-prefix.network @@ -3,7 +3,7 @@ Name=veth99 [Network] DHCP=no -IPv6PrefixDelegation=yes +IPv6SendRA=yes [IPv6Prefix] Prefix=2001:db8:0:1::/64 |