[svn] commit: r2607 - in /branches/trac215: ./ src/bin/ src/bin/bind10/ src/bin/cfgmgr/ src/bin/zonemgr/ src/bin/zonemgr/tests/ src/lib/python/isc/datasrc/
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Aug 2 03:30:43 UTC 2010
Author: chenzhengzhang
Date: Mon Aug 2 03:30:42 2010
New Revision: 2607
Log:
Finish secondary manager code and unittest
Added:
branches/trac215/src/bin/zonemgr/
branches/trac215/src/bin/zonemgr/Makefile.am
branches/trac215/src/bin/zonemgr/run_b10-zonemgr.sh.in
branches/trac215/src/bin/zonemgr/tests/
branches/trac215/src/bin/zonemgr/tests/Makefile.am
branches/trac215/src/bin/zonemgr/tests/zonemgr_test.in
branches/trac215/src/bin/zonemgr/tests/zonemgr_test.py
branches/trac215/src/bin/zonemgr/zonemgr.py.in
branches/trac215/src/bin/zonemgr/zonemgr.spec.pre.in
Modified:
branches/trac215/configure.ac
branches/trac215/src/bin/Makefile.am
branches/trac215/src/bin/bind10/bind10.py.in
branches/trac215/src/bin/bind10/run_bind10.sh.in
branches/trac215/src/bin/cfgmgr/Makefile.am
branches/trac215/src/lib/python/isc/datasrc/sqlite3_ds.py
Modified: branches/trac215/configure.ac
==============================================================================
--- branches/trac215/configure.ac (original)
+++ branches/trac215/configure.ac Mon Aug 2 03:30:42 2010
@@ -411,6 +411,8 @@
src/bin/xfrin/tests/Makefile
src/bin/xfrout/Makefile
src/bin/xfrout/tests/Makefile
+ src/bin/zonemgr/Makefile
+ src/bin/zonemgr/tests/Makefile
src/bin/usermgr/Makefile
src/lib/Makefile
src/lib/cc/Makefile
@@ -448,6 +450,10 @@
src/bin/xfrout/xfrout.spec.pre
src/bin/xfrout/tests/xfrout_test
src/bin/xfrout/run_b10-xfrout.sh
+ src/bin/zonemgr/zonemgr.py
+ src/bin/zonemgr/zonemgr.spec.pre
+ src/bin/zonemgr/tests/zonemgr_test
+ src/bin/zonemgr/run_b10-zonemgr.sh
src/bin/bind10/bind10.py
src/bin/bind10/tests/bind10_test
src/bin/bind10/run_bind10.sh
@@ -477,10 +483,12 @@
chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
chmod +x src/bin/xfrin/run_b10-xfrin.sh
chmod +x src/bin/xfrout/run_b10-xfrout.sh
+ chmod +x src/bin/zonemgr/run_b10-zonemgr.sh
chmod +x src/bin/bind10/run_bind10.sh
chmod +x src/bin/cmdctl/tests/cmdctl_test
chmod +x src/bin/xfrin/tests/xfrin_test
chmod +x src/bin/xfrout/tests/xfrout_test
+ chmod +x src/bin/zonemgr/tests/zonemgr_test
chmod +x src/bin/bindctl/tests/bindctl_test
chmod +x src/bin/bindctl/run_bindctl.sh
chmod +x src/bin/loadzone/run_loadzone.sh
Modified: branches/trac215/src/bin/Makefile.am
==============================================================================
--- branches/trac215/src/bin/Makefile.am (original)
+++ branches/trac215/src/bin/Makefile.am Mon Aug 2 03:30:42 2010
@@ -1,1 +1,1 @@
-SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin xfrout usermgr
+SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth xfrin xfrout usermgr zonemgr
Modified: branches/trac215/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac215/src/bin/bind10/bind10.py.in (original)
+++ branches/trac215/src/bin/bind10/bind10.py.in Mon Aug 2 03:30:42 2010
@@ -396,6 +396,26 @@
sys.stdout.write("[bind10] Started b10-xfrin (PID %d)\n" %
xfrind.pid)
+ # start b10-zonemgr
+ zonemgr_args = ['b10-zonemgr']
+ if self.verbose:
+ sys.stdout.write("[bind10] Starting b10-zonemgr\n")
+ zonemgr_args += ['-v']
+ try:
+ zonemgr = ProcessInfo("b10-zonemgr", zonemgr_args,
+ c_channel_env)
+ except Exception as e:
+ c_channel.process.kill()
+ bind_cfgd.process.kill()
+ xfrout.process.kill()
+ auth.process.kill()
+ xfrind.process.kill()
+ return "Unable to start b10-zonemgr; " + str(e)
+ self.processes[zonemgr.pid] = zonemgr
+ if self.verbose:
+ sys.stdout.write("[bind10] Started b10-zonemgr(PID %d)\n" %
+ zonemgr.pid)
+
# start the b10-cmdctl
# XXX: we hardcode port 8080
cmdctl_args = ['b10-cmdctl']
@@ -411,6 +431,7 @@
xfrout.process.kill()
auth.process.kill()
xfrind.process.kill()
+ zonemgr.process.kill()
return "Unable to start b10-cmdctl; " + str(e)
self.processes[cmd_ctrld.pid] = cmd_ctrld
if self.verbose:
@@ -429,6 +450,7 @@
self.cc_session.group_sendmsg(cmd, "Boss", "Auth")
self.cc_session.group_sendmsg(cmd, "Boss", "Xfrout")
self.cc_session.group_sendmsg(cmd, "Boss", "Xfrin")
+ self.cc_session.group_sendmsg(cmd, "Boss", "Zonemgr")
def stop_process(self, process):
"""Stop the given process, friendly-like."""
Modified: branches/trac215/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/trac215/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/trac215/src/bin/bind10/run_bind10.sh.in Mon Aug 2 03:30:42 2010
@@ -20,7 +20,7 @@
BIND10_PATH=@abs_top_builddir@/src/bin/bind10
-PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:$PATH
+PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:@abs_top_builddir@/src/bin/xfrin:@abs_top_builddir@/src/bin/xfrout:@abs_top_builddir@/src/bin/zonemgr:$PATH
export PATH
PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/lib/dns/python/.libs:@abs_top_builddir@/src/lib/xfr/.libs
Modified: branches/trac215/src/bin/cfgmgr/Makefile.am
==============================================================================
--- branches/trac215/src/bin/cfgmgr/Makefile.am (original)
+++ branches/trac215/src/bin/cfgmgr/Makefile.am Mon Aug 2 03:30:42 2010
@@ -6,7 +6,7 @@
CLEANFILES = b10-cfgmgr b10-cfgmgr.pyc
-b10_cfgmgrdir = @localstatedir@/@PACKAGE@
+b10_cfgmgrdir = $(DESTDIR)$(pkgdatadir)
#B10_cfgmgr_DATA =
man_MANS = b10-cfgmgr.8
Modified: branches/trac215/src/lib/python/isc/datasrc/sqlite3_ds.py
==============================================================================
--- branches/trac215/src/lib/python/isc/datasrc/sqlite3_ds.py (original)
+++ branches/trac215/src/lib/python/isc/datasrc/sqlite3_ds.py Mon Aug 2 03:30:42 2010
@@ -132,6 +132,19 @@
return row[0]
else:
return ''
+
+#########################################################################
+# get_zone_names:
+# returns all zone names of datasrc
+#########################################################################
+def get_zone_names(dbfile):
+ conn, cur = open(dbfile)
+ cur.execute("SELECT distinct name from zones")
+ zone_names = cur.fetchall()
+ cur.close()
+ conn.close()
+
+ return zone_names
#########################################################################
# reverse_name:
More information about the bind10-changes
mailing list