[2854] made trivial updates to xfrin for the correction to reconfigure()

diff --git a/src/bin/xfrin/tests/xfrin_test.py b/src/bin/xfrin/tests/xfrin_test.py
index bfcbdcb584d01caa3e8134f67c6b3b1cc9e84276..c431f4c600a362d148844820f520d99ed2127ce8 100644 (file)
--- a/src/bin/xfrin/tests/xfrin_test.py
+++ b/src/bin/xfrin/tests/xfrin_test.py
@@ -256,11 +256,11 @@ class MockDataSrcClientsMgr():
     def get_client_list(self, rrclass):
         return self.found_datasrc_client_list
 
-    def reconfigure(self, arg1):
+    def reconfigure(self, arg1, arg2):
         # the only current test simply needs to know this is called with
-        # the expected argument and exceptions are handled.  if we need more
+        # the expected arguments and exceptions are handled.  if we need more
         # variations in tests, this mock method should be extended.
-        self.reconfigure_param.append(arg1)
+        self.reconfigure_param.append((arg1, arg2))
         raise isc.server_common.datasrc_clients_mgr.ConfigError(
             'reconfigure failure')
 
@@ -3038,7 +3038,7 @@ class TestXfrin(unittest.TestCase):
         # we just check it's called as expected, and the only possible
         # exception doesn't cause disruption.
         self.xfr._datasrc_config_handler(True, False)
-        self.assertEqual([True],
+        self.assertEqual([(True, False)],
                          self.xfr._datasrc_clients_mgr.reconfigure_param)
 
 def raise_interrupt():

diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index bcf96afe48402af8513d9ed39f3e28c5563391ad..6ff28050ed3e516d41a7c148212d62bbd98641d0 100755 (executable)
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -1459,7 +1459,7 @@ class Xfrin:
 
         """
         try:
-            self._datasrc_clients_mgr.reconfigure(new_config)
+            self._datasrc_clients_mgr.reconfigure(new_config, config_data)
         except isc.server_common.datasrc_clients_mgr.ConfigError as ex:
             logger.error(XFRIN_DATASRC_CONFIG_ERROR, ex)