From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 8 Jul 2020 06:56:47 +0000 (+0900)
Subject: test-network: set IPv6AcceptRA=no if no dynamic addresses are not required
X-Git-Tag: v246-rc2~67^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=491b79aeac323909e8cef60ba6e91e27fd731679;p=thirdparty%2Fsystemd.git

test-network: set IPv6AcceptRA=no if no dynamic addresses are not required
---

diff --git a/test/test-network/conf/23-bond199.network b/test/test-network/conf/23-bond199.network
index 31e5d12f750..cad65115664 100644
--- a/test/test-network/conf/23-bond199.network
+++ b/test/test-network/conf/23-bond199.network
@@ -1,2 +1,5 @@
 [Match]
 Name=bond199
+
+[Network]
+IPv6AcceptRA=no
diff --git a/test/test-network/conf/23-emit-lldp.network b/test/test-network/conf/23-emit-lldp.network
index de35045388c..9edaf871b4c 100644
--- a/test/test-network/conf/23-emit-lldp.network
+++ b/test/test-network/conf/23-emit-lldp.network
@@ -2,4 +2,5 @@
 Name=veth-peer
 
 [Network]
+IPv6AcceptRA=no
 EmitLLDP=yes
diff --git a/test/test-network/conf/24-keep-configuration-static.network b/test/test-network/conf/24-keep-configuration-static.network
index 0c65a1d9e2e..7602927d818 100644
--- a/test/test-network/conf/24-keep-configuration-static.network
+++ b/test/test-network/conf/24-keep-configuration-static.network
@@ -2,4 +2,5 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 KeepConfiguration=static
diff --git a/test/test-network/conf/24-lldp.network b/test/test-network/conf/24-lldp.network
index fbdfb1b6728..84723138f21 100644
--- a/test/test-network/conf/24-lldp.network
+++ b/test/test-network/conf/24-lldp.network
@@ -2,4 +2,5 @@
 Name=veth99
 
 [Network]
+IPv6AcceptRA=no
 LLDP=yes
diff --git a/test/test-network/conf/24-search-domain.network b/test/test-network/conf/24-search-domain.network
index 124af438a3d..5c37d2f61f5 100644
--- a/test/test-network/conf/24-search-domain.network
+++ b/test/test-network/conf/24-search-domain.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Address=192.168.42.100/24
 DNS=192.168.42.1
 Domains= one two three four five six seven eight nine ten
diff --git a/test/test-network/conf/25-address-link-section.network b/test/test-network/conf/25-address-link-section.network
index 759e83c3256..d6ab3402714 100644
--- a/test/test-network/conf/25-address-link-section.network
+++ b/test/test-network/conf/25-address-link-section.network
@@ -3,3 +3,6 @@ Name=dummy98
 
 [Link]
 MACAddress=00:01:02:aa:bb:cc
+
+[Network]
+IPv6AcceptRA=no
diff --git a/test/test-network/conf/25-address-preferred-lifetime-zero.network b/test/test-network/conf/25-address-preferred-lifetime-zero.network
index a1e76051031..d3d02d282fb 100644
--- a/test/test-network/conf/25-address-preferred-lifetime-zero.network
+++ b/test/test-network/conf/25-address-preferred-lifetime-zero.network
@@ -2,6 +2,8 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
+
 # these lines are ignored
 Address=hogehoge
 Address=foofoo
diff --git a/test/test-network/conf/25-fibrule-invert.network b/test/test-network/conf/25-fibrule-invert.network
index bcca0c27abe..b8b368fe5aa 100644
--- a/test/test-network/conf/25-fibrule-invert.network
+++ b/test/test-network/conf/25-fibrule-invert.network
@@ -1,6 +1,9 @@
 [Match]
 Name=test1
 
+[Network]
+IPv6AcceptRA=no
+
 [RoutingPolicyRule]
 TypeOfService=0x08
 Table=7
diff --git a/test/test-network/conf/25-fibrule-port-range.network b/test/test-network/conf/25-fibrule-port-range.network
index 36646ec0ff0..77874b34405 100644
--- a/test/test-network/conf/25-fibrule-port-range.network
+++ b/test/test-network/conf/25-fibrule-port-range.network
@@ -1,6 +1,9 @@
 [Match]
 Name=test1
 
+[Network]
+IPv6AcceptRA=no
+
 [RoutingPolicyRule]
 TypeOfService=0x08
 Table=7
diff --git a/test/test-network/conf/25-fibrule-uidrange.network b/test/test-network/conf/25-fibrule-uidrange.network
index f42dfee3256..44716e396a0 100644
--- a/test/test-network/conf/25-fibrule-uidrange.network
+++ b/test/test-network/conf/25-fibrule-uidrange.network
@@ -1,6 +1,9 @@
 [Match]
 Name=test1
 
