BIND 10 trac917, updated. 6b600cb1816705b04470ba2d0aca64dfdf8f55d2 [917] add two changes to stats_httpd.py and its unittest
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Nov 2 14:32:02 UTC 2011
The branch, trac917 has been updated
via 6b600cb1816705b04470ba2d0aca64dfdf8f55d2 (commit)
via c383ebc71434baa5cb314b3de3f3e18f39ebd0c7 (commit)
from d5ec22cc344998038cf68b6fdf309ad2a12b2b5e (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 6b600cb1816705b04470ba2d0aca64dfdf8f55d2
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Nov 2 23:30:48 2011 +0900
[917] add two changes to stats_httpd.py and its unittest
- change the relative path to the absolute path because in the case of the
relative path refering to the other item is failed
- The too long path is to be NotFound
- change the condition of addition of anchor tag if depth levels of path are
equal to or greater than 3, do not add the anchor tag.
commit c383ebc71434baa5cb314b3de3f3e18f39ebd0c7
Author: Naoki Kambe <kambe at jprs.co.jp>
Date: Wed Nov 2 18:03:06 2011 +0900
[917] fix incorrect XSL style (incorrect order of the table tag and posision of
the xsl:for-each tag)
-----------------------------------------------------------------------
Summary of changes:
src/bin/stats/stats_httpd.py.in | 85 +++++---
src/bin/stats/tests/b10-stats-httpd_test.py | 324 ++++++++++++++++++++++++++-
2 files changed, 370 insertions(+), 39 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/stats/stats_httpd.py.in b/src/bin/stats/stats_httpd.py.in
index ad99e3b..6dab53f 100644
--- a/src/bin/stats/stats_httpd.py.in
+++ b/src/bin/stats/stats_httpd.py.in
@@ -92,12 +92,18 @@ class HttpHandler(http.server.BaseHTTPRequestHandler):
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)
+ # The too long path is to be NotFound
+ # in case of /bind10/statistics/xxx/YYY/zzz/aaa
+ if len(path_dirs) > 5:
+ self.send_error(404)
+ return None
module_name = None
item_name = None
- # in case of /bind10/statistics/xxx/YYY/zzz/
+ # 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/
+ # in case of /bind10/statistics/xxx/YYY
if len(path_dirs) >= 4:
module_name = path_dirs[3]
if req_path.startswith(XML_URL_PATH):
@@ -592,7 +598,7 @@ class StatsHttpd:
def xsl_handler(self, module_name=None, item_name=None):
"""Handler which just returns the body of XSL document"""
- def stats_spec2xsl(stats_spec, xsl_elem, path='.'):
+ 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
@@ -631,22 +637,7 @@ class StatsHttpd:
xsl_elem.append(table)
# assumed stats_spec
else:
- td = xml.etree.ElementTree.Element(
- "td",
- attrib={ "class" : "title",
- "title" : stats_spec["item_description"] \
- if "item_description" in stats_spec \
- else "" })
- a = xml.etree.ElementTree.Element(
- "a", attrib={ "href": urllib.parse.quote(path + "/" + stats_spec["item_name"]) })
- a.text = stats_spec[ "item_title" if "item_title" in stats_spec else "item_name" ]
- td.append(a)
- xsl_elem.append(td)
- td = xml.etree.ElementTree.Element("td")
if stats_spec['item_type'] == 'map':
- stats_spec2xsl(stats_spec['map_item_spec'], td,
- path + "/" + stats_spec["item_name"])
- elif stats_spec['item_type'] == 'list':
table = xml.etree.ElementTree.Element("table")
tr = xml.etree.ElementTree.Element("tr")
th = xml.etree.ElementTree.Element("th")
@@ -656,17 +647,33 @@ class StatsHttpd:
th.text = "Item Values"
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")
- stats_spec2xsl(stats_spec['list_item_spec'], tr,
+ td = xml.etree.ElementTree.Element(
+ "td",
+ attrib={ "class" : "title",
+ "title" : stats_spec["item_description"] \
+ if "item_description" in stats_spec \
+ else "" })
+ 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"])
- table.append(tr)
- td.append(table)
else:
xsl_valueof = xml.etree.ElementTree.Element(
"xsl:value-of",
attrib={'select': stats_spec["item_name"]})
- td.append(xsl_valueof)
- xsl_elem.append(td)
+ xsl_elem.append(xsl_valueof)
+
# multiple stats_specs
elif type(stats_spec) is list:
table = xml.etree.ElementTree.Element("table")
@@ -680,8 +687,32 @@ class StatsHttpd:
table.append(tr)
for item_spec in stats_spec:
tr = xml.etree.ElementTree.Element("tr")
- stats_spec2xsl(item_spec, tr, path)
- table.append(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)
return None
@@ -691,9 +722,9 @@ class StatsHttpd:
"xsl:template",
attrib={'match': "bind10:statistics"})
if module_name is not None and item_name is not None:
- stats_spec2xsl([ stats_spec ], xsd_root, './' + module_name)
+ stats_spec2xsl([ stats_spec ], xsd_root, XML_URL_PATH + '/' + module_name)
elif module_name is not None:
- stats_spec2xsl(stats_spec, xsd_root, './' + module_name)
+ stats_spec2xsl(stats_spec, xsd_root, XML_URL_PATH + '/' + module_name)
else:
stats_spec2xsl(stats_spec, xsd_root)
# The coding conversion is tricky. xml..tostring() of Python 3.2
diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py
index cc23ffc..04bf7be 100644
--- a/src/bin/stats/tests/b10-stats-httpd_test.py
+++ b/src/bin/stats/tests/b10-stats-httpd_test.py
@@ -283,6 +283,13 @@ class TestHttpHandler(unittest.TestCase):
response = self.client.getresponse()
self.assertEqual(response.status, 404)
+ # 404 NotFound (too long path)
+ self.client._http_vsn_str = 'HTTP/1.0'
+ self.client.putrequest('GET', '/bind10/statistics/xml/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', '/bind10/statistics/xml/Foo')
@@ -684,25 +691,165 @@ class TestStatsHttpd(unittest.TestCase):
def test_xml_handler(self):
self.stats_httpd = MyStatsHttpd(get_availaddr())
self.stats_httpd.get_stats_spec = lambda x,y: \
- { 'Dummy' : [ {
- 'item_name' : 'foo',
- 'item_type' : 'string' } ] }
+ { "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' } }
+ { '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='<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 /bind10/statistics/xsd"><Dummy><foo>bar</foo></Dummy></bind10:statistics>',
+ 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 /bind10/statistics/xsd"><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_spec = lambda x,y: \
- { 'Dummy' : [ {
- 'item_name' : 'bar',
- 'item_type' : 'string' } ] }
+ { "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'} }
+ { '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)
@@ -717,11 +864,62 @@ class TestStatsHttpd(unittest.TestCase):
"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"
+ }
+ ]
+ }
}]
}
xsd_body1 = self.stats_httpd.open_template(
stats_httpd.XSD_TEMPLATE_LOCATION).substitute(
- 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></all></complexType></element></all></complexType></element></schema>')
+ 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="foo2"><complexType><sequence><element maxOccurs="unbounded" minOccurs="1" name="foo2-1"><complexType><all><element maxOccurs="1" minOccurs="1" name="foo2-1-1" type="string"><annotation><appinfo>Foo2 1 1</appinfo><documentation>Foo bar</documentation></annotation></element><element maxOccurs="1" minOccurs="1" name="foo2-1-2" type="integer"><annot
ation><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)
@@ -735,6 +933,57 @@ class TestStatsHttpd(unittest.TestCase):
"item_default": "foo",
"item_description": "bar is foo",
"item_title": "bar"
+ },
+ {
+ "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()
@@ -749,13 +998,64 @@ class TestStatsHttpd(unittest.TestCase):
"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="bind10:statistics"><table><tr><th>Module Names</th><th>Module Items</th></tr><xsl:for-each select="Dummy"><tr><td><a href="./Dummy">Dummy</a></td><td><table><tr><th>Item Names</th><th>Item Values</th></tr><tr><td class="title" title="foo is bar"><a href="./Dummy/foo">Foo</a></td><td><xsl:value-of select="foo" /></td></tr></table></td></tr></xsl:for-each></table></xsl:template>',
+ xsl_string='<xsl:template match="bind10:statistics"><table><tr><th>Module Names</th><th>Module Items</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 Names</th><th>Item Values</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 Names</th><th>Item Values</th></tr><xsl:for-each select="foo2-1"><tr><td class="title" title="">foo2-1</td><td><table><tr><th>Item Names</th><th>Item Values</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)
More information about the bind10-changes
mailing list