From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 7 Sep 2021 13:00:06 +0000 (+0200)
Subject: Adjust system forward test to also use IPv6 addresses
X-Git-Tag: v9.17.19~43^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a4c44ca24124b661666ce82358152c09afbd31e;p=thirdparty%2Fbind9.git

Adjust system forward test to also use IPv6 addresses

The ns3->ns2 forwarding is now done using the IPv6 addresses, so we also
test that the query-source-v6 address is still operational after removal
of interface adjustment.
---

diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index 28d1b33785d..4aef4e55e5a 100644
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -11,12 +11,15 @@
 
 options {
 	query-source address 10.53.0.1;
+	query-source-v6 address fd92:7065:b8e:ffff::1;
 	notify-source 10.53.0.1;
+	notify-source-v6 fd92:7065:b8e:ffff::1;
 	transfer-source 10.53.0.1;
+	transfer-source-v6 fd92:7065:b8e:ffff::1;
 	port @PORT@;
 	pid-file "named.pid";
 	listen-on { 10.53.0.1; };
-	listen-on-v6 { none; };
+	listen-on-v6 { fd92:7065:b8e:ffff::1; };
 	recursion no;
 	dnssec-validation no;
 };
diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index f7256abb14b..31e5f05546a 100644
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -11,12 +11,15 @@
 
 options {
 	query-source address 10.53.0.2;
+	query-source-v6 address fd92:7065:b8e:ffff::2;
 	notify-source 10.53.0.2;
+	notify-source-v6 fd92:7065:b8e:ffff::2;
 	transfer-source 10.53.0.2;
+	transfer-source-v6 fd92:7065:b8e:ffff::2;
 	port @PORT@;
 	pid-file "named.pid";
 	listen-on { 10.53.0.2; };
-	listen-on-v6 { none; };
+	listen-on-v6 { fd92:7065:b8e:ffff::2; };
 	recursion no;
 	dnssec-validation no;
 };
diff --git a/bin/tests/system/forward/ns3/named1.conf.in b/bin/tests/system/forward/ns3/named1.conf.in
index 326befd99bf..da0979f29e1 100644
--- a/bin/tests/system/forward/ns3/named1.conf.in
+++ b/bin/tests/system/forward/ns3/named1.conf.in
@@ -11,13 +11,16 @@
 
 options {
 	query-source address 10.53.0.3;
+	query-source-v6 address fd92:7065:b8e:ffff::3;
 	notify-source 10.53.0.3;
+	notify-source-v6 fd92:7065:b8e:ffff::3;
 	transfer-source 10.53.0.3;
+	transfer-source-v6 fd92:7065:b8e:ffff::3;
 	port @PORT@;
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
-	listen-on-v6 { none; };
-	forwarders { 10.53.0.2; };
+	listen-on-v6 { fd92:7065:b8e:ffff::3; };
+	forwarders { fd92:7065:b8e:ffff::2; };
 	forward first;
 	dnssec-validation yes;
 };
diff --git a/bin/tests/system/forward/ns3/named2.conf.in b/bin/tests/system/forward/ns3/named2.conf.in
index cf45ea62a9c..4eb98edcb5a 100644
--- a/bin/tests/system/forward/ns3/named2.conf.in
+++ b/bin/tests/system/forward/ns3/named2.conf.in
@@ -11,12 +11,15 @@
 
 options {
 	query-source address 10.53.0.3;
+	query-source-v6 address fd92:7065:b8e:ffff::3;
 	notify-source 10.53.0.3;
+	notify-source-v6 fd92:7065:b8e:ffff::3;
 	transfer-source 10.53.0.3;
+	transfer-source-v6 fd92:7065:b8e:ffff::3;
 	port @PORT@;
 	pid-file "named.pid";
 	listen-on { 10.53.0.3; };
-	listen-on-v6 { none; };
+	listen-on-v6 { fd92:7065:b8e:ffff::3; };
 	forwarders { 10.53.0.6; };
 	dnssec-validation yes;
 };