BIND 10 master, updated. b5fbf8a408a047a2552e89ef435a609f5df58d8c Merge branch 'master' into trac2023
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jun 20 04:53:56 UTC 2012
The branch, master has been updated
via b5fbf8a408a047a2552e89ef435a609f5df58d8c (commit)
via 4286da121e15202be075acfc827bf536fb683984 (commit)
via cb8f6b5eed2ac37af62937361f96a477e09eb8f0 (commit)
via 0c0107eedfd6f301c399b19f722b7f1f651e6a15 (commit)
from 34521105b0e83da5f2c6682481330a97beb082f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b5fbf8a408a047a2552e89ef435a609f5df58d8c
Merge: 4286da1 3452110
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Jun 20 10:11:10 2012 +0530
Merge branch 'master' into trac2023
commit 4286da121e15202be075acfc827bf536fb683984
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Jun 20 10:03:09 2012 +0530
[2023] Check that zonemgr receives the ZONE_NEW_DATA_READY_CMD notification in lettuce test
commit cb8f6b5eed2ac37af62937361f96a477e09eb8f0
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri Jun 15 01:07:28 2012 +0530
[2023] Also move ZONE_XFRIN_FAILED to a single module
commit 0c0107eedfd6f301c399b19f722b7f1f651e6a15
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri Jun 15 01:04:07 2012 +0530
[2023] Change back ZONE_NEW_DATA_READY_CMD to 'zone_new_data_ready'
It used to be 'zone_new_data_ready' originally, but got changed to
'notify' some time back.
-----------------------------------------------------------------------
Summary of changes:
src/bin/ddns/tests/ddns_test.py | 3 ++-
src/bin/xfrin/xfrin.py.in | 3 +--
src/bin/zonemgr/tests/zonemgr_test.py | 3 ++-
src/bin/zonemgr/zonemgr.py.in | 9 ++++-----
src/lib/python/isc/notify/notify_out.py | 4 +++-
tests/lettuce/features/xfrin_bind10.feature | 1 +
6 files changed, 13 insertions(+), 10 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/ddns/tests/ddns_test.py b/src/bin/ddns/tests/ddns_test.py
index 3343031..b0e2a66 100755
--- a/src/bin/ddns/tests/ddns_test.py
+++ b/src/bin/ddns/tests/ddns_test.py
@@ -26,6 +26,7 @@ from isc.config.config_data import ConfigData
from isc.config.ccsession import create_answer, ModuleCCSessionError
from isc.config.module_spec import ModuleSpecError
from isc.server_common.dns_tcp import DNSTCPContext
+from isc.notify import notify_out
import ddns
import errno
import os
@@ -1170,7 +1171,7 @@ class TestDDNSSession(unittest.TestCase):
sent_msg, sent_group = self.__cc_session._sent_msg[msg_cnt]
sent_cmd = sent_msg['command']
self.assertEqual('Xfrout', sent_group)
- self.assertEqual('notify', sent_cmd[0])
+ self.assertEqual(notify_out.ZONE_NEW_DATA_READY_CMD, sent_cmd[0])
self.assertEqual(2, len(sent_cmd[1]))
self.assertEqual(TEST_ZONE_NAME.to_text(), sent_cmd[1]['zone_name'])
self.assertEqual(TEST_RRCLASS.to_text(), sent_cmd[1]['zone_class'])
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 74e0faf..652f870 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -71,7 +71,6 @@ AUTH_MODULE_NAME = 'Auth'
XFROUT_MODULE_NAME = 'Xfrout'
ZONE_MANAGER_MODULE_NAME = 'Zonemgr'
REFRESH_FROM_ZONEMGR = 'refresh_from_zonemgr'
-ZONE_XFRIN_FAILED = 'zone_xfrin_failed'
# Constants for debug levels.
DBG_XFRIN_TRACE = logger.DBGLVL_TRACE_BASIC
@@ -1580,7 +1579,7 @@ class Xfrin:
logger.error(XFRIN_MSGQ_SEND_ERROR, XFROUT_MODULE_NAME, ZONE_MANAGER_MODULE_NAME)
else:
- msg = create_command(ZONE_XFRIN_FAILED, param)
+ msg = create_command(notify_out.ZONE_XFRIN_FAILED, param)
# catch the exception, in case msgq has been killed.
try:
seq = self._send_cc_session.group_sendmsg(msg, ZONE_MANAGER_MODULE_NAME)
diff --git a/src/bin/zonemgr/tests/zonemgr_test.py b/src/bin/zonemgr/tests/zonemgr_test.py
index d69d672..42ed679 100644
--- a/src/bin/zonemgr/tests/zonemgr_test.py
+++ b/src/bin/zonemgr/tests/zonemgr_test.py
@@ -21,6 +21,7 @@ import os
import tempfile
from zonemgr import *
from isc.testutils.ccsession_mock import MockModuleCCSession
+from isc.notify import notify_out
ZONE_NAME_CLASS1_IN = ("example.net.", "IN")
ZONE_NAME_CLASS1_CH = ("example.net.", "CH")
@@ -684,7 +685,7 @@ class TestZonemgr(unittest.TestCase):
self.assertEqual(answer1, self.zonemgr._parse_cmd_params(params1, ZONE_NOTIFY_COMMAND))
params2 = {"zone_name" : "example.com.", "zone_class" : "IN"}
answer2 = ZONE_NAME_CLASS3_IN
- self.assertEqual(answer2, self.zonemgr._parse_cmd_params(params2, ZONE_XFRIN_SUCCESS_COMMAND))
+ self.assertEqual(answer2, self.zonemgr._parse_cmd_params(params2, notify_out.ZONE_NEW_DATA_READY_CMD))
self.assertRaises(ZonemgrException, self.zonemgr._parse_cmd_params, params2, ZONE_NOTIFY_COMMAND)
params1 = {"zone_class" : "CH"}
self.assertRaises(ZonemgrException, self.zonemgr._parse_cmd_params, params2, ZONE_NOTIFY_COMMAND)
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index e56477e..8cb616d 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -39,6 +39,7 @@ from optparse import OptionParser, OptionValueError
from isc.config.ccsession import *
import isc.util.process
from isc.log_messages.zonemgr_messages import *
+from isc.notify import notify_out
# Initialize logging for called modules.
isc.log.init("b10-zonemgr")
@@ -78,8 +79,6 @@ XFRIN_MODULE_NAME = 'Xfrin'
AUTH_MODULE_NAME = 'Auth'
# define command name
-ZONE_XFRIN_FAILED_COMMAND = 'zone_xfrin_failed'
-ZONE_XFRIN_SUCCESS_COMMAND = 'zone_new_data_ready'
ZONE_REFRESH_COMMAND = 'refresh_from_zonemgr'
ZONE_NOTIFY_COMMAND = 'notify'
@@ -623,7 +622,7 @@ class Zonemgr:
def command_handler(self, command, args):
"""Handle command receivd from command channel.
ZONE_NOTIFY_COMMAND is issued by Auth process;
- ZONE_XFRIN_SUCCESS_COMMAND and ZONE_XFRIN_FAILED_COMMAND are issued by
+ ZONE_NEW_DATA_READY_CMD and ZONE_XFRIN_FAILED are issued by
Xfrin process;
shutdown is issued by a user or Boss process. """
answer = create_answer(0)
@@ -637,7 +636,7 @@ class Zonemgr:
# Send notification to zonemgr timer thread
self._master_socket.send(b" ")# make self._slave_socket readble
- elif command == ZONE_XFRIN_SUCCESS_COMMAND:
+ elif command == notify_out.ZONE_NEW_DATA_READY_CMD:
""" Handle xfrin success command"""
zone_name_class = self._parse_cmd_params(args, command)
logger.debug(DBG_ZONEMGR_COMMAND, ZONEMGR_RECEIVE_XFRIN_SUCCESS, zone_name_class[0], zone_name_class[1])
@@ -645,7 +644,7 @@ class Zonemgr:
self._zone_refresh.zone_refresh_success(zone_name_class)
self._master_socket.send(b" ")# make self._slave_socket readble
- elif command == ZONE_XFRIN_FAILED_COMMAND:
+ elif command == notify_out.ZONE_XFRIN_FAILED:
""" Handle xfrin fail command"""
zone_name_class = self._parse_cmd_params(args, command)
logger.debug(DBG_ZONEMGR_COMMAND, ZONEMGR_RECEIVE_XFRIN_FAILED, zone_name_class[0], zone_name_class[1])
diff --git a/src/lib/python/isc/notify/notify_out.py b/src/lib/python/isc/notify/notify_out.py
index bfa7167..83ac1d0 100644
--- a/src/lib/python/isc/notify/notify_out.py
+++ b/src/lib/python/isc/notify/notify_out.py
@@ -34,7 +34,9 @@ logger = isc.log.Logger("notify_out")
# initialized yet. see trac ticket #1103
from isc.dns import *
-ZONE_NEW_DATA_READY_CMD = 'notify'
+ZONE_NEW_DATA_READY_CMD = 'zone_new_data_ready'
+ZONE_XFRIN_FAILED = 'zone_xfrin_failed'
+
_MAX_NOTIFY_NUM = 30
_MAX_NOTIFY_TRY_NUM = 5
_EVENT_NONE = 0
diff --git a/tests/lettuce/features/xfrin_bind10.feature b/tests/lettuce/features/xfrin_bind10.feature
index bccb53b..27dfb83 100644
--- a/tests/lettuce/features/xfrin_bind10.feature
+++ b/tests/lettuce/features/xfrin_bind10.feature
@@ -26,6 +26,7 @@ Feature: Xfrin
A query for www.example.org should have rcode REFUSED
When I send bind10 the command Xfrin retransfer example.org IN ::1 47807
Then wait for new bind10 stderr message XFRIN_TRANSFER_SUCCESS not XFRIN_XFR_PROCESS_FAILURE
+ Then wait for new bind10 stderr message ZONEMGR_RECEIVE_XFRIN_SUCCESS
A query for www.example.org should have rcode NOERROR
# The transferred zone should have 11 non-NSEC3 RRs and 1 NSEC3 RR.
More information about the bind10-changes
mailing list