+[Network]
+IPv6AcceptRA=no
+
 [RoutingPolicyRule]
 TypeOfService=0x08
 Table=7
diff --git a/test/test-network/conf/25-gateway-next-static.network b/test/test-network/conf/25-gateway-next-static.network
index dfac8f48cdb..908e58881ef 100644
--- a/test/test-network/conf/25-gateway-next-static.network
+++ b/test/test-network/conf/25-gateway-next-static.network
@@ -2,5 +2,6 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Address=149.10.124.58/28
 Gateway=149.10.124.60
diff --git a/test/test-network/conf/25-gateway-static.network b/test/test-network/conf/25-gateway-static.network
index 448a21f2b9b..1ea184fa2ff 100644
--- a/test/test-network/conf/25-gateway-static.network
+++ b/test/test-network/conf/25-gateway-static.network
@@ -2,5 +2,6 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Address=149.10.124.58/28
 Gateway=149.10.124.59
diff --git a/test/test-network/conf/25-ipv6-address-label-section.network b/test/test-network/conf/25-ipv6-address-label-section.network
index 945b7dcc453..0742ad58494 100644
--- a/test/test-network/conf/25-ipv6-address-label-section.network
+++ b/test/test-network/conf/25-ipv6-address-label-section.network
@@ -1,6 +1,9 @@
 [Match]
 Name=dummy98
 
+[Network]
+IPv6AcceptRA=no
+
 [IPv6AddressLabel]
 Label=4444
 Prefix=2004:da8:1:0::/64
diff --git a/test/test-network/conf/25-route-vrf.network b/test/test-network/conf/25-route-vrf.network
index e786066d3ff..038dff21aa4 100644
--- a/test/test-network/conf/25-route-vrf.network
+++ b/test/test-network/conf/25-route-vrf.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 VRF=vrf99
 Address=192.168.100.2/24
 Gateway=192.168.100.1
diff --git a/test/test-network/conf/25-vrf.network b/test/test-network/conf/25-vrf.network
index 42ce5b19252..d47ecf07896 100644
--- a/test/test-network/conf/25-vrf.network
+++ b/test/test-network/conf/25-vrf.network
@@ -1,2 +1,5 @@
 [Match]
 Name=vrf99
+
+[Network]
+IPv6AcceptRA=no
diff --git a/test/test-network/conf/6rd.network b/test/test-network/conf/6rd.network
index 84e5af0ff03..96bd561ff90 100644
--- a/test/test-network/conf/6rd.network
+++ b/test/test-network/conf/6rd.network
@@ -2,4 +2,5 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=sittun99
diff --git a/test/test-network/conf/erspan.network b/test/test-network/conf/erspan.network
index 49364c506c7..d1a88cdaaf2 100644
--- a/test/test-network/conf/erspan.network
+++ b/test/test-network/conf/erspan.network
@@ -2,5 +2,6 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=erspan99
 Tunnel=erspan98
diff --git a/test/test-network/conf/gretap.network b/test/test-network/conf/gretap.network
index 1493fcf2b01..1deaab45d6a 100644
--- a/test/test-network/conf/gretap.network
+++ b/test/test-network/conf/gretap.network
@@ -2,5 +2,6 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=gretap99
 Tunnel=gretap98
diff --git a/test/test-network/conf/gretun.network b/test/test-network/conf/gretun.network
index 5510b1c9b65..68d95b18080 100644
--- a/test/test-network/conf/gretun.network
+++ b/test/test-network/conf/gretun.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=gretun99
 Tunnel=gretun98
 Tunnel=gretun97
diff --git a/test/test-network/conf/ip6gretap.network b/test/test-network/conf/ip6gretap.network
index 7ae4e3aea73..8434c62efbe 100644
--- a/test/test-network/conf/ip6gretap.network
+++ b/test/test-network/conf/ip6gretap.network
@@ -2,5 +2,6 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=ip6gretap99
 Tunnel=ip6gretap98
diff --git a/test/test-network/conf/ip6gretun.network b/test/test-network/conf/ip6gretun.network
index 8fbee98851e..ce2bbd8792e 100644
--- a/test/test-network/conf/ip6gretun.network
+++ b/test/test-network/conf/ip6gretun.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=ip6gretun99
 Tunnel=ip6gretun98
 Tunnel=ip6gretun97
diff --git a/test/test-network/conf/ip6tnl.network b/test/test-network/conf/ip6tnl.network
index 15c6d15d453..7ad1e1b5b1f 100644
--- a/test/test-network/conf/ip6tnl.network
+++ b/test/test-network/conf/ip6tnl.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=ip6tnl99
 Tunnel=ip6tnl98
 Tunnel=ip6tnl97
diff --git a/test/test-network/conf/ipip.network b/test/test-network/conf/ipip.network
index ea4b3a13533..c1ef30519c7 100644
--- a/test/test-network/conf/ipip.network
+++ b/test/test-network/conf/ipip.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=ipiptun99
 Tunnel=ipiptun98
 Tunnel=ipiptun97
