Commit 8028d7ab authored by Stephen Morris's avatar Stephen Morris
Browse files

[1213] Rename zone files and update shell file headers

Zone files also reorganised to use $INCLUDE to include a common
file containing the bulk of the "large" zone.
parent 0fc13861
......@@ -965,6 +965,11 @@ AC_OUTPUT([doc/version.ent
tests/system/glue/setup.sh
tests/system/glue/nsx1/b10-config.db
tests/system/bindctl/nsx1/b10-config.db.template
tests/system/ixfr/db.example.n0
tests/system/ixfr/db.example.n2
tests/system/ixfr/db.example.n2.refresh
tests/system/ixfr/db.example.n4
tests/system/ixfr/db.example.n6
tests/system/ixfr/ixfr_init.sh
tests/system/ixfr/common_tests.sh
tests/system/ixfr/in-1/setup.sh
......
......@@ -46,15 +46,23 @@ Test Files
Data Files
----------
(All within tests/system/ixfr.)
(All within tests/system/ixfr. Some .in files are processed to substitute
for build variables in the build process to give the files listed here.)
largezone_n-X.db: These files hold the RRs for a zone for which should not
db.example.nX. These files hold the RRs for a zone for which should not
fit within a single UDP packet. The files are different versions of the zone
- the N-0 version (i.e. the latest version - "N" - the "-0" is present so
that the files have a consistent name), N-2 etc. (See the full description
of the tests for the meaning of N-2 etc.)
largezone_n-2_refresh.db: The N-2 version of the zone, but with a small SOA refresh time (for test 4)
db.example.common: A set of RRs to bulk out the zone to be larger than can
be contained in a single UDP packet.
db.example.n2.refresh: The N-2 version of the zone, but with a small SOA
refresh time (for test 4).
named_xxxx.conf: Various BIND 9 configuration files with NOTIFYs and/or
IXFR enabled or disabled.
Directories
-----------
......
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......@@ -18,7 +18,7 @@
# Clean up after zone transfer tests.
rm -f ns1/named.conf
rm -f ns1/zone.db
rm -f ns1/db.example
rm -f ns1/named.memstats
rm -f nsx2/bind10.run
......
#!/bin/sh
#
# Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......@@ -60,12 +60,12 @@ echo "I:SOA serial of IXFR client $CLIENT_NAME is $old_client_serial"
# the zones. With ixfr-from-differences set to "yes", the nameserver should
# generate the differences between them.
echo "I:updating IXFR-server $SERVER_NAME for ixfr-in tests"
update_server_zone $SERVER_NAME $SERVER_IP $IXFR_TOP/largezone_n-2.db
update_server_zone $SERVER_NAME $SERVER_IP $IXFR_TOP/db.example.n2
# Wait a bit - it seems that if two updates are loaded in quick succession,
# the second sometimes gets lost.
sleep 5
update_server_zone $SERVER_NAME $SERVER_IP $IXFR_TOP/largezone_n-0.db
update_server_zone $SERVER_NAME $SERVER_IP $IXFR_TOP/db.example.n0
# TODO: Need to alter configuration of BIND 10 server such that it accepts
# NOTIFYs from and sends IXFR requests to the BIND 9 master.
......
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$ORIGIN example.
$TTL 3600
@ IN SOA ns1.example. hostmaster.example. 100 3600 900 7200 300
IN NS ns1.example.
IN NS ns2.example.
ns1 IN A 192.0.2.1
ns2 IN A 192.0.2.2
a-1 IN A 192.0.2.101
b-1 IN A 192.0.2.201
$INCLUDE @abs_top_builddir@/tests/system/ixfr/db.example.common
; Copyright (C) 2004, 2007 Internet Systems Consortium, Inc. ("ISC")
; Copyright (C) 2000, 2001 Internet Software Consortium.
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
......@@ -16,9 +15,14 @@
$ORIGIN example.
$TTL 3600
@ IN SOA ns2.example. hostmaster.example. 92 3600 900 7200 300
@ IN SOA ns1.example. hostmaster.example. 98 3600 900 7200 300
IN NS ns2.example.
IN NS ns3.example.
IN NS ns1.example.
IN NS ns2.example.
www IN A 192.0.2.1
ns1 IN A 192.0.2.1
ns2 IN A 192.0.2.2
a-1 IN A 192.0.2.101
$INCLUDE @abs_top_builddir@/tests/system/ixfr/db.example.common
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$ORIGIN example.
$TTL 3600
@ IN SOA ns1.example. hostmaster.example. 98 3600 900 7200 300
IN NS ns1.example.
IN NS ns2.example.
ns1 IN A 192.0.2.1
ns2 IN A 192.0.2.2
a-1 IN A 192.0.2.101
$INCLUDE @abs_top_builddir@/tests/system/ixfr/db.example.common
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$ORIGIN example.
$TTL 3600
@ IN SOA ns1.example. hostmaster.example. 100 3600 900 7200 300
IN NS ns1.example.
IN NS ns2.example.
ns1 IN A 192.0.2.1
ns2 IN A 192.0.2.2
a-1 IN A 192.0.2.101
a-2 IN A 192.0.2.102
b-1 IN A 192.0.2.201
b-2 IN A 192.0.2.202
$INCLUDE @abs_top_builddir@/tests/system/ixfr/db.example.common
; Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
;
; Permission to use, copy, modify, and/or distribute this software for any
; purpose with or without fee is hereby granted, provided that the above
; copyright notice and this permission notice appear in all copies.
;
; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
$ORIGIN example.
$TTL 3600
@ IN SOA ns1.example. hostmaster.example. 100 3600 900 7200 300
IN NS ns1.example.
IN NS ns2.example.
ns1 IN A 192.0.2.1
ns2 IN A 192.0.2.2
a-1 IN A 192.0.2.101
a-2 IN A 192.0.2.102
b-1 IN A 192.0.2.201
b-2 IN A 192.0.2.202
......@@ -23,7 +23,7 @@ sh clean.sh
# Set up the initial version of the IXFR server - load the n-4 version of the
# zone. The configuration file enables IXFR and disabled notifies.
cp -f $IXFR_TOP/named_nonotify.conf ns1/named.conf
cp -f $IXFR_TOP/largezone_n-4.db ns1/zone.db
cp -f $IXFR_TOP/db.example.n4 ns1/db.example
# Set up the IXFR client - load the same version of the zone.
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-4.db
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/db.example.n4
#!/bin/sh
#
# Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2001, 2002 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......@@ -21,9 +21,9 @@
sh clean.sh
# Set up the initial version of the IXFR server - load the n-6 version of the
# zone. The configuration file enables IXFR and disabled notifies.
# zone. The configuration file enables IXFR and disables notifies.
cp -f $IXFR_TOP/named_nonotify.conf ns1/named.conf
cp -f $IXFR_TOP/largezone_n-6.db ns1/zone.db
cp -f $IXFR_TOP/db.example.n6 ns1/db.example
# Set up the IXFR client - load an earlier version of the zone
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-6.db
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/db.example.n6
#!/bin/sh
#
# Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......@@ -24,6 +24,8 @@
# of the zone. (The changes are such that the update will have to take place
# over TCP.)
. ../ixfr_init.sh
# On entry, the IXFR server is at version N-6. The common tests assume that
# it is an N-4, so update it.
echo "I:updating IXFR-server $SERVER_NAME to suitable start version"
......
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2001, 2002 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......@@ -23,7 +23,7 @@ sh clean.sh
# Set up the initial version of the IXFR server - load the latest version of
# the zone.
cp -f $IXFR_TOP/named_noixfr.conf ns1/named.conf
cp -f $IXFR_TOP/largezone_n-0.db ns1/zone.db
cp -f $IXFR_TOP/db.example.n0 ns1/db.example
# Set up the IXFR client - load a previous version of the zone.
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-2.db
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/db.example.n2
#!/bin/sh
#
# Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
#!/bin/sh
#
# Copyright (C) 2004, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2001, 2002 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......@@ -23,8 +23,8 @@ sh clean.sh
# Set up the initial version of the IXFR server - load the latest version of
# the zone.
cp $IXFR_TOP/named_noixfr.conf ns1/named.conf
cp -f $IXFR_TOP/largezone_n-0.db ns1/zone.db
cp -f $IXFR_TOP/db.example.n0 ns1/db.example
# Set up the IXFR client - load a previous version of the zone with a short
# refresh time.
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/largezone_n-2_refresh.db
${B10_LOADZONE} -o . -d @builddir@/nsx2/zone.sqlite3 $IXFR_TOP/db.example.n2.refresh
#!/bin/sh
#
# Copyright (C) 2004, 2005, 2007, 2011 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2000, 2001 Internet Software Consortium.
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
......
......@@ -195,7 +195,7 @@ update_server_zone() {
old_serial=`$DIG_SOA @$ip | $AWK '{print $3}'`
echo "I:$name IXFR server loading $1"
cp $file $name/zone.db
cp $file $name/db.example
do_rndc $name $ip reload
if [ $? -ne 0 ];
then
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment