Update Smoke/IpaInstallAndStart/test.sh

2022-02-01 08:52:32 +00:00
54 changed files with 2127 additions and 2 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/339
+++ b/339
@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--- a/README.md
+++ b/README.md
@ -0,0 +1,26 @@
+# Fedora BIND tests
+
+Initial part of these test were provided by Red Hat.
+They provide Continuous Integration on [Fedora](https://fedoraproject.org) BIND builds and merge requests.
+It would be used from [standard-test-roles](https://docs.fedoraproject.org/en-US/ci/standard-test-roles/) interface.
+
+Basic metadata are in [fmf](https://fmf.readthedocs.io/en/latest/overview.html),
+tests are written in [beakerlib](https://github.com/beakerlib/beakerlib).
+
+Use `fmf show` tool to filter current tests.
+Fedora tests moved to [test namespace](https://src.fedoraproject.org/tests/bind) in Fedora Package Sources.
+
+## Test run
+
+Container check not yet works, but localhost default is unsafe!
+In future, it should be possible to run this testsuite using these commands:
+
+    dnf install -y tmt podman
+    tmt run
+
+It is possible to test on local machine. 
+Testing on temporary machines is suggested, it might change existing configuration!
+
+To test in on local machine, run:
+
+    tmt run --all provision --how local
--- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/Makefile
+++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/Makefile
@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP
+#   Description: Test for BZ#1999691 (bind does not listen on all addresses over TCP)
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE reproducer.sh
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for BZ#1999691 (bind does not listen on all addresses over TCP)" >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        15m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind lsof" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             1999691" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/PURPOSE
+++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/PURPOSE
@ -0,0 +1,5 @@
+PURPOSE of /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP
+Description: Test for BZ#1999691 (bind does not listen on all addresses over TCP)
+Author: Petr Sklenar <psklenar@redhat.com>
+Bug summary: bind does not listen on all addresses over TCP when listen-on/listen-on-v6 has specific IPs or any listed
+Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1999691
--- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/main.fmf
+++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/main.fmf
@ -0,0 +1,26 @@
+summary: Test for BZ#1999691 (bind does not listen on all addresses over TCP)
+description: |
+    Bug summary: bind does not listen on all addresses over TCP when listen-on/listen-on-v6 has specific IPs or any listed
+    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1999691
+contact: Petr Sklenar <psklenar@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - bind
+  - lsof
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1999691
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0612648
+extra-summary: /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP
+extra-task: /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP
--- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/reproducer.sh
+++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/reproducer.sh
@ -0,0 +1,40 @@
+#!/bin/bash
+# modified reproducer from upstream issue
+# https://gitlab.isc.org/isc-projects/bind9/-/issues/2852
+
+# Pause bind on loading this file
+mkfifo _bind.nta
+
+named -g -c <(echo "options { port 5300; listen-on { any; }; listen-on-v6 { any; }; };") -n 1 &
+NAMED_PID=$!
+
+sleep 2
+for i in {2..32}; do
+	sleep 0.05
+	sudo ip addr add 127.0.0.$i/32 dev lo
+	[ "$i" = 6 ] && echo -n '' > _bind.nta && GO=1
+done
+
+lsof -n -p ${NAMED_PID} | grep :domain
+TCP=$(lsof -n -p ${NAMED_PID} | grep 'TCP 127.0.0.' | wc -l)
+UDP=$(lsof -n -p ${NAMED_PID} | grep 'UDP 127.0.0.' | wc -l)
+echo "TCP: $TCP UDP: $UDP"
+
+sleep 5
+#echo "Done adding addresses, press ENTER to terminate."
+#read
+
+kill -TERM "${NAMED_PID}"
+timeout 5 cat _bind.nta
+wait "${NAMED_PID}"
+rm -f _bind.nta
+
+for i in {2..32}; do
+	sudo ip addr del 127.0.0.$i/32 dev lo
+done
+echo "TCP: $TCP UDP: $UDP"
+if [ "$TCP" -ne "$UDP" ]; then
+	echo "Mismatching listeners!"
+	exit 1
+fi
+
--- a/Regression/bind-does-not-listen-on-all-addresses-over-TCP/runtest.sh
+++ b/Regression/bind-does-not-listen-on-all-addresses-over-TCP/runtest.sh
@ -0,0 +1,44 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Regression/bind-does-not-listen-on-all-addresses-over-TCP
+#   Description: Test for BZ#1999691 (bind does not listen on all addresses over TCP)
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+    rlPhaseEnd
+
+    rlPhaseStartTest
+	# see reproducer.sh : 
+        rlRun "bash ./reproducer.sh"
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd
--- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/Makefile
+++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/Makefile
@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key
+#   Description: Test for BZ#1769876 (BIND stops DNSKEY lookup in get_dst_key() when a)
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2019 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE fakeroot.db bad.db
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Mensik <pemensik@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for BZ#1769876 (BIND stops DNSKEY lookup in get_dst_key() when a)" >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils" >> $(METADATA)
+	@echo "RhtsRequires:	library(bind/bind-utils)" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             1769876" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/PURPOSE
+++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/PURPOSE
@ -0,0 +1,5 @@
+PURPOSE of /CoreOS/bind/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key
+Description: Test for BZ#1769876 (BIND stops DNSKEY lookup in get_dst_key() when a)
+Author: Petr Mensik <pemensik@redhat.com>
+Bug summary: BIND stops DNSKEY lookup in get_dst_key() when a key with unsupported algorithm is found first
+Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1769876
--- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/bad.db
+++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/bad.db
@ -0,0 +1,12 @@
+$TTL 600
+@	IN SOA	@ rname.invalid. (
+					0	; serial
+					1D	; refresh
+					1H	; retry
+					1W	; expire
+					3H )	; minimum
+	NS	ns.fakeroot.
+
+h1	A	127.0.0.1
+h2	A	127.0.0.2
+
--- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/fakeroot.db
+++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/fakeroot.db
@ -0,0 +1,13 @@
+$TTL 600
+@	IN SOA	@ rname.invalid. (
+					0	; serial
+					1D	; refresh
+					1H	; retry
+					1W	; expire
+					3H )	; minimum
+	NS	ns.fakeroot
+bad	NS	ns.fakeroot
+bad3	NS	ns.fakeroot
+localhost.	A	127.0.0.1
+		AAAA	::1
+ns.fakeroot	A	127.0.0.1
--- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/main.fmf
+++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/main.fmf
@ -0,0 +1,20 @@
+summary: Test for BZ#1769876 (BIND stops DNSKEY lookup in get_dst_key() when a)
+description: |
+    Bug summary: BIND stops DNSKEY lookup in get_dst_key() when a key with unsupported algorithm is found first
+    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1769876
+contact: Petr Mensik <pemensik@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+#require:
+#  - library(bind/bind-utils)
+recommend:
+  - bind
+  - bind-utils
+duration: 5m
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1769876
+extra-summary: /CoreOS/bind/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key
+extra-task: /CoreOS/bind/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key
+enabled: false
--- a/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/runtest.sh
+++ b/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key/runtest.sh
@ -0,0 +1,117 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Regression/bz1769876-BIND-stops-DNSKEY-lookup-in-get-dst-key
+#   Description: Test for BZ#1769876 (BIND stops DNSKEY lookup in get_dst_key() when a)
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2019 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+PHASE=${PHASE:-Test}
+
+rlJournalStart
+    rlPhaseStartSetup "Configuring common part"
+	rlImport "bind/bind-utils"
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+	rlRun "rlServiceStart rngd"
+	rlFileBackup /etc/named.conf /var/named
+	rlRun "cp fakeroot.db bad.db /var/named"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+  if [[ "$PHASE" =~ "Test" ]]; then
+    rlPhaseStartSetup "Creating local server"
+	rlRun "sed -e 's/\(listen-on.*\){.*}/\1{ any; }/' -e 's/\(allow-query *\){ localhost; }/\1{ any; }/' -i /etc/named.conf"
+	cat >> /etc/named.conf << CONF
+	zone "." IN {
+		type master;
+		file "fakeroot.db.signed";
+	};
+
+	zone "bad" IN {
+		type master;
+		file "bad.db.signed";
+	};
+
+	zone "bad3" IN {
+		type master;
+		file "bad3.db.signed";
+	};
+
+	# Include generated trust anchor
+	include "root.conf";
+CONF
+    rlPhaseEnd
+
+    rlPhaseStartTest "Testing local server"
+	rlRun "pushd /var/named"
+	rlRun "cp bad.db bad3.db"
+	rlRun "bad_KSK=$(dnssec-keygen -f KSK -a RSASHA512 -b 2048 bad)"
+	rlRun "bad_ZSK=$(dnssec-keygen -a ECDSAP256SHA256 -n ZONE -b 2048 bad)"
+	rlRun "echo '\$INCLUDE $bad_KSK.key' >> bad.db"
+	rlRun "echo '\$INCLUDE $bad_ZSK.key' >> bad.db"
+	rlRun "dnssec-signzone -A -k $bad_KSK -z -N INCREMENT -o bad -t bad.db"
+
+	rlRun "bad3_KSK=$(dnssec-keygen -f KSK -a RSASHA512 -b 2048 bad3)"
+	rlRun "bad3_ZSK=$(dnssec-keygen -a ECDSAP256SHA256 -n ZONE -b 2048 bad3)"
+	rlRun "echo '\$INCLUDE $bad3_KSK.key' >> bad3.db"
+	rlRun "echo '\$INCLUDE $bad3_ZSK.key' >> bad3.db"
+	rlRun "dnssec-signzone -A -k $bad3_KSK -z -3 9911c319070e83f8 -N INCREMENT -o bad3 -t bad3.db"
+
+	rlRun "buZoneGenerateSign -o . -f fakeroot.db -A root" 0 "Generate signed root"
+	rlRun "rlServiceStart named"
+	rlRun -s "dig +dnssec +multi @localhost h1.bad."
+	rlAssertGrep 'status: NOERROR' "$rlRun_LOG"
+	if [ -x /usr/bin/delv ]; then
+	rlRun -s "delv @::1 -a root.conf h1.bad."
+	rlAssertGrep 'fully validated' "$rlRun_LOG"
+	rlRun -s "delv @::1 -a root.conf h1.bad3."
+	rlAssertGrep 'fully validated' "$rlRun_LOG"
+	fi
+    rlPhaseEnd
+  fi
+
+  if [[ "$PHASE" =~ "Client" ]]; then
+    rlPhaseStartSetup "Creating local server"
+	rlRun "test -n \"$MASTER\""
+        rlRun "buFetchManagedKeys . $MASTER > /etc/named/root.conf"
+	rlRun "echo 'include \"/etc/named/root.conf\";' >> /etc/named.conf"
+	# FIXME: create forwarding somehow!
+    rlPhaseEnd
+  fi
+
+    rlPhaseStartCleanup
+	[ "$DEBUGTEST" = y ] && PS1="Interrupted test $PS1" bash -i
+	rm -f $rlRun_LOG
+	rlRun "rm -f {Kbad.,Kbad3.,K.}+* {bad,bad3}.db"
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+	rlFileRestore
+	rlRun "rlServiceRestore named"
+	rlRun "rlServiceRestore rngd"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
--- a/Regression/bz1848169-named-checkconf-cidr-host-bits/Makefile
+++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/Makefile
@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits
+#   Description: What the test does
+#   Author: Tomas Korbar <tkorbar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2020 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE bad.conf
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Tomas Korbar <tkorbar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     What the test does" >> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             1848169 1865785"  >> $(METADATA)
+	@echo "Releases:        RHEL8" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Regression/bz1848169-named-checkconf-cidr-host-bits/PURPOSE
+++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/PURPOSE
@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits
+Description: What the test does
+Author: Tomas Korbar <tkorbar@redhat.com>
--- a/Regression/bz1848169-named-checkconf-cidr-host-bits/bad.conf
+++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/bad.conf
@ -0,0 +1,3 @@
+controls  {
+        inet 172.17.1.98 port 953 allow { 172.17.1.1/24; };
+};
--- a/Regression/bz1848169-named-checkconf-cidr-host-bits/main.fmf
+++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/main.fmf
@ -0,0 +1,24 @@
+summary: What the test does
+description: ''
+contact: Petr Sklenar <psklenar@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - bind
+duration: 5m
+enabled: true
+tag:
+  - TIPpass
+  - TIPpass_infra
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1848169
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1865785
+adjust:
+  - enabled: false
+    when: distro != rhel-8
+    continue: false
+extra-nitrate: TC#0608023
+extra-summary: /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits
+extra-task: /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits
--- a/Regression/bz1848169-named-checkconf-cidr-host-bits/runtest.sh
+++ b/Regression/bz1848169-named-checkconf-cidr-host-bits/runtest.sh
@ -0,0 +1,45 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Regression/bz1848169-named-checkconf-cidr-host-bits
+#   Description: What the test does
+#   Author: Tomas Korbar <tkorbar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2020 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+    rlPhaseEnd
+
+    rlPhaseStartTest
+    	rlRun "named-checkconf ./bad.conf" 0 "Check configuration file"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
--- a/Regression/note
+++ b/Regression/note
--- a/Sanity/delv-smoke-test/Makefile
+++ b/Sanity/delv-smoke-test/Makefile
@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/delv-smoke-test
+#   Description: Test for BZ#1578128 ([RFE] Provide delv functionality)
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2019 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/delv-smoke-test
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for BZ#1578128 ([RFE] Provide delv functionality)" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        15m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             1578128" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Sanity/delv-smoke-test/PURPOSE
+++ b/Sanity/delv-smoke-test/PURPOSE
@ -0,0 +1,5 @@
+PURPOSE of /CoreOS/bind/Sanity/delv-smoke-test
+Description: Test for BZ#1578128 ([RFE] Provide delv functionality)
+Author: Petr Sklenar <psklenar@redhat.com>
+Bug summary: [RFE] Provide delv functionality
+Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1578128
--- a/Sanity/delv-smoke-test/main.fmf
+++ b/Sanity/delv-smoke-test/main.fmf
@ -0,0 +1,28 @@
+summary: Test for BZ#1578128 ([RFE] Provide delv functionality)
+description: |
+    Bug summary: [RFE] Provide delv functionality
+    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1578128
+contact: Petr Sklenar <psklenar@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - bind
+  - bind-utils
+duration: 15m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPfail_infra
+  - TIPpass
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1578128
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0600760
+extra-summary: /CoreOS/bind/Sanity/delv-smoke-test
+extra-task: /CoreOS/bind/Sanity/delv-smoke-test
--- a/Sanity/delv-smoke-test/runtest.sh
+++ b/Sanity/delv-smoke-test/runtest.sh
@ -0,0 +1,54 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/delv-smoke-test
+#   Description: Test for BZ#1578128 ([RFE] Provide delv functionality)
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2019 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlAssertRpm bind-utils
+	cat /etc/resolv.conf
+    rlPhaseEnd
+
+    rlPhaseStartTest
+      if delv redhat.com | grep IN;then
+	rlRun "delv redhat.com | grep IN"
+	rlRun "delv redhat.com soa +multi | grep serial"
+	LINES=$(delv +multi +vtrace|wc -l)
+	rlAssertGreater "delv +vtrace should show few lines" "$LINES" "10"
+	rlRun "delv +vtrace | grep 'fully validated'"
+      fi
+	rlLog "`delv redhat.com`"
+	cat /etc/resolv.conf
+	
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd
--- a/Sanity/geoip-support/Makefile
+++ b/Sanity/geoip-support/Makefile
@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/geoip-support
+#   Description: it tries more ip address from more locations
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2019 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/geoip-support
+export TESTVERSION=1.1
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE a b c named.conf
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     it tries more ip address from more locations" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        66m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind libmaxminddb libmaxminddb-devel geolite2-country geolite2-city bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Sanity/geoip-support/PURPOSE
+++ b/Sanity/geoip-support/PURPOSE
@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/bind/Sanity/geoip-support
+Description: it tries more ip address from more locations
+Author: Petr Sklenar <psklenar@redhat.com>
--- a/Sanity/geoip-support/a
+++ b/Sanity/geoip-support/a
@ -0,0 +1,18 @@
+$ORIGIN petr.god.
+$TTL 86400
+@	IN	SOA	dns.petr.god. hostmaster.petr.god. (
+			100	; serial
+			21600		; 
+			3600		;
+			604800		;
+			86400	)	;
+
+	IN	NS	dns.petr.god.
+dns	IN	A	127.0.0.1
+mail	IN	CNAME	dns
+petr.god.	IN	TXT	"zone-a"
+test1	IN	A	1.1.1.1
+test2	IN	A	1.1.1.2
+test3	IN	A	1.1.1.3
+geo	IN	TXT	"geo A"
+
--- a/Sanity/geoip-support/b
+++ b/Sanity/geoip-support/b
@ -0,0 +1,18 @@
+$ORIGIN petr.god.
+$TTL 86400
+@	IN	SOA	dns.petr.god. hostmaster.petr.god. (
+			100	; serial
+			21600		; 
+			3600		;
+			604800		;
+			86400	)	;
+
+	IN	NS	dns.petr.god.
+dns	IN	A	127.0.0.1
+mail	IN	CNAME	dns
+petr.god.	IN	TXT	"zone-b"
+test1	IN	A	2.2.2.1
+test2	IN	A	2.2.2.2
+test3	IN	A	2.2.2.3
+geo     IN      TXT	"geo B"
+
--- a/Sanity/geoip-support/c
+++ b/Sanity/geoip-support/c
@ -0,0 +1,18 @@
+$ORIGIN petr.god.
+$TTL 86400
+@	IN	SOA	dns.petr.god. hostmaster.petr.god. (
+			100	; serial
+			21600		; 
+			3600		;
+			604800		;
+			86400	)	;
+
+	IN	NS	dns.petr.god.
+dns	IN	A	127.0.0.1
+mail	IN	CNAME	dns
+petr.god.	IN	TXT	"zone-c"
+test1	IN	A	3.3.3.1
+test2	IN	A	3.3.3.2
+test3	IN	A	3.3.3.3
+geo	IN	TXT	"geo C"
+
--- a/Sanity/geoip-support/main.fmf
+++ b/Sanity/geoip-support/main.fmf
@ -0,0 +1,31 @@
+summary: it tries more ip address from more locations
+tier: '1'
+description: ''
+contact: Petr Sklenar <psklenar@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - bind
+  - libmaxminddb
+  - libmaxminddb-devel
+  - geolite2-country
+  - geolite2-city
+  - bind-utils
+duration: 66m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPfail_infra
+  - TIPpass
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1564443
+adjust:
+  - enabled: false
+    when: distro < rhel-8
+    continue: false
+extra-nitrate: TC#0604089
+extra-summary: /CoreOS/bind/Sanity/geoip-support
+extra-task: /CoreOS/bind/Sanity/geoip-support
--- a/Sanity/geoip-support/named.conf
+++ b/Sanity/geoip-support/named.conf
@ -0,0 +1,95 @@
+//
+// named.conf
+//
+// Provided by Red Hat bind package to configure the ISC BIND named(8) DNS
+// server as a caching only nameserver (as a localhost DNS resolver only).
+//
+// See /usr/share/doc/bind*/sample/ for example named configuration files.
+//
+// See the BIND Administrator's Reference Manual (ARM) for details about the
+// configuration located in /usr/share/doc/bind-{version}/Bv9ARM.html
+
+options {
+	listen-on port 53 { 127.0.0.1; };
+	listen-on-v6 port 53 { ::1; };
+	directory 	"/var/named";
+	dump-file 	"/var/named/data/cache_dump.db";
+	statistics-file "/var/named/data/named_stats.txt";
+	memstatistics-file "/var/named/data/named_mem_stats.txt";
+	recursing-file  "/var/named/data/named.recursing";
+	secroots-file   "/var/named/data/named.secroots";
+	allow-query     { any; };
+
+	/* 
+	 - If you are building an AUTHORITATIVE DNS server, do NOT enable recursion.
+	 - If you are building a RECURSIVE (caching) DNS server, you need to enable 
+	   recursion. 
+	 - If your recursive DNS server has a public IP address, you MUST enable access 
+	   control to limit queries to your legitimate users. Failing to do so will
+	   cause your server to become part of large scale DNS amplification 
+	   attacks. Implementing BCP38 within your network would greatly
+	   reduce such attack surface 
+	*/
+	recursion yes;
+
+	dnssec-enable yes;
+	dnssec-validation yes;
+
+	/* Path to ISC DLV key */
+	bindkeys-file "/etc/named.root.key";
+
+	managed-keys-directory "/var/named/dynamic";
+
+	pid-file "/run/named/named.pid";
+	session-keyfile "/run/named/session.key";
+	geoip-directory "/usr/share/GeoIP";
+};
+
+acl "geoname" {
+     geoip country US;
+//   geoip region CA;
+//   geoip city "Redwood City"; /* names, etc., must be quoted if they contain spaces */
+};
+
+acl "tibet" {
+     geoip country CN;
+};
+
+
+
+view "geoname" {
+     match-clients { geoname;};
+     zone "petr.god." {
+        file "a";
+        type master;  
+     };
+};
+
+view "tibet" {
+     match-clients { tibet;};
+     zone "petr.god." {
+	file "c";
+	type master;
+     };
+};
+
+
+view "default" {
+     zone "petr.god." {
+        file "b";
+        type master;
+     };
+};
+
+
+
+logging {
+        channel default_debug {
+                file "data/named.run";
+                severity dynamic;
+        };
+};
+
+// include "/etc/named.rfc1912.zones";
+include "/etc/named.root.key";
+
--- a/Sanity/geoip-support/notes
+++ b/Sanity/geoip-support/notes
@ -0,0 +1,42 @@
+bind-9.11.10-1.fc30.x86_64
+geolite2-country-20190806-1.fc30.noarch
+libmaxminddb-devel
+### tool mmdblookup ^
+libmaxminddb
+
+
+    4  yum install libmax\*
+   75  yum install geolite2-city a geolite2-country
+   76  yum install geolite2-city geolite2-country
+
+
+my NS with 4.3.2.1
+   XY  ip netns add blue
+   12  ip link add cosi0 type veth peer name cosi1
+   15  ip link set cosi0 netns blue
+   16  ip a
+   17  ip addr add 192.168.88.1 dev cosi1@if6
+   18  ip addr add 192.168.88.1 dev cosi1
+
+
+
+#############
+mmdblookup --file /usr/share/GeoIP/GeoLite2-City.mmdb --ip 4.3.2.1 
+....
+    "country": 
+      {
+        "geoname_id": 
+          6252001 <uint32>
+        "iso_code": 
+          "US" <utf8_string>
+        "names": 
+
+.....blabla
+
+
+
+[root@host-10-0-136-254 smoke-high-load]# dig -b 10.0.136.254 @127.0.0.1 test1.petr.god +short
+192.168.122.222
+[root@host-10-0-136-254 smoke-high-load]# dig -b 4.3.2.1 @127.0.0.1 test1.petr.god +short
+192.168.122.2
+
--- a/Sanity/geoip-support/runtest.sh
+++ b/Sanity/geoip-support/runtest.sh
@ -0,0 +1,83 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/geoip-support
+#   Description: it tries more ip address from more locations
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2019 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+	rlFileBackup /etc/named.conf /var/named/a  /var/named/b
+    rlPhaseEnd
+
+    rlPhaseStartSetup 'files'
+	rlRun "cp named.conf /etc/named.conf"
+
+	rlRun "cp a /var/named/a"
+	rlRun "cp b /var/named/b"
+	rlRun "cp c /var/named/c"
+	chown root.named /var/named/a
+	chown root.named /var/named/b
+	chown root.named /var/named/c
+	rlRun "rlServiceStart named"
+
+    rlPhaseEnd
+
+    rlPhaseStartSetup 'net'
+	ip netns add blue
+	ip link add cosi0 type veth peer name cosi1
+	ip link set cosi0 netns blue
+	ip addr add 4.3.2.1 dev cosi1
+	ip addr add 222.19.68.0 dev cosi1
+
+	rlRun 'ip a|grep 222.19.68.0'
+	rlRun 'ip a|grep 4.3.2.1'
+
+    rlPhaseEnd
+
+    rlPhaseStartTest 'dig'
+	rlRun "dig -b 4.3.2.1 @127.0.0.1 test1.petr.god +short | grep '1.1.1.1'"
+	rlRun "dig -b 127.0.0.1 @127.0.0.1 test1.petr.god +short | grep '2.2.2.1'"
+	rlRun "dig -b 222.19.68.0 @127.0.0.1 test1.petr.god +short | grep '3.3.3.1'"
+
+	rlRun "dig -b 4.3.2.1 +short @127.0.0.1 geo.petr.god TXT | grep 'geo A'"
+	rlRun "dig -b 222.19.68.0 +short @127.0.0.1 geo.petr.god TXT | grep 'geo C'"
+	rlRun "dig -b 127.0.0.1 +short @127.0.0.1 geo.petr.god TXT | grep 'geo B'"
+    rlPhaseEnd
+
+#for i in `seq 1 100000`;do dig -b 4.3.2.1 @127.0.0.1 test1.petr.god +short & dig -b 127.0.0.1 @127.0.0.1 test1.petr.god +short & dig -b 222.19.68.0 @127.0.0.1 test1.petr.god +short & done
+
+
+    rlPhaseStartCleanup
+        ip netns del blue
+	rlFileRestore
+	rlServiceRestore named
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
--- a/Sanity/json-support/Makefile
+++ b/Sanity/json-support/Makefile
@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/json-support
+#   Description: Test for BZ#1899257 ([RFE] Request for libjson support to be added to)
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/json-support
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE readstats.py
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include $(realpath /usr/share/rhts/lib/rhts-make.include)
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Mensik <pemensik@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test for BZ#1899257 ([RFE] Request for libjson support to be added to)" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils python3" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             1899257" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHEL6 -RHEL7 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Sanity/json-support/PURPOSE
+++ b/Sanity/json-support/PURPOSE
@ -0,0 +1,5 @@
+PURPOSE of /CoreOS/bind/Sanity/json-support
+Description: Test for BZ#1899257 ([RFE] Request for libjson support to be added to)
+Author: Petr Mensik <pemensik@redhat.com>
+Bug summary: [RFE] Request for libjson support to be added to bind compile options for statistics-channel
+Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1899257
--- a/Sanity/json-support/main.fmf
+++ b/Sanity/json-support/main.fmf
@ -0,0 +1,17 @@
+summary: Test for BZ#1899257 ([RFE] Request for libjson support to be added to)
+description: |
+    Bug summary: [RFE] Request for libjson support to be added to bind compile options for statistics-channel
+    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1899257
+contact:
+- Petr Mensik <pemensik@redhat.com>
+component:
+- bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+- bind
+- bind-utils
+- python3
+duration: 5m
+extra-summary: /CoreOS/bind/Sanity/json-support
+extra-task: /CoreOS/bind/Sanity/json-support
--- a/Sanity/json-support/readstats.py
+++ b/Sanity/json-support/readstats.py
@ -0,0 +1,21 @@
+#!/usr/bin/python3
+#
+# Script verifying BIND3 statistics interface work with json
+
+import urllib.request
+import json
+import sys
+
+url = 'http://localhost:80/json' # use first parameter to override
+timeout = 10 # connection timeout in seconds
+
+if len(sys.argv)>1:
+    url = sys.argv[1]
+
+print("# Reading statistics from URL: {0}".format(url))
+with urllib.request.urlopen(url, timeout=timeout) as req:
+    js = json.load(req)
+    #print(json.dumps(js, indent=4))
+    print('BIND version: ', js['version'])
+    print('Socket stats, IPV4 UDP requests: ', js['sockstats']['UDP4Open'])
+    print('Name server stats, UDP queries: ', js['nsstats']['QryUDP'])
--- a/Sanity/json-support/runtest.sh
+++ b/Sanity/json-support/runtest.sh
@ -0,0 +1,65 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/json-support
+#   Description: Test for BZ#1899257 ([RFE] Request for libjson support to be added to)
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+	TESTDIR="`pwd`"
+        rlRun "pushd $TmpDir"
+	rlFileBackup /etc/named.conf
+	STATSURL='http://localhost:853/json'
+	cat >> /etc/named.conf <<NAMEDCONF
+# Enable statistics channel
+statistics-channels {
+        inet 127.0.0.1 port 853 allow { localhost; };
+};
+NAMEDCONF
+	rlRun "named-checkconf" 0 "Check configuration is valid"
+	rlRun "rlServiceStart named"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+	rlRun "rndc reconfig"
+	rlRun "dig @localhost" 0-255 "Run query, may fail"
+	rlRun "python3 \"$TESTDIR/readstats.py\" $STATSURL" 0 "Check JSON statistics"
+	[ "$DEBUG" = y ] && PS1="test-debug $PS1" bash -i
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+	rlRun "rlFileRestore"
+	rlRun "rlServiceRestore"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
--- a/Sanity/named-checkzone/Makefile
+++ b/Sanity/named-checkzone/Makefile
@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/named-checkzone
+#   Description: Sanity/named-checkzone
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2015 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/named-checkzone
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE cptest2.tld.db
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Sanity/named-checkzone" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Sanity/named-checkzone/PURPOSE
+++ b/Sanity/named-checkzone/PURPOSE
@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/bind/Sanity/named-checkzone
+Description: Sanity/named-checkzone
+Author: Petr Sklenar <psklenar@redhat.com>
--- a/Sanity/named-checkzone/cptest2.tld.db
+++ b/Sanity/named-checkzone/cptest2.tld.db
@ -0,0 +1,30 @@
+; cPanel first:11.49.9999.115 (update_time):1429809767 11.49.9999.115: Cpanel::ZoneFile::VERSION:1.3 hostname:i-00002f3f.cpanel.nova latest:11.49.9999.115
+; Zone file for cptest2.tld
+$TTL 14400
+@      86400    IN      SOA     ns1.cpanel.nova. julian.brown.cpanel.net. (
+                2015042303      ; serial, todays date+todays
+                86400           ; refresh, seconds
+                7200            ; retry, seconds
+                3600000         ; expire, seconds
+                86400 )         ; minimum, seconds
+
+cptest2.tld. 86400 IN NS ns1.cpanel.nova.
+cptest2.tld. 86400 IN NS ns2.cpanel.nova.
+
+
+cptest2.tld. IN A 10.6.27.120
+
+cptest2.tld. IN MX 0 cptest2.tld.
+
+mail IN CNAME cptest2.tld.
+www IN CNAME cptest2.tld.
+ftp IN A 10.6.27.120
+
+cptest2.tld. IN TXT "v=spf1 +a +mx +ip4:10.6.27.120 ~all"
+cpanel IN A 10.6.27.120
+webdisk IN A 10.6.27.120
+cpcalendars IN A 10.6.27.120
+cpcontacts IN A 10.6.27.120
+whm IN A 10.6.27.120
+webmail IN A 10.6.27.120
+default._domainkey IN TXT "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAna8Du0cGijhRQWLN1Eb0jqJZbggaSqmyyM2EEua3U8J9YWJ9nNMS08lSHGyQSpVPh8g/uJaHa1cMkXla5ZGGra5GhY+WbAd9m6W45ztcMnXMTBbmMtMu24LgdXWNj0Lkotl4ewCEn9UioQFxpIbNnn6qrhKMajsfygb5/Zzq1rF2NT+FjZRbXtkKGd6tgB03I" bnMlMrmuccNX8U3oVbAk0+hI+Y5eOErYK54iUPvysF9MJJWMV40H7woumNvx73jswA2iK+ZKPOGH9CNXbToqgTbJmRRoMpY0nwjCVsIhaCN9bZxrpF/LaoE/3qeccUAT1tIwEZJIj6ruC8Rx3ydwQIDAQAB\;
--- a/Sanity/named-checkzone/main.fmf
+++ b/Sanity/named-checkzone/main.fmf
@ -0,0 +1,25 @@
+summary: Sanity/named-checkzone
+description: ''
+contact: Petr Sklenar <psklenar@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - bind
+  - bind-utils
+duration: 5m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIP_fedora_pass
+  - TIPfail_infra
+  - TIPpass
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+extra-nitrate: TC#0500008
+extra-summary: /CoreOS/bind/Sanity/named-checkzone
+extra-task: /CoreOS/bind/Sanity/named-checkzone
--- a/Sanity/named-checkzone/runtest.sh
+++ b/Sanity/named-checkzone/runtest.sh
@ -0,0 +1,45 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/named-checkzone
+#   Description: Sanity/named-checkzone
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2015 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+	rlRun "ls cptest2.tld.db"
+    rlPhaseEnd
+
+    rlPhaseStartTest "check zone file from bug 1215164"
+	rlRun "named-checkzone cptest2.tld cptest2.tld.db"	
+	rlRun "named-checkzone cptest2.tld cptest2.tld.db | grep 'add matching type SPF record'" 1
+    rlPhaseEnd
+
+rlJournalPrintText
+rlJournalEnd
--- a/Smoke/IpaInstallAndStart/main.fmf
+++ b/Smoke/IpaInstallAndStart/main.fmf
@ -0,0 +1,3 @@
+summary: Ipa install, Start and basic usage
+test: ./test.sh
+framework: beakerlib
--- a/Smoke/IpaInstallAndStart/test.sh
+++ b/Smoke/IpaInstallAndStart/test.sh
@ -0,0 +1,110 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#	test based on original Petr Mensik's tests
+#
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+
+DM_SECRET=dmSecret
+ADMIN_SECRET=adminSecret
+HOST_SECRET=hostSecret
+DOMAIN=ipa.test
+REALM=IPA.TEST
+
+fetch_local_ipv4()
+{
+        IP4=`ip address | awk '$1 == "inet" { print $2 }' | cut -d/ -f1 | grep -v '^127\.'`
+}
+
+prepareIpaServer()
+{
+        rlRun "dnf -y module install idm:DL1"
+        rlRun "dnf -y install freeipa-server-dns"
+        HOSTNAME=`hostname`
+        if echo $HOSTNAME | grep '\.'
+        then
+                rlLog "Using full hostname $HOSTNAME"
+        else
+                IP4=`fetch_local_ipv4`
+                HOSTNAME=`dig +short -x ${IP4}`
+                HOSTNAME="${HOSTNAME%.}"
+                ORIG_HOSTNAME=${HOSTNAME}
+                HOSTNAME=primary.ipa.test
+                rlRun "hostname ${HOSTNAME}" 0 "Resetting machine hostname to $HOSTNAME"
+        fi
+        if ! ipactl status
+        then
+                if ! grep ${HOSTNAME} /etc/hosts
+                then
+                        # getent hosts ${HOSTNAME} >> /etc/hosts
+                        echo "${IP4}    ${HOSTNAME} ${ORIG_HOSTNAME}" >> /etc/hosts
+                fi
+                rlRun "ipa-server-install -U --hostname ${HOSTNAME} -n ${DOMAIN} -r ${REALM} --setup-dns -p ${DM_SECRET} -a ${ADMIN_SECRET} --auto-forwarders"
+        fi
+}
+
+make_update()
+{
+        local IPV4=`fetch_local_ipv4`
+        local TTL=600
+        cat << NSUPDATE
+gsstsig
+prereq yxdomain primary.ipa.test
+update del primary.ipa.test
+send
+
+gsstsig
+update add primary.ipa.test ${TTL} IN A ${IPV4}
+send
+NSUPDATE
+}
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "TestDir=`pwd`" 0 "Saving test directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartSetup "Prepare IPA"
+        prepareIpaServer
+    rlPhaseEnd
+
+   rlPhaseStartTest
+	for i in `seq 5 6`;do
+		rlRun "ipactl restart"
+		sleep $i
+		rlRun "systemctl restart named.service"
+		sleep $i
+	done
+   rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "kinit -kt /etc/krb5.keytab" 0 "Login machine into kerberos"
+        rlRun "klist" 0 "Ensure some ticket is there"
+        rlRun "make_update > update"
+        rlRun "cp $TestDir/update.gdb update.gdb"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        ipa-server-install --uninstall --unattended
+        killall bind
+        systemctl daemon-reload
+        rlServiceStop
+        rlRun "rm -f $rlRun_LOG"
+        rlRun "popd"
+        rlRun "hostname ${ORIG_HOSTNAME}"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
+
--- a/Stub/master-and-stub-server-talks-a-bit/Makefile
+++ b/Stub/master-and-stub-server-talks-a-bit/Makefile
@ -0,0 +1,62 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Stub/master-and-stub-server-talks-a-bit
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Stub/master-and-stub-server-talks-a-bit
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE petr.god.zone named.conf.MASTER  named.conf.STUB 
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     sanity testing of stub server" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
--- a/Stub/master-and-stub-server-talks-a-bit/PURPOSE
+++ b/Stub/master-and-stub-server-talks-a-bit/PURPOSE
@ -0,0 +1 @@
+Author: Petr Sklenar <psklenar@redhat.com>
--- a/Stub/master-and-stub-server-talks-a-bit/main.fmf
+++ b/Stub/master-and-stub-server-talks-a-bit/main.fmf
@ -0,0 +1,30 @@
+summary: sanity testing of stub server
+description: ''
+contact: Petr Sklenar <psklenar@redhat.com>
+component:
+  - bind
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - bind
+  - bind-utils
+duration: 10m
+enabled: true
+tag:
+  - NoRHEL4
+  - NoRHEL5
+  - TIPfail_infra
+  - TIPpass
+link:
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1291185
+  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1227189
+adjust:
+  - enabled: false
+    when: distro == rhel-4, rhel-5
+    continue: false
+  - enabled: false
+    when: arch == ppc64le
+    continue: false
+extra-nitrate: TC#0518539
+extra-summary: /CoreOS/bind/Stub/master-and-stub-server-talks-a-bit
+extra-task: /CoreOS/bind/Stub/master-and-stub-server-talks-a-bit
--- a/Stub/master-and-stub-server-talks-a-bit/named.conf.MASTER
+++ b/Stub/master-and-stub-server-talks-a-bit/named.conf.MASTER
@ -0,0 +1,23 @@
+options {
+        listen-on port 53 {
+                127.0.0.1;
+        };
+        directory       "/tmp/bind-for-petr";
+        version "unknown";
+        recursion no;
+        allow-query {
+                any;
+        };
+        dnssec-enable no;
+        dnssec-validation no;
+        dnssec-lookaside no;
+};
+
+zone "." {
+        type hint;
+        file "/dev/null";
+};
+zone "petr.god." IN {
+        type master;
+        file "petr.god.zone";
+};
--- a/Stub/master-and-stub-server-talks-a-bit/named.conf.STUB
+++ b/Stub/master-and-stub-server-talks-a-bit/named.conf.STUB
@ -0,0 +1,28 @@
+options {
+        listen-on port 51 {
+                127.0.0.1;
+        };
+        version "unknown";
+        notify-source  127.0.0.1;
+        transfer-source 127.0.0.1;
+        recursion yes;
+	directory 	"/tmp/bind-for-petr";
+	allow-query     { any; };
+
+	dnssec-enable no;
+	dnssec-validation no;
+	dnssec-lookaside no;
+};
+
+zone "." IN {
+	type hint;
+	//file "named.ca";
+	file "/dev/null";
+};
+zone "petr.god." IN {
+
+	type stub;
+	file "petr.god.zone-named2";
+	masters { 127.0.0.1 port 53; };
+	//delegation-only yes;
+};
--- a/Stub/master-and-stub-server-talks-a-bit/petr.god.zone
+++ b/Stub/master-and-stub-server-talks-a-bit/petr.god.zone
@ -0,0 +1,16 @@
+$ORIGIN petr.god.
+$TTL 86400
+@	IN	SOA	dns.petr.god. hostmaster.petr.god. (
+			100	; serial
+			21600		; 
+			3600		;
+			604800		;
+			86400	)	;
+
+	IN	NS	dns.petr.god.
+dns	IN	A	127.0.0.1
+mail	IN	CNAME	dns
+petr.god.	IN	TXT	"v=spf1 +ip4:192.168.122.0/24 -all"
+test1	IN	A	192.168.122.2
+test2	IN	A	192.168.122.3
+test3	IN	A	192.168.122.212
--- a/Stub/master-and-stub-server-talks-a-bit/runtest.sh
+++ b/Stub/master-and-stub-server-talks-a-bit/runtest.sh
@ -0,0 +1,72 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of example.com.zone  Makefile  named.conf.MASTER  named.conf.STUB  PURPOSE  runtest.sh
+#   Description: sanity testing of stub server
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup "base setup"
+        rlAssertRpm $PACKAGE
+	dir='/tmp/bind-for-petr'
+	rm -rf $dir
+	mkdir -p $dir
+	cp petr.god.zone $dir
+	cp named.conf.MASTER $dir/named.conf.MASTER
+	cp named.conf.STUB $dir/named.conf.STUB
+	chmod a+rw -R $dir
+	rlRun "named -u named -fg -d10 -c $dir/named.conf.MASTER &>/$dir/named.conf.MASTER.log &" 0 "named on port 53"
+	rlRun "named -u named -fg -d10 -c $dir/named.conf.STUB &>/$dir/named.conf.STUB.log &" 0 "named on port 51"
+    rlPhaseEnd
+
+
+
+    rlPhaseStartTest 'petr.god'
+	rlRun "dig +short @127.0.0.1 -p 51  petr.god ds"
+	rlRun "dig @127.0.0.1 -p 51 test1.petr.god +short | grep '192.168.122'"
+	rlRun "dig @127.0.0.1 -p 51 dns.petr.god +short | grep '127'"
+    rlPhaseEnd
+sleep 1
+    rlPhaseStartTest "debug logs"
+	lines=`cat /$dir/named.conf.MASTER.log | wc -l`
+	rlAssertGreater "log should be short" 1000 $lines 
+	lines=`cat /$dir/named.conf.MASTER.log|wc -l`
+	rlAssertGreater "log shold be short" 1000 $lines
+	rlRun "grep -v 'Werror=' /$dir/named.conf.MASTER.log | grep -i error" 1 
+	rlAssertGreater 'no more then one known' 3 `grep error //tmp/bind-for-petr/named.conf.STUB.log | wc -l`
+	rlAssertGreater "only few known err" 7 `grep -i fail //tmp/bind-for-petr/named.conf.*.log | wc -l`
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+	rlFileSubmit /$dir/named.conf.MASTER.log
+	rlFileSubmit /$dir/named.conf.STUB.log	
+	rm -rf $dir
+	killall named
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
--- a/dead.package
+++ b/dead.package
@ -1,2 +0,0 @@
-All tests were moved to CentOS Stream gitlab.com:
-https://gitlab.com/redhat/centos-stream/tests/bind
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@ -0,0 +1,6 @@
+summary: CI plan, picks up all tests, runs in beakerlib.
+discover:
+  - name: fedora
+    how: fmf
+execute:
+    how: tmt