[2380] supported basic load

src/bin/loadzone/loadzone.py.in

@@ -19,6 +19,7 @@ import sys
 sys.path.append('@@PYTHONPATH@@')
 from optparse import OptionParser
 from isc.dns import *
+from isc.datasrc import *
 import isc.log
 from isc.log_messages.loadzone_messages import *
 
@@ -49,6 +50,7 @@ class LoadZoneRunner:
         # convenience of tests inspecting them
         self._zone_class = None
         self._zone_name = None
+        self._zone_file = None
 
     def _parse_args(self):
         usage_txt = 'usage: %prog [options] zonename zonefile'
@@ -64,15 +66,23 @@ class LoadZoneRunner:
             raise BadArgument("Invalid zone name '" + args[0] + "': " +
                               str(ex))
 
+    def _do_load(self):
+        datasrc_client = DataSourceClient(self._datasrc_type,
+                                          self._datasrc_config)
+        loader = ZoneLoader(datasrc_client, self._zone_name, self._zone_file)
+        loader.load()
+
     def run(self):
         try:
             self._parse_args()
         except BadArgument as ex:
             logger.error(LOADZONE_ARGUMENT_ERROR, ex)
+        return 0
 
 if '__main__' == __name__:
     runner = LoadZoneRunner(sys.argv[1:])
-    runner.run()
+    ret = runner.run()
+    sys.exit(ret)
 
 ## Local Variables:
 ## mode: python

src/bin/loadzone/tests/Makefile.am

@@ -20,6 +20,9 @@ endif
 	echo Running test: $$pytest ; \
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
 	$(LIBRARY_PATH_PLACEHOLDER) \
+	TESTDATA_PATH=$(abs_top_srcdir)/src/lib/testutils/testdata \
+	LOCAL_TESTDATA_PATH=$(srcdir)/testdata \
+	TESTDATA_WRITE_PATH=$(builddir) \
 	PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/loadzone:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/util/io/.libs \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done

src/bin/loadzone/tests/loadzone_test.py

@@ -18,12 +18,32 @@
 import unittest
 from loadzone import *
 from isc.dns import *
+from isc.datasrc import *
 import isc.log
+import os
+import shutil
 
+# Some common test parameters
+TESTDATA_PATH = os.environ['TESTDATA_PATH'] + os.sep
+READ_ZONE_DB_FILE = TESTDATA_PATH + "rwtest.sqlite3" # original, to be copied
+LOCAL_TESTDATA_PATH = os.environ['LOCAL_TESTDATA_PATH'] + os.sep
+READ_ZONE_DB_FILE = TESTDATA_PATH + "rwtest.sqlite3" # original, to be copied
+NEW_ZONE_TXT_FILE = LOCAL_TESTDATA_PATH + "example.org.zone"
+TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + os.sep
+WRITE_ZONE_DB_FILE = TESTDATA_WRITE_PATH + "rwtest.sqlite3.copied"
 TEST_ZONE_NAME = Name('example.org')
+DATASRC_CONFIG = '{"database_file": "' + WRITE_ZONE_DB_FILE + '"}'
+
+# before/after SOAs: different in mname and serial
+ORIG_SOA_TXT = 'example.org. 3600 IN SOA ns1.example.org. ' +\
+    'admin.example.org. 1234 3600 1800 2419200 7200\n'
+NEW_SOA_TXT = 'example.org. 3600 IN SOA ns.example.org. ' +\
+    'admin.example.org. 1235 3600 1800 2419200 7200\n'
 
 class TestLoadZoneRunner(unittest.TestCase):
     def setUp(self):
+        shutil.copyfile(READ_ZONE_DB_FILE, WRITE_ZONE_DB_FILE)
+
         # default command line arguments
         self.__args = ['example.org', 'example.zone']
         self.__runner = LoadZoneRunner(self.__args)
@@ -55,6 +75,27 @@ class TestLoadZoneRunner(unittest.TestCase):
                           LoadZoneRunner(['bad..name', 'example.zone']).
                           _parse_args)
 
+    def check_zone_soa(self, soa_txt):
+        "Check that the given SOA RR exists and matches the expected string"
+
+        client = DataSourceClient('sqlite3', DATASRC_CONFIG)
+        result, finder = client.find_zone(TEST_ZONE_NAME)
+        self.assertEqual(client.SUCCESS, result)
+        result, rrset, _ = finder.find(TEST_ZONE_NAME, RRType.SOA())
+        self.assertEqual(finder.SUCCESS, result)
+        self.assertEqual(soa_txt, rrset.to_text())
+
+    def test_load_update(self):
+        '''successful case to loading new contents to an existing zone.'''
+        self.__runner._zone_class = RRClass.IN()
+        self.__runner._zone_name = TEST_ZONE_NAME
+        self.__runner._zone_file = NEW_ZONE_TXT_FILE
+        self.__runner._datasrc_type = 'sqlite3'
+        self.__runner._datasrc_config = DATASRC_CONFIG
+        self.check_zone_soa(ORIG_SOA_TXT)
+        self.__runner._do_load()
+        self.check_zone_soa(NEW_SOA_TXT)
+
 if __name__== "__main__":
     isc.log.resetUnitTestRootLogger()
     unittest.main()

src/bin/loadzone/tests/testdata/example.org.zone

+example.org.    3600    IN  SOA (
+		ns.example.org.
+		admin.example.org.
+		1235
+		3600		;1H
+		1800		;30M
+		2419200
+		7200)
+example.org.    3600    IN  NS ns.example.org.
+ns.example.org.	3600    IN  A 192.0.2.1