diff --git a/test/test-network/conf/ipvlan.network b/test/test-network/conf/ipvlan.network
index d0532205507..b3fccb146f3 100644
--- a/test/test-network/conf/ipvlan.network
+++ b/test/test-network/conf/ipvlan.network
@@ -2,4 +2,5 @@
 Name=test1
 
 [Network]
+IPv6AcceptRA=no
 IPVLAN=ipvlan99
diff --git a/test/test-network/conf/ipvtap.network b/test/test-network/conf/ipvtap.network
index c81ba52e2d3..45491643231 100644
--- a/test/test-network/conf/ipvtap.network
+++ b/test/test-network/conf/ipvtap.network
@@ -2,4 +2,5 @@
 Name=test1
 
 [Network]
+IPv6AcceptRA=no
 IPVTAP=ipvtap99
diff --git a/test/test-network/conf/isatap.network b/test/test-network/conf/isatap.network
index e8d03ed6bd2..9458330859e 100644
--- a/test/test-network/conf/isatap.network
+++ b/test/test-network/conf/isatap.network
@@ -2,4 +2,5 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=isataptun99
diff --git a/test/test-network/conf/macvlan.network b/test/test-network/conf/macvlan.network
index a41c1f916cf..e18842ca23d 100644
--- a/test/test-network/conf/macvlan.network
+++ b/test/test-network/conf/macvlan.network
@@ -2,4 +2,5 @@
 Name=test1
 
 [Network]
+IPv6AcceptRA=no
 MACVLAN=macvlan99
diff --git a/test/test-network/conf/macvtap.network b/test/test-network/conf/macvtap.network
index 6ee99ab9ce3..956d13fc3ac 100644
--- a/test/test-network/conf/macvtap.network
+++ b/test/test-network/conf/macvtap.network
@@ -2,4 +2,5 @@
 Name=test1
 
 [Network]
+IPv6AcceptRA=no
 MACVTAP=macvtap99
diff --git a/test/test-network/conf/routing-policy-rule-dummy98.network b/test/test-network/conf/routing-policy-rule-dummy98.network
index 8136c20ae42..804597cec45 100644
--- a/test/test-network/conf/routing-policy-rule-dummy98.network
+++ b/test/test-network/conf/routing-policy-rule-dummy98.network
@@ -1,6 +1,9 @@
 [Match]
 Name=dummy98
 
+[Network]
+IPv6AcceptRA=no
+
 [RoutingPolicyRule]
 TypeOfService=0x08
 Table=8
diff --git a/test/test-network/conf/routing-policy-rule-test1.network b/test/test-network/conf/routing-policy-rule-test1.network
index ffcedc99a2b..3594602cbb3 100644
--- a/test/test-network/conf/routing-policy-rule-test1.network
+++ b/test/test-network/conf/routing-policy-rule-test1.network
@@ -1,6 +1,9 @@
 [Match]
 Name=test1
 
+[Network]
+IPv6AcceptRA=no
+
 [RoutingPolicyRule]
 TypeOfService=0x08
 Table=7
diff --git a/test/test-network/conf/sit.network b/test/test-network/conf/sit.network
index 79909fcd6be..571c5c93d92 100644
--- a/test/test-network/conf/sit.network
+++ b/test/test-network/conf/sit.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=sittun99
 Tunnel=sittun98
 Tunnel=sittun97
diff --git a/test/test-network/conf/state-file-tests.network b/test/test-network/conf/state-file-tests.network
index d0233841fd5..468669c6cc6 100644
--- a/test/test-network/conf/state-file-tests.network
+++ b/test/test-network/conf/state-file-tests.network
@@ -5,6 +5,7 @@ Name=dummy98
 RequiredForOnline=routable
 
 [Network]
+IPv6AcceptRA=no
 DNS=10.10.10.10 10.10.10.11
 NTP=0.fedora.pool.ntp.org 1.fedora.pool.ntp.org
 Domains=hogehoge ~foofoo
diff --git a/test/test-network/conf/vti.network b/test/test-network/conf/vti.network
index 761362e4822..888e79a79db 100644
--- a/test/test-network/conf/vti.network
+++ b/test/test-network/conf/vti.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=vtitun99
 Tunnel=vtitun98
 Tunnel=vtitun97
diff --git a/test/test-network/conf/vti6.network b/test/test-network/conf/vti6.network
index 60ccb77f56b..0916de86dd1 100644
--- a/test/test-network/conf/vti6.network
+++ b/test/test-network/conf/vti6.network
@@ -2,6 +2,7 @@
 Name=dummy98
 
 [Network]
+IPv6AcceptRA=no
 Tunnel=vti6tun99
 Tunnel=vti6tun98
 Tunnel=vti6tun97