BIND 10 master, updated. da3e9e54f1374d581d78f1d874ddafd427a622ab [master] update the ChangeLog entry for trac917
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Nov 17 10:22:53 UTC 2011
The branch, master has been updated
via da3e9e54f1374d581d78f1d874ddafd427a622ab (commit)
via b34bf286c064d44746ec0b79e38a6177d01e6956 (commit)
via b79e0ef1ad1ac5c64c8a131ea8e125ca6df066eb (commit)
via 3d3592d4b1e7d3b0b3164067e57c1343db691851 (commit)
via d9be597335af84bc93c9559bbd76fa85ef0f49c4 (commit)
via bccc91bbd2496b87b408ebff3cd9c6880f952b1c (commit)
via 88147da513fdb22eb4e430390746f36c96304c7e (commit)
via 567f822d4758d13b84161d67118ac1bce08b4c47 (commit)
via e3406364189d62ba54d85c3d23b40cefd02af584 (commit)
via 489a53541118413b38865c8a3cf84b24b8b7dfe2 (commit)
via 63f04832f2604868133a23d110ce6df5a9707993 (commit)
via de07e6a0ab66de4d3c7720dc93bc7d9198c9d26b (commit)
via 2139076757c1a14ecce96eafd1388f978732f8aa (commit)
via ab47b771999bd12171e65a8a3fb2ee512b709c4b (commit)
via ebe4e57805eda25ca347e0a9db8adad11fb3d4b5 (commit)
via 50e96053742a30584f91a6bdb4b788977cd166bf (commit)
via f1e08d75cabc45454a9bde86158dc8c7348d7f9d (commit)
via cc48074a9fec60ef9ba69991549f9e167e620225 (commit)
via 8e8607c6faa34d9493a831054ecb64281f1f06c7 (commit)
via 4ab7d17edc10ce4f7b834709aa009aba4db9d877 (commit)
via df02b63fe1176c572a7eee996921f211ca970953 (commit)
via f8a64959bc5f3ddf68ba4d01bee092bf4f1f9558 (commit)
via 7e96227163334ecd54e506bd2cedb58d3f6cf91d (commit)
via 6d5f34008d7e793546fd990cad11e40268c0ff04 (commit)
via 2085b2255a79c0e5a04fe457bbb228d2fa24953b (commit)
via 2d20ee347d82f840328c2bddd014cdf232962843 (commit)
via 1ff0be2456cfaf9279970ae9a30a48d6267b96cf (commit)
via 80447181a64656b97afa9ab71440907017e873f4 (commit)
via 3878aa43817deaee33b21956d3066baef77a24ce (commit)
via 6b600cb1816705b04470ba2d0aca64dfdf8f55d2 (commit)
via c383ebc71434baa5cb314b3de3f3e18f39ebd0c7 (commit)
via d5ec22cc344998038cf68b6fdf309ad2a12b2b5e (commit)
via 2024a1554624868e5f0a4d09b75c3ddf39dd342d (commit)
via 10b6bc17b7c264f41dcdba64fc3a79904c06164a (commit)
via a48e7fa14f2ef90bce27ff3e7aa4a93165e08d37 (commit)
via 62809f71c563128cb3cc467d867c621c61dbb926 (commit)
via 08d090b4685220d3f286e1506e1a3c884146122f (commit)
via 7b667cbd3bd3baeaceb60b987ab9770684ff5038 (commit)
via ab48bd8228405d50b149c502d7f73b5eb1a57608 (commit)
via ecf9f48f4b4c3beaf97ae0e83c11f4547f024734 (commit)
via 4d39e13d7f5ae5c30277f602f669f0421e2bf05c (commit)
via 3bf84d5c678f9f86df6382cf30e694404e2f77cb (commit)
via 12a6217c59bf48ead2e11aaaedb774af7a618701 (commit)
via cb57c9fcaa897752dd7599dcc15d647fb880285f (commit)
via 1294219279910a89d4a99e6292cea8e13a4c301e (commit)
via 61dd61b8f259b0938646fa2539fe928608a0fbad (commit)
via f1306bd835659173f3fffcfbe1bf8971dc62efd9 (commit)
via 7cc8a7d6c32472021b34e43d43a288cfa263f007 (commit)
from 120946aa30b22c36995135b7d5bfcade4c26e192 (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 da3e9e54f1374d581d78f1d874ddafd427a622ab
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Nov 16 21:26:11 2011 +0900
[master] update the ChangeLog entry for trac917
commit b34bf286c064d44746ec0b79e38a6177d01e6956
Merge: 120946aa30b22c36995135b7d5bfcade4c26e192 b79e0ef1ad1ac5c64c8a131ea8e125ca6df066eb
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Nov 16 21:25:35 2011 +0900
Merge branch 'trac917'
Conflicts:
ChangeLog
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 +
src/bin/stats/stats-httpd-xml.tpl | 23 +-
src/bin/stats/stats-httpd-xsd.tpl | 38 +--
src/bin/stats/stats-httpd-xsl.tpl | 27 +-
src/bin/stats/stats.py.in | 8 +-
src/bin/stats/stats_httpd.py.in | 511 ++++++++++++++---
src/bin/stats/stats_httpd_messages.mes | 6 +
src/bin/stats/tests/Makefile.am | 2 +-
src/bin/stats/tests/b10-stats-httpd_test.py | 823 +++++++++++++++++++++++----
src/bin/stats/tests/b10-stats_test.py | 194 +++++--
src/bin/stats/tests/test_utils.py | 59 ++-
11 files changed, 1384 insertions(+), 318 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 4ce4c0e..dea0438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+319. [func] naokikambe
+ b10-stats-httpd was updated. In addition of the access to all
+ statistics items of all modules, the specified item or the items of the
+ specified module name can be accessed. For example, the URI requested
+ by using the feature is showed as "/bind10/statistics/xml/Auth" or
+ "/bind10/statistics/xml/Auth/queries.tcp". The list of all possible
+ module names and all possible item names can be showed in the root
+ document, whose URI is "/bind10/statistics/xml". This change is not
+ only for the XML documents but also is for the XSD and XSL documents.
+ (Trac #917, git b34bf286c064d44746ec0b79e38a6177d01e6956)
+
318. [func] stephen
Add C++ API for accessing zone difference information in database-based
data sources.
diff --git a/src/bin/stats/stats-httpd-xml.tpl b/src/bin/stats/stats-httpd-xml.tpl
index d5846ad..ed91423 100644
--- a/src/bin/stats/stats-httpd-xml.tpl
+++ b/src/bin/stats/stats-httpd-xml.tpl
@@ -1,24 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="$xsl_url_path"?>
-<!--
- - Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
- -
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
--->
-
-<stats:stats_data version="1.0"
- xmlns:stats="$xsd_namespace"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="$xsd_namespace $xsd_url_path">
- $xml_string
-</stats:stats_data>
+$xml_string
\ No newline at end of file
diff --git a/src/bin/stats/stats-httpd-xsd.tpl b/src/bin/stats/stats-httpd-xsd.tpl
index 6ad1280..cc5578a 100644
--- a/src/bin/stats/stats-httpd-xsd.tpl
+++ b/src/bin/stats/stats-httpd-xsd.tpl
@@ -1,38 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
- -
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
--->
-
-<schema targetNamespace="$xsd_namespace"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:stats="$xsd_namespace">
- <annotation>
- <documentation xml:lang="en">XML schema of the statistics
- data in BIND 10</documentation>
- </annotation>
- <element name="stats_data">
- <annotation>
- <documentation>A set of statistics data</documentation>
- </annotation>
- <complexType>
- $xsd_string
- <attribute name="version" type="token" use="optional" default="1.0">
- <annotation>
- <documentation>Version number of syntax</documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-</schema>
+$xsd_string
diff --git a/src/bin/stats/stats-httpd-xsl.tpl b/src/bin/stats/stats-httpd-xsl.tpl
index a1f6406..7c2e7ae 100644
--- a/src/bin/stats/stats-httpd-xsl.tpl
+++ b/src/bin/stats/stats-httpd-xsl.tpl
@@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
- -
- - Permission to use, copy, modify, and/or distribute this software for any
- - purpose with or without fee is hereby granted, provided that the above
- - copyright notice and this permission notice appear in all copies.
- -
- - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- - AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- - PERFORMANCE OF THIS SOFTWARE.
--->
-
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml"
- xmlns:stats="$xsd_namespace">
+ xmlns:bind10="$xsd_namespace">
<xsl:output method="html" encoding="UTF-8"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
doctype-system=" http://www.w3.org/TR/html4/loose.dtd " />
@@ -42,14 +26,7 @@ td.title {
</head>
<body>
<h1>BIND 10 Statistics</h1>
- <table>
- <tr>
- <th>Owner</th>
- <th>Title</th>
- <th>Value</th>
- </tr>
- <xsl:apply-templates />
- </table>
+ <xsl:apply-templates />
</body>
</html>
</xsl:template>
diff --git a/src/bin/stats/stats.py.in b/src/bin/stats/stats.py.in
index 3a7f47a..51c4e09 100755
--- a/src/bin/stats/stats.py.in
+++ b/src/bin/stats/stats.py.in
@@ -246,12 +246,12 @@ class Stats:
self.update_statistics_data()
if owner and name:
try:
- return self.statistics_data[owner][name]
+ return {owner:{name:self.statistics_data[owner][name]}}
except KeyError:
pass
elif owner:
try:
- return self.statistics_data[owner]
+ return {owner: self.statistics_data[owner]}
except KeyError:
pass
elif name:
@@ -360,9 +360,9 @@ class Stats:
if owner:
try:
if name:
- return isc.config.create_answer(0, schema_byname[owner][name])
+ return isc.config.create_answer(0, {owner:[schema_byname[owner][name]]})
else:
- return isc.config.create_answer(0, schema[owner])
+ return isc.config.create_answer(0, {owner:schema[owner]})
except KeyError:
pass
else:
diff --git a/src/bin/stats/stats_httpd.py.in b/src/bin/stats/stats_httpd.py.in
index 042630d..f265abb 100644
--- a/src/bin/stats/stats_httpd.py.in
+++ b/src/bin/stats/stats_httpd.py.in
@@ -29,6 +29,7 @@ import http.server
import socket
import string
import xml.etree.ElementTree
+import urllib.parse
import isc.cc
import isc.config
@@ -66,7 +67,7 @@ XML_URL_PATH = '/bind10/statistics/xml'
XSD_URL_PATH = '/bind10/statistics/xsd'
XSL_URL_PATH = '/bind10/statistics/xsl'
# TODO: This should be considered later.
-XSD_NAMESPACE = 'http://bind10.isc.org' + XSD_URL_PATH
+XSD_NAMESPACE = 'http://bind10.isc.org/bind10'
# Assign this process name
isc.util.process.rename()
@@ -85,14 +86,29 @@ class HttpHandler(http.server.BaseHTTPRequestHandler):
def send_head(self):
try:
- if self.path == XML_URL_PATH:
- body = self.server.xml_handler()
- elif self.path == XSD_URL_PATH:
- body = self.server.xsd_handler()
- elif self.path == XSL_URL_PATH:
- body = self.server.xsl_handler()
+ req_path = self.path
+ req_path = urllib.parse.urlsplit(req_path).path
+ req_path = urllib.parse.unquote(req_path)
+ req_path = os.path.normpath(req_path)
+ path_dirs = req_path.split('/')
+ path_dirs = [ d for d in filter(None, path_dirs) ]
+ req_path = '/'+"/".join(path_dirs)
+ module_name = None
+ item_name = None
+ # in case of /bind10/statistics/xxx/YYY/zzz
+ if len(path_dirs) >= 5:
+ item_name = path_dirs[4]
+ # in case of /bind10/statistics/xxx/YYY ...
+ if len(path_dirs) >= 4:
+ module_name = path_dirs[3]
+ if req_path == '/'.join([XML_URL_PATH] + path_dirs[3:5]):
+ body = self.server.xml_handler(module_name, item_name)
+ elif req_path == '/'.join([XSD_URL_PATH] + path_dirs[3:5]):
+ body = self.server.xsd_handler(module_name, item_name)
+ elif req_path == '/'.join([XSL_URL_PATH] + path_dirs[3:5]):
+ body = self.server.xsl_handler(module_name, item_name)
else:
- if self.path == '/' and 'Host' in self.headers.keys():
+ if req_path == '/' and 'Host' in self.headers.keys():
# redirect to XML URL only when requested with '/'
self.send_response(302)
self.send_header(
@@ -104,6 +120,12 @@ class HttpHandler(http.server.BaseHTTPRequestHandler):
# Couldn't find HOST
self.send_error(404)
return None
+ except StatsHttpdDataError as err:
+ # Couldn't find neither specified module name nor
+ # specified item name
+ self.send_error(404)
+ logger.error(STATHTTPD_SERVER_DATAERROR, err)
+ return None
except StatsHttpdError as err:
self.send_error(500)
logger.error(STATHTTPD_SERVER_ERROR, err)
@@ -145,6 +167,12 @@ class StatsHttpdError(Exception):
main routine."""
pass
+class StatsHttpdDataError(Exception):
+ """Exception class for StatsHttpd class. The reason seems to be
+ due to the data. It is intended to be thrown from the the
+ StatsHttpd object to the HttpHandler object or main routine."""
+ pass
+
class StatsHttpd:
"""The main class of HTTP server of HTTP/XML interface for
statistics module. It handles HTTP requests, and command channel
@@ -334,12 +362,27 @@ class StatsHttpd:
return isc.config.ccsession.create_answer(
1, "Unknown command: " + str(command))
- def get_stats_data(self):
+ def get_stats_data(self, owner=None, name=None):
"""Requests statistics data to the Stats daemon and returns
- the data which obtains from it"""
+ the data which obtains from it. The first argument is the
+ module name which owns the statistics data, the second
+ argument is one name of the statistics items which the the
+ module owns. The second argument cannot be specified when the
+ first argument is not specified. It returns the statistics
+ data of the specified module or item. When the session timeout
+ or the session error is occurred, it raises
+ StatsHttpdError. When the stats daemon returns none-zero
+ value, it raises StatsHttpdDataError."""
+ param = {}
+ if owner is None and name is None:
+ param = None
+ if owner is not None:
+ param['owner'] = owner
+ if name is not None:
+ param['name'] = name
try:
seq = self.cc_session.group_sendmsg(
- isc.config.ccsession.create_command('show'), 'Stats')
+ isc.config.ccsession.create_command('show', param), 'Stats')
(answer, env) = self.cc_session.group_recvmsg(False, seq)
if answer:
(rcode, value) = isc.config.ccsession.parse_answer(answer)
@@ -351,131 +394,409 @@ class StatsHttpd:
if rcode == 0:
return value
else:
- raise StatsHttpdError("Stats module: %s" % str(value))
+ raise StatsHttpdDataError("Stats module: %s" % str(value))
- def get_stats_spec(self):
+ def get_stats_spec(self, owner=None, name=None):
"""Requests statistics data to the Stats daemon and returns
- the data which obtains from it"""
+ the data which obtains from it. The first argument is the
+ module name which owns the statistics data, the second
+ argument is one name of the statistics items which the the
+ module owns. The second argument cannot be specified when the
+ first argument is not specified. It returns the statistics
+ specification of the specified module or item. When the
+ session timeout or the session error is occurred, it raises
+ StatsHttpdError. When the stats daemon returns none-zero
+ value, it raises StatsHttpdDataError."""
+ param = {}
+ if owner is None and name is None:
+ param = None
+ if owner is not None:
+ param['owner'] = owner
+ if name is not None:
+ param['name'] = name
try:
seq = self.cc_session.group_sendmsg(
- isc.config.ccsession.create_command('showschema'), 'Stats')
+ isc.config.ccsession.create_command('showschema', param), 'Stats')
(answer, env) = self.cc_session.group_recvmsg(False, seq)
if answer:
(rcode, value) = isc.config.ccsession.parse_answer(answer)
if rcode == 0:
return value
else:
- raise StatsHttpdError("Stats module: %s" % str(value))
+ raise StatsHttpdDataError("Stats module: %s" % str(value))
except (isc.cc.session.SessionTimeout,
isc.cc.session.SessionError) as err:
raise StatsHttpdError("%s: %s" %
(err.__class__.__name__, err))
- def xml_handler(self):
- """Handler which requests to Stats daemon to obtain statistics
- data and returns the body of XML document"""
- xml_list=[]
- for (mod, spec) in self.get_stats_data().items():
- if not spec: continue
- elem1 = xml.etree.ElementTree.Element(str(mod))
- for (k, v) in spec.items():
- elem2 = xml.etree.ElementTree.Element(str(k))
- elem2.text = str(v)
- elem1.append(elem2)
- # The coding conversion is tricky. xml..tostring() of Python 3.2
- # returns bytes (not string) regardless of the coding, while
- # tostring() of Python 3.1 returns a string. To support both
- # cases transparently, we first make sure tostring() returns
- # bytes by specifying utf-8 and then convert the result to a
- # plain string (code below assume it).
- xml_list.append(
- str(xml.etree.ElementTree.tostring(elem1, encoding='utf-8'),
- encoding='us-ascii'))
- xml_string = "".join(xml_list)
+
+ def xml_handler(self, module_name=None, item_name=None):
+ """Requests the specified statistics data and specification by
+ using the functions get_stats_data and get_stats_spec
+ respectively and loads the XML template file and returns the
+ string of the XML document.The first argument is the module
+ name which owns the statistics data, the second argument is
+ one name of the statistics items which the the module
+ owns. The second argument cannot be specified when the first
+ argument is not specified."""
+
+ # TODO: Separate the following recursive function by type of
+ # the parameter. Because we should be sure what type there is
+ # when we call it recursively.
+ def stats_data2xml(stats_spec, stats_data, xml_elem):
+ """Internal use for xml_handler. Reads stats_data and
+ stats_spec specified as first and second arguments, and
+ modify the xml object specified as third
+ argument. xml_elem must be modified and always returns
+ None."""
+ # assumed started with module_spec or started with
+ # item_spec in statistics
+ if type(stats_spec) is dict:
+ # assumed started with module_spec
+ if 'item_name' not in stats_spec \
+ and 'item_type' not in stats_spec:
+ for module_name in stats_spec.keys():
+ elem = xml.etree.ElementTree.Element(module_name)
+ stats_data2xml(stats_spec[module_name],
+ stats_data[module_name], elem)
+ xml_elem.append(elem)
+ # started with item_spec in statistics
+ else:
+ elem = xml.etree.ElementTree.Element(stats_spec['item_name'])
+ if stats_spec['item_type'] == 'map':
+ stats_data2xml(stats_spec['map_item_spec'],
+ stats_data,
+ elem)
+ elif stats_spec['item_type'] == 'list':
+ for item in stats_data:
+ stats_data2xml(stats_spec['list_item_spec'],
+ item, elem)
+ else:
+ elem.text = str(stats_data)
+ xml_elem.append(elem)
+ # assumed started with stats_spec
+ elif type(stats_spec) is list:
+ for item_spec in stats_spec:
+ stats_data2xml(item_spec,
+ stats_data[item_spec['item_name']],
+ xml_elem)
+
+ stats_spec = self.get_stats_spec(module_name, item_name)
+ stats_data = self.get_stats_data(module_name, item_name)
+ # make the path xxx/module/item if specified respectively
+ path_info = ''
+ if module_name is not None and item_name is not None:
+ path_info = '/' + module_name + '/' + item_name
+ elif module_name is not None:
+ path_info = '/' + module_name
+ xml_elem = xml.etree.ElementTree.Element(
+ 'bind10:statistics',
+ attrib={ 'xsi:schemaLocation' : XSD_NAMESPACE + ' ' + XSD_URL_PATH + path_info,
+ 'xmlns:bind10' : XSD_NAMESPACE,
+ 'xmlns:xsi' : "http://www.w3.org/2001/XMLSchema-instance" })
+ stats_data2xml(stats_spec, stats_data, xml_elem)
+ # The coding conversion is tricky. xml..tostring() of Python 3.2
+ # returns bytes (not string) regardless of the coding, while
+ # tostring() of Python 3.1 returns a string. To support both
+ # cases transparently, we first make sure tostring() returns
+ # bytes by specifying utf-8 and then convert the result to a
+ # plain string (code below assume it).
+ # FIXME: Non-ASCII characters might be lost here. Consider how
+ # the whole system should handle non-ASCII characters.
+ xml_string = str(xml.etree.ElementTree.tostring(xml_elem, encoding='utf-8'),
+ encoding='us-ascii')
self.xml_body = self.open_template(XML_TEMPLATE_LOCATION).substitute(
xml_string=xml_string,
- xsd_namespace=XSD_NAMESPACE,
- xsd_url_path=XSD_URL_PATH,
- xsl_url_path=XSL_URL_PATH)
+ xsl_url_path=XSL_URL_PATH + path_info)
assert self.xml_body is not None
return self.xml_body
- def xsd_handler(self):
- """Handler which just returns the body of XSD document"""
+ def xsd_handler(self, module_name=None, item_name=None):
+ """Requests the specified statistics specification by using
+ the function get_stats_spec respectively and loads the XSD
+ template file and returns the string of the XSD document.The
+ first argument is the module name which owns the statistics
+ data, the second argument is one name of the statistics items
+ which the the module owns. The second argument cannot be
+ specified when the first argument is not specified."""
+
+ # TODO: Separate the following recursive function by type of
+ # the parameter. Because we should be sure what type there is
+ # when we call it recursively.
+ def stats_spec2xsd(stats_spec, xsd_elem):
+ """Internal use for xsd_handler. Reads stats_spec
+ specified as first arguments, and modify the xml object
+ specified as second argument. xsd_elem must be
+ modified. Always returns None with no exceptions."""
+ # assumed module_spec or one stats_spec
+ if type(stats_spec) is dict:
+ # assumed module_spec
+ if 'item_name' not in stats_spec:
+ for mod in stats_spec.keys():
+ elem = xml.etree.ElementTree.Element(
+ "element", { "name" : mod })
+ complextype = xml.etree.ElementTree.Element("complexType")
+ alltag = xml.etree.ElementTree.Element("all")
+ stats_spec2xsd(stats_spec[mod], alltag)
+ complextype.append(alltag)
+ elem.append(complextype)
+ xsd_elem.append(elem)
+ # assumed stats_spec
+ else:
+ if stats_spec['item_type'] == 'map':
+ alltag = xml.etree.ElementTree.Element("all")
+ stats_spec2xsd(stats_spec['map_item_spec'], alltag)
+ complextype = xml.etree.ElementTree.Element("complexType")
+ complextype.append(alltag)
+ elem = xml.etree.ElementTree.Element(
+ "element", attrib={ "name" : stats_spec["item_name"],
+ "minOccurs": "0" \
+ if stats_spec["item_optional"] \
+ else "1",
+ "maxOccurs": "unbounded" })
+ elem.append(complextype)
+ xsd_elem.append(elem)
+ elif stats_spec['item_type'] == 'list':
+ alltag = xml.etree.ElementTree.Element("sequence")
+ stats_spec2xsd(stats_spec['list_item_spec'], alltag)
+ complextype = xml.etree.ElementTree.Element("complexType")
+ complextype.append(alltag)
+ elem = xml.etree.ElementTree.Element(
+ "element", attrib={ "name" : stats_spec["item_name"],
+ "minOccurs": "0" \
+ if stats_spec["item_optional"] \
+ else "1",
+ "maxOccurs": "1" })
+ elem.append(complextype)
+ xsd_elem.append(elem)
+ else:
+ # determine the datatype of XSD
+ # TODO: Should consider other item_format types
+ datatype = stats_spec["item_type"] \
+ if stats_spec["item_type"].lower() != 'real' \
+ else 'float'
+ if "item_format" in stats_spec:
+ item_format = stats_spec["item_format"]
+ if datatype.lower() == 'string' \
+ and item_format.lower() == 'date-time':
+ datatype = 'dateTime'
+ elif datatype.lower() == 'string' \
+ and (item_format.lower() == 'date' \
+ or item_format.lower() == 'time'):
+ datatype = item_format.lower()
+ elem = xml.etree.ElementTree.Element(
+ "element",
+ attrib={
+ 'name' : stats_spec["item_name"],
+ 'type' : datatype,
+ 'minOccurs' : "0" \
+ if stats_spec["item_optional"] \
+ else "1",
+ 'maxOccurs' : "1"
+ }
+ )
+ annotation = xml.etree.ElementTree.Element("annotation")
+ appinfo = xml.etree.ElementTree.Element("appinfo")
+ documentation = xml.etree.ElementTree.Element("documentation")
+ if "item_title" in stats_spec:
+ appinfo.text = stats_spec["item_title"]
+ if "item_description" in stats_spec:
+ documentation.text = stats_spec["item_description"]
+ annotation.append(appinfo)
+ annotation.append(documentation)
+ elem.append(annotation)
+ xsd_elem.append(elem)
+ # multiple stats_specs
+ elif type(stats_spec) is list:
+ for item_spec in stats_spec:
+ stats_spec2xsd(item_spec, xsd_elem)
+
# for XSD
- xsd_root = xml.etree.ElementTree.Element("all") # started with "all" tag
- for (mod, spec) in self.get_stats_spec().items():
- if not spec: continue
- alltag = xml.etree.ElementTree.Element("all")
- for item in spec:
- element = xml.etree.ElementTree.Element(
- "element",
- dict( name=item["item_name"],
- type=item["item_type"] if item["item_type"].lower() != 'real' else 'float',
- minOccurs="1",
- maxOccurs="1" ),
- )
- annotation = xml.etree.ElementTree.Element("annotation")
- appinfo = xml.etree.ElementTree.Element("appinfo")
- documentation = xml.etree.ElementTree.Element("documentation")
- appinfo.text = item["item_title"]
- documentation.text = item["item_description"]
- annotation.append(appinfo)
- annotation.append(documentation)
- element.append(annotation)
- alltag.append(element)
-
- complextype = xml.etree.ElementTree.Element("complexType")
- complextype.append(alltag)
- mod_element = xml.etree.ElementTree.Element("element", { "name" : mod })
- mod_element.append(complextype)
- xsd_root.append(mod_element)
+ stats_spec = self.get_stats_spec(module_name, item_name)
+ alltag = xml.etree.ElementTree.Element("all")
+ stats_spec2xsd(stats_spec, alltag)
+ complextype = xml.etree.ElementTree.Element("complexType")
+ complextype.append(alltag)
+ documentation = xml.etree.ElementTree.Element("documentation")
+ documentation.text = "A set of statistics data"
+ annotation = xml.etree.ElementTree.Element("annotation")
+ annotation.append(documentation)
+ elem = xml.etree.ElementTree.Element(
+ "element", attrib={ 'name' : 'statistics' })
+ elem.append(annotation)
+ elem.append(complextype)
+ documentation = xml.etree.ElementTree.Element("documentation")
+ documentation.text = "XML schema of the statistics data in BIND 10"
+ annotation = xml.etree.ElementTree.Element("annotation")
+ annotation.append(documentation)
+ xsd_root = xml.etree.ElementTree.Element(
+ "schema",
+ attrib={ 'xmlns' : "http://www.w3.org/2001/XMLSchema",
+ 'targetNamespace' : XSD_NAMESPACE,
+ 'xmlns:bind10' : XSD_NAMESPACE })
+ xsd_root.append(annotation)
+ xsd_root.append(elem)
# The coding conversion is tricky. xml..tostring() of Python 3.2
# returns bytes (not string) regardless of the coding, while
# tostring() of Python 3.1 returns a string. To support both
# cases transparently, we first make sure tostring() returns
# bytes by specifying utf-8 and then convert the result to a
# plain string (code below assume it).
+ # FIXME: Non-ASCII characters might be lost here. Consider how
+ # the whole system should handle non-ASCII characters.
xsd_string = str(xml.etree.ElementTree.tostring(xsd_root, encoding='utf-8'),
encoding='us-ascii')
self.xsd_body = self.open_template(XSD_TEMPLATE_LOCATION).substitute(
- xsd_string=xsd_string,
- xsd_namespace=XSD_NAMESPACE
- )
+ xsd_string=xsd_string)
assert self.xsd_body is not None
return self.xsd_body
- def xsl_handler(self):
- """Handler which just returns the body of XSL document"""
+ def xsl_handler(self, module_name=None, item_name=None):
+ """Requests the specified statistics specification by using
+ the function get_stats_spec respectively and loads the XSL
+ template file and returns the string of the XSL document.The
+ first argument is the module name which owns the statistics
+ data, the second argument is one name of the statistics items
+ which the the module owns. The second argument cannot be
+ specified when the first argument is not specified."""
+
+ # TODO: Separate the following recursive function by type of
+ # the parameter. Because we should be sure what type there is
+ # when we call it recursively.
+ def stats_spec2xsl(stats_spec, xsl_elem, path=XML_URL_PATH):
+ """Internal use for xsl_handler. Reads stats_spec
+ specified as first arguments, and modify the xml object
+ specified as second argument. xsl_elem must be
+ modified. The third argument is a base path used for
+ making anchor tag in XSL. Always returns None with no
+ exceptions."""
+ # assumed module_spec or one stats_spec
+ if type(stats_spec) is dict:
+ # assumed module_spec
+ if 'item_name' not in stats_spec:
+ table = xml.etree.ElementTree.Element("table")
+ tr = xml.etree.ElementTree.Element("tr")
+ th = xml.etree.ElementTree.Element("th")
+ th.text = "Module Name"
+ tr.append(th)
+ th = xml.etree.ElementTree.Element("th")
+ th.text = "Module Item"
+ tr.append(th)
+ table.append(tr)
+ for mod in stats_spec.keys():
+ foreach = xml.etree.ElementTree.Element(
+ "xsl:for-each", attrib={ "select" : mod })
+ tr = xml.etree.ElementTree.Element("tr")
+ td = xml.etree.ElementTree.Element("td")
+ a = xml.etree.ElementTree.Element(
+ "a", attrib={ "href": urllib.parse.quote(path + "/" + mod) })
+ a.text = mod
+ td.append(a)
+ tr.append(td)
+ td = xml.etree.ElementTree.Element("td")
+ stats_spec2xsl(stats_spec[mod], td,
+ path + "/" + mod)
+ tr.append(td)
+ foreach.append(tr)
+ table.append(foreach)
+ xsl_elem.append(table)
+ # assumed stats_spec
+ else:
+ if stats_spec['item_type'] == 'map':
+ table = xml.etree.ElementTree.Element("table")
+ tr = xml.etree.ElementTree.Element("tr")
+ th = xml.etree.ElementTree.Element("th")
+ th.text = "Item Name"
+ tr.append(th)
+ th = xml.etree.ElementTree.Element("th")
+ th.text = "Item Value"
+ tr.append(th)
+ table.append(tr)
+ foreach = xml.etree.ElementTree.Element(
+ "xsl:for-each", attrib={ "select" : stats_spec['item_name'] })
+ tr = xml.etree.ElementTree.Element("tr")
+ td = xml.etree.ElementTree.Element(
+ "td",
+ attrib={ "class" : "title",
+ "title" : stats_spec["item_description"] \
+ if "item_description" in stats_spec \
+ else "" })
+ # TODO: Consider whether we should always use
+ # the identical name "item_name" for the
+ # user-visible name in XSL.
+ td.text = stats_spec[ "item_title" if "item_title" in stats_spec else "item_name" ]
+ tr.append(td)
+ td = xml.etree.ElementTree.Element("td")
+ stats_spec2xsl(stats_spec['map_item_spec'], td,
+ path + "/" + stats_spec["item_name"])
+ tr.append(td)
+ foreach.append(tr)
+ table.append(foreach)
+ xsl_elem.append(table)
+ elif stats_spec['item_type'] == 'list':
+ stats_spec2xsl(stats_spec['list_item_spec'], xsl_elem,
+ path + "/" + stats_spec["item_name"])
+ else:
+ xsl_valueof = xml.etree.ElementTree.Element(
+ "xsl:value-of",
+ attrib={'select': stats_spec["item_name"]})
+ xsl_elem.append(xsl_valueof)
+
+ # multiple stats_specs
+ elif type(stats_spec) is list:
+ table = xml.etree.ElementTree.Element("table")
+ tr = xml.etree.ElementTree.Element("tr")
+ th = xml.etree.ElementTree.Element("th")
+ th.text = "Item Name"
+ tr.append(th)
+ th = xml.etree.ElementTree.Element("th")
+ th.text = "Item Value"
+ tr.append(th)
+ table.append(tr)
+ for item_spec in stats_spec:
+ tr = xml.etree.ElementTree.Element("tr")
+ td = xml.etree.ElementTree.Element(
+ "td",
+ attrib={ "class" : "title",
+ "title" : item_spec["item_description"] \
+ if "item_description" in item_spec \
+ else "" })
+ # if the path length is equal to or shorter than
+ # XML_URL_PATH + /Module/Item, add the anchor tag.
+ if len(path.split('/')) <= len((XML_URL_PATH + '/Module/Item').split('/')):
+ a = xml.etree.ElementTree.Element(
+ "a", attrib={ "href": urllib.parse.quote(path + "/" + item_spec["item_name"]) })
+ a.text = item_spec[ "item_title" if "item_title" in item_spec else "item_name" ]
+ td.append(a)
+ else:
+ td.text = item_spec[ "item_title" if "item_title" in item_spec else "item_name" ]
+ tr.append(td)
+ td = xml.etree.ElementTree.Element("td")
+ stats_spec2xsl(item_spec, td, path)
+ tr.append(td)
+ if item_spec['item_type'] == 'list':
+ foreach = xml.etree.ElementTree.Element(
+ "xsl:for-each", attrib={ "select" : item_spec['item_name'] })
+ foreach.append(tr)
+ table.append(foreach)
+ else:
+ table.append(tr)
+ xsl_elem.append(table)
+
# for XSL
- xsd_root = xml.etree.ElementTree.Element(
+ stats_spec = self.get_stats_spec(module_name, item_name)
+ xsd_root = xml.etree.ElementTree.Element( # started with xml:template tag
"xsl:template",
- dict(match="*")) # started with xml:template tag
- for (mod, spec) in self.get_stats_spec().items():
- if not spec: continue
- for item in spec:
- tr = xml.etree.ElementTree.Element("tr")
- td0 = xml.etree.ElementTree.Element("td")
- td0.text = str(mod)
- td1 = xml.etree.ElementTree.Element(
- "td", { "class" : "title",
- "title" : item["item_description"] })
- td1.text = item["item_title"]
- td2 = xml.etree.ElementTree.Element("td")
- xsl_valueof = xml.etree.ElementTree.Element(
- "xsl:value-of",
- dict(select=mod+'/'+item["item_name"]))
- td2.append(xsl_valueof)
- tr.append(td0)
- tr.append(td1)
- tr.append(td2)
- xsd_root.append(tr)
+ attrib={'match': "bind10:statistics"})
+ stats_spec2xsl(stats_spec, xsd_root)
# The coding conversion is tricky. xml..tostring() of Python 3.2
# returns bytes (not string) regardless of the coding, while
# tostring() of Python 3.1 returns a string. To support both
# cases transparently, we first make sure tostring() returns
# bytes by specifying utf-8 and then convert the result to a
# plain string (code below assume it).
+ # FIXME: Non-ASCII characters might be lost here. Consider how
+ # the whole system should handle non-ASCII characters.
xsl_string = str(xml.etree.ElementTree.tostring(xsd_root, encoding='utf-8'),
encoding='us-ascii')
self.xsl_body = self.open_template(XSL_TEMPLATE_LOCATION).substitute(
diff --git a/src/bin/stats/stats_httpd_messages.mes b/src/bin/stats/stats_httpd_messages.mes
index 0e984dc..dbd0650 100644
--- a/src/bin/stats/stats_httpd_messages.mes
+++ b/src/bin/stats/stats_httpd_messages.mes
@@ -55,6 +55,12 @@ response will be sent back, and the specific error is printed. This
is an error condition that likely points to a module that is not
responding correctly to statistic requests.
+% STATHTTPD_SERVER_DATAERROR HTTP server data error: %1
+An internal error occurred while handling an HTTP request. An HTTP 404
+response will be sent back, and the specific error is printed. This
+is an error condition that likely points the specified data
+corresponding to the requested URI is incorrect.
+
% STATHTTPD_SERVER_INIT_ERROR HTTP server initialization error: %1
There was a problem initializing the HTTP server in the stats-httpd
module upon receiving its configuration data. The most likely cause
diff --git a/src/bin/stats/tests/Makefile.am b/src/bin/stats/tests/Makefile.am
index afd572f..01254d4 100644
--- a/src/bin/stats/tests/Makefile.am
+++ b/src/bin/stats/tests/Makefile.am
@@ -1,7 +1,7 @@
PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = b10-stats_test.py b10-stats-httpd_test.py
EXTRA_DIST = $(PYTESTS) test_utils.py
-CLEANFILES = test_utils.pyc msgq_socket_test
+CLEANFILES = test_utils.pyc
# If necessary (rare cases), explicitly specify paths to dynamic libraries
# required by loadable python modules.
diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py
index e867080..b6847bd 100644
--- a/src/bin/stats/tests/b10-stats-httpd_test.py
+++ b/src/bin/stats/tests/b10-stats-httpd_test.py
@@ -45,7 +45,12 @@ DUMMY_DATA = {
},
'Auth' : {
"queries.tcp": 2,
- "queries.udp": 3
+ "queries.udp": 3,
+ "queries.perzone": [{
+ "zonename": "test.example",
+ "queries.tcp": 2,
+ "queries.udp": 3
+ }]
},
'Stats' : {
"report_time": "2011-03-04T11:59:19Z",
@@ -129,68 +134,295 @@ class TestHttpHandler(unittest.TestCase):
self.assertEqual(len(self.stats_httpd.httpd), 1)
self.assertEqual((self.address, self.port), self.stats_httpd.http_addrs[0])
- # URL is '/bind10/statistics/xml'
- self.client.putrequest('GET', stats_httpd.XML_URL_PATH)
- self.client.endheaders()
- response = self.client.getresponse()
- self.assertEqual(response.getheader("Content-type"), "text/xml")
- self.assertTrue(int(response.getheader("Content-Length")) > 0)
- self.assertEqual(response.status, 200)
- root = xml.etree.ElementTree.parse(response).getroot()
- self.assertTrue(root.tag.find('stats_data') > 0)
- for (k,v) in root.attrib.items():
- if k.find('schemaLocation') > 0:
- self.assertEqual(v, stats_httpd.XSD_NAMESPACE + ' ' + stats_httpd.XSD_URL_PATH)
- for mod in DUMMY_DATA:
- for (item, value) in DUMMY_DATA[mod].items():
+ def check_XML_URL_PATH(mod=None, item=None):
+ url_path = stats_httpd.XML_URL_PATH
+ if mod is not None:
+ url_path = url_path + '/' + mod
+ if item is not None:
+ url_path = url_path + '/' + item
+ self.client.putrequest('GET', url_path)
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.getheader("Content-type"), "text/xml")
+ self.assertTrue(int(response.getheader("Content-Length")) > 0)
+ self.assertEqual(response.status, 200)
+ xml_doctype = response.readline().decode()
+ xsl_doctype = response.readline().decode()
+ self.assertTrue(len(xml_doctype) > 0)
+ self.assertTrue(len(xsl_doctype) > 0)
+ root = xml.etree.ElementTree.parse(response).getroot()
+ self.assertTrue(root.tag.find('statistics') > 0)
+ schema_loc = '{http://www.w3.org/2001/XMLSchema-instance}schemaLocation'
+ if item is None and mod is None:
+ # check the path of XSD
+ self.assertEqual(root.attrib[schema_loc],
+ stats_httpd.XSD_NAMESPACE + ' '
+ + stats_httpd.XSD_URL_PATH)
+ # check the path of XSL
+ self.assertTrue(xsl_doctype.startswith(
+ '<?xml-stylesheet type="text/xsl" href="' +
+ stats_httpd.XSL_URL_PATH
+ + '"?>'))
+ for m in DUMMY_DATA:
+ for k in DUMMY_DATA[m].keys():
+ self.assertIsNotNone(root.find(m + '/' + k))
+ itm = root.find(m + '/' + k)
+ if type(DUMMY_DATA[m][k]) is list:
+ for v in DUMMY_DATA[m][k]:
+ for i in v:
+ self.assertIsNotNone(itm.find('zones/' + i))
+ elif item is None:
+ # check the path of XSD
+ self.assertEqual(root.attrib[schema_loc],
+ stats_httpd.XSD_NAMESPACE + ' '
+ + stats_httpd.XSD_URL_PATH + '/' + mod)
+ # check the path of XSL
+ self.assertTrue(xsl_doctype.startswith(
+ '<?xml-stylesheet type="text/xsl" href="'
+ + stats_httpd.XSL_URL_PATH + '/' + mod
+ + '"?>'))
+ for k in DUMMY_DATA[mod].keys():
+ self.assertIsNotNone(root.find(mod + '/' + k))
+ itm = root.find(mod + '/' + k)
+ self.assertIsNotNone(itm)
+ if type(DUMMY_DATA[mod][k]) is list:
+ for v in DUMMY_DATA[mod][k]:
+ for i in v:
+ self.assertIsNotNone(itm.find('zones/' + i))
+ else:
+ # check the path of XSD
+ self.assertEqual(root.attrib[schema_loc],
+ stats_httpd.XSD_NAMESPACE + ' '
+ + stats_httpd.XSD_URL_PATH + '/' + mod + '/' + item)
+ # check the path of XSL
+ self.assertTrue(xsl_doctype.startswith(
+ '<?xml-stylesheet type="text/xsl" href="'
+ + stats_httpd.XSL_URL_PATH + '/' + mod + '/' + item
+ + '"?>'))
self.assertIsNotNone(root.find(mod + '/' + item))
- # URL is '/bind10/statitics/xsd'
- self.client.putrequest('GET', stats_httpd.XSD_URL_PATH)
- self.client.endheaders()
- response = self.client.getresponse()
- self.assertEqual(response.getheader("Content-type"), "text/xml")
- self.assertTrue(int(response.getheader("Content-Length")) > 0)
- self.assertEqual(response.status, 200)
- root = xml.etree.ElementTree.parse(response).getroot()
- url_xmlschema = '{http://www.w3.org/2001/XMLSchema}'
- tags = [ url_xmlschema + t for t in [ 'element', 'complexType', 'all', 'element' ] ]
- xsdpath = '/'.join(tags)
- self.assertTrue(root.tag.find('schema') > 0)
- self.assertTrue(hasattr(root, 'attrib'))
- self.assertTrue('targetNamespace' in root.attrib)
- self.assertEqual(root.attrib['targetNamespace'],
- stats_httpd.XSD_NAMESPACE)
- for elm in root.findall(xsdpath):
- self.assertIsNotNone(elm.attrib['name'])
- self.assertTrue(elm.attrib['name'] in DUMMY_DATA)
-
- # URL is '/bind10/statitics/xsl'
- self.client.putrequest('GET', stats_httpd.XSL_URL_PATH)
- self.client.endheaders()
- response = self.client.getresponse()
- self.assertEqual(response.getheader("Content-type"), "text/xml")
- self.assertTrue(int(response.getheader("Content-Length")) > 0)
- self.assertEqual(response.status, 200)
- root = xml.etree.ElementTree.parse(response).getroot()
- url_trans = '{http://www.w3.org/1999/XSL/Transform}'
- url_xhtml = '{http://www.w3.org/1999/xhtml}'
- xslpath = url_trans + 'template/' + url_xhtml + 'tr'
- self.assertEqual(root.tag, url_trans + 'stylesheet')
- for tr in root.findall(xslpath):
- tds = tr.findall(url_xhtml + 'td')
- self.assertIsNotNone(tds)
- self.assertEqual(type(tds), list)
- self.assertTrue(len(tds) > 2)
- self.assertTrue(hasattr(tds[0], 'text'))
- self.assertTrue(tds[0].text in DUMMY_DATA)
- valueof = tds[2].find(url_trans + 'value-of')
- self.assertIsNotNone(valueof)
- self.assertTrue(hasattr(valueof, 'attrib'))
- self.assertIsNotNone(valueof.attrib)
- self.assertTrue('select' in valueof.attrib)
- self.assertTrue(valueof.attrib['select'] in \
- [ tds[0].text+'/'+item for item in DUMMY_DATA[tds[0].text].keys() ])
+ # URL is '/bind10/statistics/xml'
+ check_XML_URL_PATH(mod=None, item=None)
+ for m in DUMMY_DATA:
+ # URL is '/bind10/statistics/xml/Module'
+ check_XML_URL_PATH(mod=m)
+ for k in DUMMY_DATA[m].keys():
+ # URL is '/bind10/statistics/xml/Module/Item'
+ check_XML_URL_PATH(mod=m, item=k)
+
+ def check_XSD_URL_PATH(mod=None, item=None):
+ url_path = stats_httpd.XSD_URL_PATH
+ if mod is not None:
+ url_path = url_path + '/' + mod
+ if item is not None:
+ url_path = url_path + '/' + item
+ self.client.putrequest('GET', url_path)
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.getheader("Content-type"), "text/xml")
+ self.assertTrue(int(response.getheader("Content-Length")) > 0)
+ self.assertEqual(response.status, 200)
+ root = xml.etree.ElementTree.parse(response).getroot()
+ url_xmlschema = '{http://www.w3.org/2001/XMLSchema}'
+ self.assertTrue(root.tag.find('schema') > 0)
+ self.assertTrue(hasattr(root, 'attrib'))
+ self.assertTrue('targetNamespace' in root.attrib)
+ self.assertEqual(root.attrib['targetNamespace'],
+ stats_httpd.XSD_NAMESPACE)
+ if mod is None and item is None:
+ for (mod, itm) in DUMMY_DATA.items():
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'element', 'complexType', 'all', 'element' ] ])
+ mod_elm = dict([ (elm.attrib['name'], elm) for elm in root.findall(xsdpath) ])
+ self.assertTrue(mod in mod_elm)
+ for (it, val) in itm.items():
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'all', 'element' ] ])
+ itm_elm = dict([ (elm.attrib['name'], elm) for elm in mod_elm[mod].findall(xsdpath) ])
+ self.assertTrue(it in itm_elm)
+ if type(val) is list:
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'sequence', 'element' ] ])
+ itm_elm2 = dict([ (elm.attrib['name'], elm) for elm in itm_elm[it].findall(xsdpath) ])
+ self.assertTrue('zones' in itm_elm2)
+ for i in val:
+ for k in i.keys():
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'all', 'element' ] ])
+ self.assertTrue(
+ k in [ elm.attrib['name'] for elm in itm_elm2['zones'].findall(xsdpath) ])
+ elif item is None:
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'element', 'complexType', 'all', 'element' ] ])
+ mod_elm = dict([ (elm.attrib['name'], elm) for elm in root.findall(xsdpath) ])
+ self.assertTrue(mod in mod_elm)
+ for (it, val) in DUMMY_DATA[mod].items():
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'all', 'element' ] ])
+ itm_elm = dict([ (elm.attrib['name'], elm) for elm in mod_elm[mod].findall(xsdpath) ])
+ self.assertTrue(it in itm_elm)
+ if type(val) is list:
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'sequence', 'element' ] ])
+ itm_elm2 = dict([ (elm.attrib['name'], elm) for elm in itm_elm[it].findall(xsdpath) ])
+ self.assertTrue('zones' in itm_elm2)
+ for i in val:
+ for k in i.keys():
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'all', 'element' ] ])
+ self.assertTrue(
+ k in [ elm.attrib['name'] for elm in itm_elm2['zones'].findall(xsdpath) ])
+ else:
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'element', 'complexType', 'all', 'element' ] ])
+ mod_elm = dict([ (elm.attrib['name'], elm) for elm in root.findall(xsdpath) ])
+ self.assertTrue(mod in mod_elm)
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'all', 'element' ] ])
+ itm_elm = dict([ (elm.attrib['name'], elm) for elm in mod_elm[mod].findall(xsdpath) ])
+ self.assertTrue(item in itm_elm)
+ if type(DUMMY_DATA[mod][item]) is list:
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'sequence', 'element' ] ])
+ itm_elm2 = dict([ (elm.attrib['name'], elm) for elm in itm_elm[item].findall(xsdpath) ])
+ self.assertTrue('zones' in itm_elm2)
+ for i in DUMMY_DATA[mod][item]:
+ for k in i.keys():
+ xsdpath = '/'.join([ url_xmlschema + t for t in [ 'complexType', 'all', 'element' ] ])
+ self.assertTrue(
+ k in [ elm.attrib['name'] for elm in itm_elm2['zones'].findall(xsdpath) ])
+
+ # URL is '/bind10/statistics/xsd'
+ check_XSD_URL_PATH(mod=None, item=None)
+ for m in DUMMY_DATA:
+ # URL is '/bind10/statistics/xsd/Module'
+ check_XSD_URL_PATH(mod=m)
+ for k in DUMMY_DATA[m].keys():
+ # URL is '/bind10/statistics/xsd/Module/Item'
+ check_XSD_URL_PATH(mod=m, item=k)
+
+ def check_XSL_URL_PATH(mod=None, item=None):
+ url_path = stats_httpd.XSL_URL_PATH
+ if mod is not None:
+ url_path = url_path + '/' + mod
+ if item is not None:
+ url_path = url_path + '/' + item
+ self.client.putrequest('GET', url_path)
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.getheader("Content-type"), "text/xml")
+ self.assertTrue(int(response.getheader("Content-Length")) > 0)
+ self.assertEqual(response.status, 200)
+ root = xml.etree.ElementTree.parse(response).getroot()
+ url_trans = '{http://www.w3.org/1999/XSL/Transform}'
+ url_xhtml = '{http://www.w3.org/1999/xhtml}'
+ self.assertEqual(root.tag, url_trans + 'stylesheet')
+ if item is None and mod is None:
+ xslpath = url_trans + 'template/' + url_xhtml + 'table/' + url_trans + 'for-each'
+ mod_fe = dict([ (x.attrib['select'], x) for x in root.findall(xslpath) ])
+ for (mod, itms) in DUMMY_DATA.items():
+ self.assertTrue(mod in mod_fe)
+ for (k, v) in itms.items():
+ if type(v) is list:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_trans + 'for-each'
+ itm_fe = dict([ (x.attrib['select'], x) for x in mod_fe[mod].findall(xslpath) ])
+ self.assertTrue(k in itm_fe)
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'a'
+ itm_a = [ x.attrib['href'] for x in itm_fe[k].findall(xslpath) ]
+ self.assertTrue(stats_httpd.XML_URL_PATH + '/' + mod + '/' + k in itm_a)
+ for itms in v:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_trans + 'for-each'
+ itm_fe = dict([ (x.attrib['select'], x) for x in itm_fe[k].findall(xslpath) ])
+ self.assertTrue('zones' in itm_fe)
+ for (k, v) in itms.items():
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_trans + 'value-of'
+ itm_vo = [ x.attrib['select'] for x in itm_fe['zones'].findall(xslpath) ]
+ self.assertTrue(k in itm_vo)
+ else:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_trans + 'value-of'
+ itm_vo = [ x.attrib['select'] for x in mod_fe[mod].findall(xslpath) ]
+ self.assertTrue(k in itm_vo)
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_xhtml + 'a'
+ itm_a = [ x.attrib['href'] for x in mod_fe[mod].findall(xslpath) ]
+ self.assertTrue(stats_httpd.XML_URL_PATH + '/' + mod + '/' + k in itm_a)
+ elif item is None:
+ xslpath = url_trans + 'template/' + url_xhtml + 'table/' + url_trans + 'for-each'
+ mod_fe = dict([ (x.attrib['select'], x) for x in root.findall(xslpath) ])
+ self.assertTrue(mod in mod_fe)
+ for (k, v) in DUMMY_DATA[mod].items():
+ if type(v) is list:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_trans + 'for-each'
+ itm_fe = dict([ (x.attrib['select'], x) for x in mod_fe[mod].findall(xslpath) ])
+ self.assertTrue(k in itm_fe)
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'a'
+ itm_a = [ x.attrib['href'] for x in itm_fe[k].findall(xslpath) ]
+ self.assertTrue(stats_httpd.XML_URL_PATH + '/' + mod + '/' + k in itm_a)
+ for itms in v:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_trans + 'for-each'
+ itm_fe = dict([ (x.attrib['select'], x) for x in itm_fe[k].findall(xslpath) ])
+ self.assertTrue('zones' in itm_fe)
+ for (k, v) in itms.items():
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_trans + 'value-of'
+ itm_vo = [ x.attrib['select'] for x in itm_fe['zones'].findall(xslpath) ]
+ self.assertTrue(k in itm_vo)
+ else:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_trans + 'value-of'
+ itm_vo = [ x.attrib['select'] for x in mod_fe[mod].findall(xslpath) ]
+ self.assertTrue(k in itm_vo)
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_xhtml + 'a'
+ itm_a = [ x.attrib['href'] for x in mod_fe[mod].findall(xslpath) ]
+ self.assertTrue(stats_httpd.XML_URL_PATH + '/' + mod + '/' + k in itm_a)
+ else:
+ xslpath = url_trans + 'template/' + url_xhtml + 'table/' + url_trans + 'for-each'
+ mod_fe = dict([ (x.attrib['select'], x) for x in root.findall(xslpath) ])
+ self.assertTrue(mod in mod_fe)
+ if type(DUMMY_DATA[mod][item]) is list:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_trans + 'for-each'
+ itm_fe = dict([ (x.attrib['select'], x) for x in mod_fe[mod].findall(xslpath) ])
+ self.assertTrue(item in itm_fe)
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'a'
+ itm_a = [ x.attrib['href'] for x in itm_fe[item].findall(xslpath) ]
+ self.assertTrue(stats_httpd.XML_URL_PATH + '/' + mod + '/' + item in itm_a)
+ for itms in DUMMY_DATA[mod][item]:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_trans + 'for-each'
+ itm_fe = dict([ (x.attrib['select'], x) for x in itm_fe[item].findall(xslpath) ])
+ self.assertTrue('zones' in itm_fe)
+ for (k, v) in itms.items():
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_trans + 'value-of'
+ itm_vo = [ x.attrib['select'] for x in itm_fe['zones'].findall(xslpath) ]
+ self.assertTrue(k in itm_vo)
+ else:
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_trans + 'value-of'
+ itm_vo = [ x.attrib['select'] for x in mod_fe[mod].findall(xslpath) ]
+ self.assertTrue(item in itm_vo)
+ xslpath = url_xhtml + 'tr/' + url_xhtml + 'td/' \
+ + url_xhtml + 'table/' + url_xhtml + 'tr/' \
+ + url_xhtml + 'td/' + url_xhtml + 'a'
+ itm_a = [ x.attrib['href'] for x in mod_fe[mod].findall(xslpath) ]
+ self.assertTrue(stats_httpd.XML_URL_PATH + '/' + mod + '/' + item in itm_a)
+
+ # URL is '/bind10/statistics/xsl'
+ check_XSL_URL_PATH(mod=None, item=None)
+ for m in DUMMY_DATA:
+ # URL is '/bind10/statistics/xsl/Module'
+ check_XSL_URL_PATH(mod=m)
+ for k in DUMMY_DATA[m].keys():
+ # URL is '/bind10/statistics/xsl/Module/Item'
+ check_XSL_URL_PATH(mod=m, item=k)
# 302 redirect
self.client._http_vsn_str = 'HTTP/1.1'
@@ -202,13 +434,102 @@ class TestHttpHandler(unittest.TestCase):
self.assertEqual(response.getheader('Location'),
"http://%s:%d%s" % (self.address, self.port, stats_httpd.XML_URL_PATH))
- # 404 NotFound
+ # 404 NotFound (random path)
self.client._http_vsn_str = 'HTTP/1.0'
self.client.putrequest('GET', '/path/to/foo/bar')
self.client.endheaders()
response = self.client.getresponse()
self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', '/bind10/foo')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', '/bind10/statistics/foo')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + 'Auth') # with no slash
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+
+ # 200 ok
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 200)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '#foo')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 200)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '?foo=bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 200)
+
+ # 404 NotFound (too long path)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/Boss/boot_time/a')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+
+ # 404 NotFound (nonexistent module name)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/Foo')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XSD_URL_PATH + '/Foo')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XSL_URL_PATH + '/Foo')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+
+ # 404 NotFound (nonexistent item name)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/Foo/bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XSD_URL_PATH + '/Foo/bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XSL_URL_PATH + '/Foo/bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ # 404 NotFound (existent module but nonexistent item name)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XML_URL_PATH + '/Auth/bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XSD_URL_PATH + '/Auth/bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', stats_httpd.XSL_URL_PATH + '/Auth/bar')
+ self.client.endheaders()
+ response = self.client.getresponse()
+ self.assertEqual(response.status, 404)
def test_do_GET_failed1(self):
# checks status
@@ -242,26 +563,26 @@ class TestHttpHandler(unittest.TestCase):
# failure case(Stats replies an error)
self.stats.mccs.set_command_handler(
lambda cmd, args: \
- isc.config.ccsession.create_answer(1, "I have an error.")
+ isc.config.ccsession.create_answer(1, "specified arguments are incorrect: I have an error.")
)
# request XML
self.client.putrequest('GET', stats_httpd.XML_URL_PATH)
self.client.endheaders()
response = self.client.getresponse()
- self.assertEqual(response.status, 500)
+ self.assertEqual(response.status, 404)
# request XSD
self.client.putrequest('GET', stats_httpd.XSD_URL_PATH)
self.client.endheaders()
response = self.client.getresponse()
- self.assertEqual(response.status, 500)
+ self.assertEqual(response.status, 404)
# request XSL
self.client.putrequest('GET', stats_httpd.XSL_URL_PATH)
self.client.endheaders()
response = self.client.getresponse()
- self.assertEqual(response.status, 500)
+ self.assertEqual(response.status, 404)
def test_do_HEAD(self):
self.client.putrequest('HEAD', stats_httpd.XML_URL_PATH)
@@ -306,12 +627,18 @@ class TestHttpServer(unittest.TestCase):
class TestStatsHttpdError(unittest.TestCase):
"""Tests for StatsHttpdError exception"""
- def test_raises(self):
+ def test_raises1(self):
try:
raise stats_httpd.StatsHttpdError('Nothing')
except stats_httpd.StatsHttpdError as err:
self.assertEqual(str(err), 'Nothing')
+ def test_raises2(self):
+ try:
+ raise stats_httpd.StatsHttpdDataError('Nothing')
+ except stats_httpd.StatsHttpdDataError as err:
+ self.assertEqual(str(err), 'Nothing')
+
class TestStatsHttpd(unittest.TestCase):
"""Tests for StatsHttpd class"""
@@ -488,17 +815,13 @@ class TestStatsHttpd(unittest.TestCase):
self.assertTrue(isinstance(tmpl, string.Template))
opts = dict(
xml_string="<dummy></dummy>",
- xsd_namespace="http://host/path/to/",
- xsd_url_path="/path/to/",
xsl_url_path="/path/to/")
lines = tmpl.substitute(opts)
for n in opts:
self.assertTrue(lines.find(opts[n])>0)
tmpl = self.stats_httpd.open_template(stats_httpd.XSD_TEMPLATE_LOCATION)
self.assertTrue(isinstance(tmpl, string.Template))
- opts = dict(
- xsd_string="<dummy></dummy>",
- xsd_namespace="http://host/path/to/")
+ opts = dict(xsd_string="<dummy></dummy>")
lines = tmpl.substitute(opts)
for n in opts:
self.assertTrue(lines.find(opts[n])>0)
@@ -580,26 +903,172 @@ class TestStatsHttpd(unittest.TestCase):
def test_xml_handler(self):
self.stats_httpd = MyStatsHttpd(get_availaddr())
- self.stats_httpd.get_stats_data = lambda: \
- { 'Dummy' : { 'foo':'bar' } }
+ self.stats_httpd.get_stats_spec = lambda x,y: \
+ { "Dummy" :
+ [{
+ "item_name": "foo",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "bar",
+ "item_description": "foo is bar",
+ "item_title": "Foo"
+ },
+ {
+ "item_name": "foo2",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Foo bar",
+ "item_description": "Foo bar",
+ "list_item_spec": {
+ "item_name": "foo2-1",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "foo2-1-1",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Foo2 1 1",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-2",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 2",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-3",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 3",
+ "item_description": "Foo bar"
+ }
+ ]
+ }
+ }]
+ }
+ self.stats_httpd.get_stats_data = lambda x,y: \
+ { 'Dummy' : { 'foo':'bar',
+ 'foo2': [
+ {
+ "foo2-1-1" : "bar1",
+ "foo2-1-2" : 10,
+ "foo2-1-3" : 9
+ },
+ {
+ "foo2-1-1" : "bar2",
+ "foo2-1-2" : 8,
+ "foo2-1-3" : 7
+ }
+ ] } }
xml_body1 = self.stats_httpd.open_template(
stats_httpd.XML_TEMPLATE_LOCATION).substitute(
- xml_string='<Dummy><foo>bar</foo></Dummy>',
- xsd_namespace=stats_httpd.XSD_NAMESPACE,
- xsd_url_path=stats_httpd.XSD_URL_PATH,
+ xml_string='<bind10:statistics xmlns:bind10="http://bind10.isc.org/bind10" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://bind10.isc.org/bind10 ' + stats_httpd.XSD_URL_PATH + '"><Dummy><foo>bar</foo><foo2><foo2-1><foo2-1-1>bar1</foo2-1-1><foo2-1-2>10</foo2-1-2><foo2-1-3>9</foo2-1-3></foo2-1><foo2-1><foo2-1-1>bar2</foo2-1-1><foo2-1-2>8</foo2-1-2><foo2-1-3>7</foo2-1-3></foo2-1></foo2></Dummy></bind10:statistics>',
xsl_url_path=stats_httpd.XSL_URL_PATH)
xml_body2 = self.stats_httpd.xml_handler()
self.assertEqual(type(xml_body1), str)
self.assertEqual(type(xml_body2), str)
self.assertEqual(xml_body1, xml_body2)
- self.stats_httpd.get_stats_data = lambda: \
- { 'Dummy' : {'bar':'foo'} }
+ self.stats_httpd.get_stats_spec = lambda x,y: \
+ { "Dummy" :
+ [{
+ "item_name": "bar",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "foo",
+ "item_description": "bar foo",
+ "item_title": "Bar"
+ },
+ {
+ "item_name": "bar2",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Bar foo",
+ "item_description": "Bar foo",
+ "list_item_spec": {
+ "item_name": "bar2-1",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "bar2-1-1",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Bar2 1 1",
+ "item_description": "Bar foo"
+ },
+ {
+ "item_name": "bar2-1-2",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Bar2 1 2",
+ "item_description": "Bar foo"
+ },
+ {
+ "item_name": "bar2-1-3",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Bar2 1 3",
+ "item_description": "Bar foo"
+ }
+ ]
+ }
+ }]
+ }
+ self.stats_httpd.get_stats_data = lambda x,y: \
+ { 'Dummy' : { 'bar':'foo',
+ 'bar2': [
+ {
+ "bar2-1-1" : "foo1",
+ "bar2-1-2" : 10,
+ "bar2-1-3" : 9
+ },
+ {
+ "bar2-1-1" : "foo2",
+ "bar2-1-2" : 8,
+ "bar2-1-3" : 7
+ }
+ ] } }
xml_body2 = self.stats_httpd.xml_handler()
self.assertNotEqual(xml_body1, xml_body2)
def test_xsd_handler(self):
self.stats_httpd = MyStatsHttpd(get_availaddr())
- self.stats_httpd.get_stats_spec = lambda: \
+ self.stats_httpd.get_stats_spec = lambda x,y: \
{ "Dummy" :
[{
"item_name": "foo",
@@ -608,23 +1077,76 @@ class TestStatsHttpd(unittest.TestCase):
"item_default": "bar",
"item_description": "foo is bar",
"item_title": "Foo"
+ },
+ {
+ "item_name": "hoo_time",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "2011-01-01T01:01:01Z",
+ "item_description": "hoo time",
+ "item_title": "Hoo Time",
+ "item_format": "date-time"
+ },
+ {
+ "item_name": "foo2",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Foo bar",
+ "item_description": "Foo bar",
+ "list_item_spec": {
+ "item_name": "foo2-1",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "foo2-1-1",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Foo2 1 1",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-2",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 2",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-3",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 3",
+ "item_description": "Foo bar"
+ }
+ ]
+ }
}]
}
xsd_body1 = self.stats_httpd.open_template(
stats_httpd.XSD_TEMPLATE_LOCATION).substitute(
- xsd_string=\
- '<all><element name="Dummy"><complexType><all>' \
- + '<element maxOccurs="1" minOccurs="1" name="foo" type="string">' \
- + '<annotation><appinfo>Foo</appinfo>' \
- + '<documentation>foo is bar</documentation>' \
- + '</annotation></element></all>' \
- + '</complexType></element></all>',
- xsd_namespace=stats_httpd.XSD_NAMESPACE)
+ xsd_string='<schema targetNamespace="' + stats_httpd.XSD_NAMESPACE + '" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:bind10="' + stats_httpd.XSD_NAMESPACE + '"><annotation><documentation>XML schema of the statistics data in BIND 10</documentation></annotation><element name="statistics"><annotation><documentation>A set of statistics data</documentation></annotation><complexType><all><element name="Dummy"><complexType><all><element maxOccurs="1" minOccurs="1" name="foo" type="string"><annotation><appinfo>Foo</appinfo><documentation>foo is bar</documentation></annotation></element><element maxOccurs="1" minOccurs="1" name="hoo_time" type="dateTime"><annotation><appinfo>Hoo Time</appinfo><documentation>hoo time</documentation></annotation></element><element maxOccurs="1" minOccurs="1" name="foo2"><complexType><sequence><element maxOccurs="unbounded" minOccurs="1" name="foo2-1"><complexType><all><element maxOccurs="1" minOccurs="1" name="foo2-1-1" type="string"><ann
otation><appinfo>Foo2 1 1</appinfo><documentation>Foo bar</documentation></annotation></element><element maxOccurs="1" minOccurs="1" name="foo2-1-2" type="integer"><annotation><appinfo>Foo2 1 2</appinfo><documentation>Foo bar</documentation></annotation></element><element maxOccurs="1" minOccurs="1" name="foo2-1-3" type="integer"><annotation><appinfo>Foo2 1 3</appinfo><documentation>Foo bar</documentation></annotation></element></all></complexType></element></sequence></complexType></element></all></complexType></element></all></complexType></element></schema>')
xsd_body2 = self.stats_httpd.xsd_handler()
self.assertEqual(type(xsd_body1), str)
self.assertEqual(type(xsd_body2), str)
self.assertEqual(xsd_body1, xsd_body2)
- self.stats_httpd.get_stats_spec = lambda: \
+ self.stats_httpd.get_stats_spec = lambda x,y: \
{ "Dummy" :
[{
"item_name": "bar",
@@ -633,6 +1155,66 @@ class TestStatsHttpd(unittest.TestCase):
"item_default": "foo",
"item_description": "bar is foo",
"item_title": "bar"
+ },
+ {
+ "item_name": "boo_time",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "2012-02-02T02:02:02Z",
+ "item_description": "boo time",
+ "item_title": "Boo Time",
+ "item_format": "date-time"
+ },
+ {
+ "item_name": "foo2",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Foo bar",
+ "item_description": "Foo bar",
+ "list_item_spec": {
+ "item_name": "foo2-1",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "foo2-1-1",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Foo2 1 1",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-2",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 2",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-3",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 3",
+ "item_description": "Foo bar"
+ }
+ ]
+ }
}]
}
xsd_body2 = self.stats_httpd.xsd_handler()
@@ -640,30 +1222,77 @@ class TestStatsHttpd(unittest.TestCase):
def test_xsl_handler(self):
self.stats_httpd = MyStatsHttpd(get_availaddr())
- self.stats_httpd.get_stats_spec = lambda: \
+ self.stats_httpd.get_stats_spec = lambda x,y: \
{ "Dummy" :
[{
"item_name": "foo",
"item_type": "string",
"item_optional": False,
"item_default": "bar",
- "item_description": "foo is bar",
+ "item_description": "foo bar",
"item_title": "Foo"
+ },
+ {
+ "item_name": "foo2",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Foo bar",
+ "item_description": "Foo bar",
+ "list_item_spec": {
+ "item_name": "foo2-1",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "foo2-1-1",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Foo2 1 1",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-2",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 2",
+ "item_description": "Foo bar"
+ },
+ {
+ "item_name": "foo2-1-3",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Foo2 1 3",
+ "item_description": "Foo bar"
+ }
+ ]
+ }
}]
}
xsl_body1 = self.stats_httpd.open_template(
stats_httpd.XSL_TEMPLATE_LOCATION).substitute(
- xsl_string='<xsl:template match="*"><tr>' \
- + '<td>Dummy</td>' \
- + '<td class="title" title="foo is bar">Foo</td>' \
- + '<td><xsl:value-of select="Dummy/foo" /></td>' \
- + '</tr></xsl:template>',
+ xsl_string='<xsl:template match="bind10:statistics"><table><tr><th>Module Name</th><th>Module Item</th></tr><xsl:for-each select="Dummy"><tr><td><a href="' + stats_httpd.XML_URL_PATH + '/Dummy">Dummy</a></td><td><table><tr><th>Item Name</th><th>Item Value</th></tr><tr><td class="title" title="foo bar"><a href="' + stats_httpd.XML_URL_PATH + '/Dummy/foo">Foo</a></td><td><xsl:value-of select="foo" /></td></tr><xsl:for-each select="foo2"><tr><td class="title" title="Foo bar"><a href="' + stats_httpd.XML_URL_PATH + '/Dummy/foo2">Foo bar</a></td><td><table><tr><th>Item Name</th><th>Item Value</th></tr><xsl:for-each select="foo2-1"><tr><td class="title" title="">foo2-1</td><td><table><tr><th>Item Name</th><th>Item Value</th></tr><tr><td class="title" title="Foo bar">Foo2 1 1</td><td><xsl:value-of select="foo2-1-1" /></td></tr><tr><td class="title" title="Foo bar">Foo2 1 2</td><td><xsl:value-of select="foo2-1-2" /></td></tr><tr><td class="title" title="Foo bar">Foo2 1 3
</td><td><xsl:value-of select="foo2-1-3" /></td></tr></table></td></tr></xsl:for-each></table></td></tr></xsl:for-each></table></td></tr></xsl:for-each></table></xsl:template>',
xsd_namespace=stats_httpd.XSD_NAMESPACE)
xsl_body2 = self.stats_httpd.xsl_handler()
self.assertEqual(type(xsl_body1), str)
self.assertEqual(type(xsl_body2), str)
self.assertEqual(xsl_body1, xsl_body2)
- self.stats_httpd.get_stats_spec = lambda: \
+ self.stats_httpd.get_stats_spec = lambda x,y: \
{ "Dummy" :
[{
"item_name": "bar",
diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py
index 3813c7e..3c8599a 100644
--- a/src/bin/stats/tests/b10-stats_test.py
+++ b/src/bin/stats/tests/b10-stats_test.py
@@ -226,7 +226,7 @@ class TestStats(unittest.TestCase):
'show', 'Stats',
params={ 'owner' : 'Boss',
'name' : 'boot_time' }),
- (0, self.const_datetime))
+ (0, {'Boss': {'boot_time': self.const_datetime}}))
self.assertEqual(
send_command(
'set', 'Stats',
@@ -238,7 +238,7 @@ class TestStats(unittest.TestCase):
'show', 'Stats',
params={ 'owner' : 'Boss',
'name' : 'boot_time' }),
- (0, self.const_datetime))
+ (0, {'Boss': {'boot_time': self.const_datetime}}))
self.assertEqual(
send_command('status', 'Stats'),
(0, "Stats is up. (PID " + str(os.getpid()) + ")"))
@@ -321,25 +321,25 @@ class TestStats(unittest.TestCase):
my_statistics_data = self.stats.get_statistics_data()
self.assertTrue('Stats' in my_statistics_data)
self.assertTrue('Boss' in my_statistics_data)
+ self.assertTrue('boot_time' in my_statistics_data['Boss'])
my_statistics_data = self.stats.get_statistics_data(owner='Stats')
- self.assertTrue('report_time' in my_statistics_data)
- self.assertTrue('boot_time' in my_statistics_data)
- self.assertTrue('last_update_time' in my_statistics_data)
- self.assertTrue('timestamp' in my_statistics_data)
- self.assertTrue('lname' in my_statistics_data)
+ self.assertTrue('Stats' in my_statistics_data)
+ self.assertTrue('report_time' in my_statistics_data['Stats'])
+ self.assertTrue('boot_time' in my_statistics_data['Stats'])
+ self.assertTrue('last_update_time' in my_statistics_data['Stats'])
+ self.assertTrue('timestamp' in my_statistics_data['Stats'])
+ self.assertTrue('lname' in my_statistics_data['Stats'])
self.assertRaises(stats.StatsError, self.stats.get_statistics_data, owner='Foo')
- my_statistics_data = self.stats.get_statistics_data(owner='Stats')
- self.assertTrue('boot_time' in my_statistics_data)
my_statistics_data = self.stats.get_statistics_data(owner='Stats', name='report_time')
- self.assertEqual(my_statistics_data, self.const_default_datetime)
+ self.assertEqual(my_statistics_data['Stats']['report_time'], self.const_default_datetime)
my_statistics_data = self.stats.get_statistics_data(owner='Stats', name='boot_time')
- self.assertEqual(my_statistics_data, self.const_default_datetime)
+ self.assertEqual(my_statistics_data['Stats']['boot_time'], self.const_default_datetime)
my_statistics_data = self.stats.get_statistics_data(owner='Stats', name='last_update_time')
- self.assertEqual(my_statistics_data, self.const_default_datetime)
+ self.assertEqual(my_statistics_data['Stats']['last_update_time'], self.const_default_datetime)
my_statistics_data = self.stats.get_statistics_data(owner='Stats', name='timestamp')
- self.assertEqual(my_statistics_data, 0.0)
+ self.assertEqual(my_statistics_data['Stats']['timestamp'], 0.0)
my_statistics_data = self.stats.get_statistics_data(owner='Stats', name='lname')
- self.assertEqual(my_statistics_data, '')
+ self.assertEqual(my_statistics_data, {'Stats': {'lname':''}})
self.assertRaises(stats.StatsError, self.stats.get_statistics_data,
owner='Stats', name='Bar')
self.assertRaises(stats.StatsError, self.stats.get_statistics_data,
@@ -385,10 +385,25 @@ class TestStats(unittest.TestCase):
1, "specified arguments are incorrect: owner: Foo, name: bar"))
self.assertEqual(self.stats.command_show(owner='Auth'),
isc.config.create_answer(
- 0, {'queries.tcp': 0, 'queries.udp': 0}))
+ 0, {'Auth':{ 'queries.udp': 0,
+ 'queries.tcp': 0,
+ 'queries.perzone': [{ 'zonename': 'test1.example',
+ 'queries.udp': 1,
+ 'queries.tcp': 2 },
+ { 'zonename': 'test2.example',
+ 'queries.udp': 3,
+ 'queries.tcp': 4 }] }}))
self.assertEqual(self.stats.command_show(owner='Auth', name='queries.udp'),
isc.config.create_answer(
- 0, 0))
+ 0, {'Auth': {'queries.udp':0}}))
+ self.assertEqual(self.stats.command_show(owner='Auth', name='queries.perzone'),
+ isc.config.create_answer(
+ 0, {'Auth': {'queries.perzone': [{ 'zonename': 'test1.example',
+ 'queries.udp': 1,
+ 'queries.tcp': 2 },
+ { 'zonename': 'test2.example',
+ 'queries.udp': 3,
+ 'queries.tcp': 4 }]}}))
orig_get_timestamp = stats.get_timestamp
orig_get_datetime = stats.get_datetime
stats.get_timestamp = lambda : self.const_timestamp
@@ -396,7 +411,7 @@ class TestStats(unittest.TestCase):
self.assertEqual(stats.get_timestamp(), self.const_timestamp)
self.assertEqual(stats.get_datetime(), self.const_datetime)
self.assertEqual(self.stats.command_show(owner='Stats', name='report_time'), \
- isc.config.create_answer(0, self.const_datetime))
+ isc.config.create_answer(0, {'Stats': {'report_time':self.const_datetime}}))
self.assertEqual(self.stats.statistics_data['Stats']['timestamp'], self.const_timestamp)
self.assertEqual(self.stats.statistics_data['Stats']['boot_time'], self.const_default_datetime)
stats.get_timestamp = orig_get_timestamp
@@ -442,9 +457,12 @@ class TestStats(unittest.TestCase):
self.assertTrue('item_format' in item)
schema = value['Auth']
- self.assertEqual(len(schema), 2)
+ self.assertEqual(len(schema), 3)
for item in schema:
- self.assertTrue(len(item) == 6)
+ if item['item_type'] == 'list':
+ self.assertEqual(len(item), 7)
+ else:
+ self.assertEqual(len(item), 6)
self.assertTrue('item_name' in item)
self.assertTrue('item_type' in item)
self.assertTrue('item_optional' in item)
@@ -455,10 +473,10 @@ class TestStats(unittest.TestCase):
(rcode, value) = isc.config.ccsession.parse_answer(
self.stats.command_showschema(owner='Stats'))
self.assertEqual(rcode, 0)
- self.assertFalse('Stats' in value)
+ self.assertTrue('Stats' in value)
self.assertFalse('Boss' in value)
self.assertFalse('Auth' in value)
- for item in value:
+ for item in value['Stats']:
self.assertTrue(len(item) == 6 or len(item) == 7)
self.assertTrue('item_name' in item)
self.assertTrue('item_type' in item)
@@ -472,19 +490,19 @@ class TestStats(unittest.TestCase):
(rcode, value) = isc.config.ccsession.parse_answer(
self.stats.command_showschema(owner='Stats', name='report_time'))
self.assertEqual(rcode, 0)
- self.assertFalse('Stats' in value)
+ self.assertTrue('Stats' in value)
self.assertFalse('Boss' in value)
self.assertFalse('Auth' in value)
- self.assertTrue(len(value) == 7)
- self.assertTrue('item_name' in value)
- self.assertTrue('item_type' in value)
- self.assertTrue('item_optional' in value)
- self.assertTrue('item_default' in value)
- self.assertTrue('item_title' in value)
- self.assertTrue('item_description' in value)
- self.assertTrue('item_format' in value)
- self.assertEqual(value['item_name'], 'report_time')
- self.assertEqual(value['item_format'], 'date-time')
+ self.assertEqual(len(value['Stats'][0]), 7)
+ self.assertTrue('item_name' in value['Stats'][0])
+ self.assertTrue('item_type' in value['Stats'][0])
+ self.assertTrue('item_optional' in value['Stats'][0])
+ self.assertTrue('item_default' in value['Stats'][0])
+ self.assertTrue('item_title' in value['Stats'][0])
+ self.assertTrue('item_description' in value['Stats'][0])
+ self.assertTrue('item_format' in value['Stats'][0])
+ self.assertEqual(value['Stats'][0]['item_name'], 'report_time')
+ self.assertEqual(value['Stats'][0]['item_format'], 'date-time')
self.assertEqual(self.stats.command_showschema(owner='Foo'),
isc.config.create_answer(
@@ -494,7 +512,7 @@ class TestStats(unittest.TestCase):
1, "specified arguments are incorrect: owner: Foo, name: bar"))
self.assertEqual(self.stats.command_showschema(owner='Auth'),
isc.config.create_answer(
- 0, [{
+ 0, {'Auth': [{
"item_default": 0,
"item_description": "A number of total query counts which all auth servers receive over TCP since they started initially",
"item_name": "queries.tcp",
@@ -509,17 +527,121 @@ class TestStats(unittest.TestCase):
"item_optional": False,
"item_title": "Queries UDP",
"item_type": "integer"
- }]))
+ },
+ {
+ "item_name": "queries.perzone",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1.example",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2.example",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Queries per zone",
+ "item_description": "Queries per zone",
+ "list_item_spec": {
+ "item_name": "zones",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "zonename",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Zonename",
+ "item_description": "Zonename"
+ },
+ {
+ "item_name": "queries.udp",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Queries UDP per zone",
+ "item_description": "A number of UDP query counts per zone"
+ },
+ {
+ "item_name": "queries.tcp",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Queries TCP per zone",
+ "item_description": "A number of TCP query counts per zone"
+ }
+ ]
+ }
+ }]}))
self.assertEqual(self.stats.command_showschema(owner='Auth', name='queries.tcp'),
isc.config.create_answer(
- 0, {
+ 0, {'Auth': [{
"item_default": 0,
"item_description": "A number of total query counts which all auth servers receive over TCP since they started initially",
"item_name": "queries.tcp",
"item_optional": False,
"item_title": "Queries TCP",
"item_type": "integer"
- }))
+ }]}))
+ self.assertEqual(self.stats.command_showschema(owner='Auth', name='queries.perzone'),
+ isc.config.create_answer(
+ 0, {'Auth':[{
+ "item_name": "queries.perzone",
+ "item_type": "list",
+ "item_optional": False,
+ "item_default": [
+ {
+ "zonename" : "test1.example",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2.example",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Queries per zone",
+ "item_description": "Queries per zone",
+ "list_item_spec": {
+ "item_name": "zones",
+ "item_type": "map",
+ "item_optional": False,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "zonename",
+ "item_type": "string",
+ "item_optional": False,
+ "item_default": "",
+ "item_title": "Zonename",
+ "item_description": "Zonename"
+ },
+ {
+ "item_name": "queries.udp",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Queries UDP per zone",
+ "item_description": "A number of UDP query counts per zone"
+ },
+ {
+ "item_name": "queries.tcp",
+ "item_type": "integer",
+ "item_optional": False,
+ "item_default": 0,
+ "item_title": "Queries TCP per zone",
+ "item_description": "A number of TCP query counts per zone"
+ }
+ ]
+ }
+ }]}))
self.assertEqual(self.stats.command_showschema(owner='Stats', name='bar'),
isc.config.create_answer(
diff --git a/src/bin/stats/tests/test_utils.py b/src/bin/stats/tests/test_utils.py
index 5eb8f92..3f6ff33 100644
--- a/src/bin/stats/tests/test_utils.py
+++ b/src/bin/stats/tests/test_utils.py
@@ -232,6 +232,57 @@ class MockAuth:
"item_default": 0,
"item_title": "Queries UDP",
"item_description": "A number of total query counts which all auth servers receive over UDP since they started initially"
+ },
+ {
+ "item_name": "queries.perzone",
+ "item_type": "list",
+ "item_optional": false,
+ "item_default": [
+ {
+ "zonename" : "test1.example",
+ "queries.udp" : 1,
+ "queries.tcp" : 2
+ },
+ {
+ "zonename" : "test2.example",
+ "queries.udp" : 3,
+ "queries.tcp" : 4
+ }
+ ],
+ "item_title": "Queries per zone",
+ "item_description": "Queries per zone",
+ "list_item_spec": {
+ "item_name": "zones",
+ "item_type": "map",
+ "item_optional": false,
+ "item_default": {},
+ "map_item_spec": [
+ {
+ "item_name": "zonename",
+ "item_type": "string",
+ "item_optional": false,
+ "item_default": "",
+ "item_title": "Zonename",
+ "item_description": "Zonename"
+ },
+ {
+ "item_name": "queries.udp",
+ "item_type": "integer",
+ "item_optional": false,
+ "item_default": 0,
+ "item_title": "Queries UDP per zone",
+ "item_description": "A number of UDP query counts per zone"
+ },
+ {
+ "item_name": "queries.tcp",
+ "item_type": "integer",
+ "item_optional": false,
+ "item_default": 0,
+ "item_title": "Queries TCP per zone",
+ "item_description": "A number of TCP query counts per zone"
+ }
+ ]
+ }
}
]
}
@@ -251,6 +302,11 @@ class MockAuth:
self.got_command_name = ''
self.queries_tcp = 3
self.queries_udp = 2
+ self.queries_per_zone = [{
+ 'zonename': 'test1.example',
+ 'queries.tcp': 5,
+ 'queries.udp': 4
+ }]
def run(self):
self.mccs.start()
@@ -273,7 +329,8 @@ class MockAuth:
if command == 'sendstats':
params = { "owner": "Auth",
"data": { 'queries.tcp': self.queries_tcp,
- 'queries.udp': self.queries_udp } }
+ 'queries.udp': self.queries_udp,
+ 'queries.per-zone' : self.queries_per_zone } }
return send_command("set", "Stats", params=params, session=self.cc_session)
return isc.config.create_answer(1, "Unknown Command")
More information about the bind10-changes
mailing list