From 19ac916ee1a52cb8df3300b35657ee28bba22377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicki=20K=C5=99=C3=AD=C5=BEek?= <nicki@isc.org>
Date: Fri, 5 Dec 2025 17:39:23 +0100
Subject: [PATCH] Use jinja2 templates in views test

- Rename named.conf.j2 to named3.conf.j2 and adjust the python test to
  render this template.
- Handle the n2 and ns3 multiple configs as in other similar cases
  (ns2/named1.conf.in was moved to ns2/named.conf.j2).

(cherry picked from commit 2592f0d9610f07c32d53eaaa81648ffb48ac5a24)
---
 bin/tests/system/views/ns1/{named.conf.in => named.conf.j2} | 0
 .../system/views/ns2/{named1.conf.in => named.conf.j2}      | 0
 .../system/views/ns2/{named2.conf.in => named2.conf.j2}     | 0
 .../system/views/ns2/{named3.conf.in => named3.conf.j2}     | 0
 .../system/views/ns3/{named1.conf.in => named.conf.j2}      | 0
 .../system/views/ns3/{named2.conf.in => named2.conf.j2}     | 0
 bin/tests/system/views/ns5/{named.conf.in => named.conf.j2} | 0
 bin/tests/system/views/setup.sh                             | 6 ------
 bin/tests/system/views/tests.sh                             | 6 +++---
 9 files changed, 3 insertions(+), 9 deletions(-)
 rename bin/tests/system/views/ns1/{named.conf.in => named.conf.j2} (100%)
 rename bin/tests/system/views/ns2/{named1.conf.in => named.conf.j2} (100%)
 rename bin/tests/system/views/ns2/{named2.conf.in => named2.conf.j2} (100%)
 rename bin/tests/system/views/ns2/{named3.conf.in => named3.conf.j2} (100%)
 rename bin/tests/system/views/ns3/{named1.conf.in => named.conf.j2} (100%)
 rename bin/tests/system/views/ns3/{named2.conf.in => named2.conf.j2} (100%)
 rename bin/tests/system/views/ns5/{named.conf.in => named.conf.j2} (100%)

diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns1/named.conf.in
rename to bin/tests/system/views/ns1/named.conf.j2
diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns2/named1.conf.in
rename to bin/tests/system/views/ns2/named.conf.j2
diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns2/named2.conf.in
rename to bin/tests/system/views/ns2/named2.conf.j2
diff --git a/bin/tests/system/views/ns2/named3.conf.in b/bin/tests/system/views/ns2/named3.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns2/named3.conf.in
rename to bin/tests/system/views/ns2/named3.conf.j2
diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns3/named1.conf.in
rename to bin/tests/system/views/ns3/named.conf.j2
diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns3/named2.conf.in
rename to bin/tests/system/views/ns3/named2.conf.j2
diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.j2
similarity index 100%
rename from bin/tests/system/views/ns5/named.conf.in
rename to bin/tests/system/views/ns5/named.conf.j2
diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 9ccf5d0197..b8c7a1559f 100644
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -17,12 +17,6 @@ set -e
 . ../conf.sh
 
 cp -f ns2/example1.db ns2/example.db
-
-copy_setports ns1/named.conf.in ns1/named.conf
-copy_setports ns2/named1.conf.in ns2/named.conf
-copy_setports ns3/named1.conf.in ns3/named.conf
-copy_setports ns5/named.conf.in ns5/named.conf
-
 #
 # We remove k1 and k2 as KEYGEN is deterministic when given the
 # same source of "random" data and we want different keys for
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index ea47c01ff9..7cf9da23ca 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -37,8 +37,8 @@ dig_with_opts a.example. @10.53.0.3 any >dig.out.ns3.1 || status=1
 echo_i "copying in new configurations for ns2 and ns3"
 rm -f ns2/named.conf ns3/named.conf ns2/example.db
 cp -f ns2/example2.db ns2/example.db
-copy_setports ns2/named2.conf.in ns2/named.conf
-copy_setports ns3/named2.conf.in ns3/named.conf
+cp ns2/named2.conf ns2/named.conf
+cp ns3/named2.conf ns3/named.conf
 
 echo_i "reloading ns2 and ns3 with rndc"
 nextpart ns2/named.run >/dev/null
@@ -151,7 +151,7 @@ status=$((status + ret))
 echo_i "verifying adding of multiple inline zones followed by reconfiguration works"
 
 [ ! -f ns2/zones.conf ] && touch ns2/zones.conf
-copy_setports ns2/named3.conf.in ns2/named.conf
+cp ns2/named3.conf ns2/named.conf
 
 i=1
 while [ $i -lt 50 ]; do