[svn] commit: r3046 - in /branches/trac191-rebased/src/bin/stats: stats.py.in stats.spec.pre.in stats_stub.py.in tests/b10-stats_stub_test.py tests/b10-stats_test.py
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Sep 28 05:54:53 UTC 2010
Author: naokikambe
Date: Tue Sep 28 05:54:52 2010
New Revision: 3046
Log:
remove implement ''increase'' command and related test codes due to the decision of #170([comment:ticket:170:26])
Modified:
branches/trac191-rebased/src/bin/stats/stats.py.in
branches/trac191-rebased/src/bin/stats/stats.spec.pre.in
branches/trac191-rebased/src/bin/stats/stats_stub.py.in
branches/trac191-rebased/src/bin/stats/tests/b10-stats_stub_test.py
branches/trac191-rebased/src/bin/stats/tests/b10-stats_test.py
Modified: branches/trac191-rebased/src/bin/stats/stats.py.in
==============================================================================
--- branches/trac191-rebased/src/bin/stats/stats.py.in (original)
+++ branches/trac191-rebased/src/bin/stats/stats.py.in Tue Sep 28 05:54:52 2010
@@ -272,43 +272,6 @@
# 'args' must be dictionary type
self.stats_data.update(args['stats_data'])
-
- # overwrite "stats.LastUpdateTime"
- self.stats_data['stats.last_update_time'] = get_datetime()
-
- return create_answer(0)
-
- def command_increase(self, args, stats_data={}):
- """
- handle increase command
- """
- if self.verbose:
- sys.stdout.write("[b10-stats] 'increase' command received, args: "+str(args)+"\n")
-
- # A internal private function increase for each element, which
- # is called recursively
- def __increase_data(data, args):
- if type(data) == list:
- mx = max(len(data), len(args))
- for i in range(0, mx):
- if i < len(data):
- data[i] = __increase_data(data[i], args[i])
- elif i < len(args):
- data.extend(args[i:])
- break
- elif type(data) == dict:
- for k in list(args.keys()):
- if k in data:
- data[k] = __increase_data(data[k], args[k])
- else:
- data[k] = args[k]
- else:
- data = data + args
- return data
-
- # call the internal function
- # 'args' must be dictionary type
- self.stats_data = __increase_data(self.stats_data, args['stats_data'])
# overwrite "stats.LastUpdateTime"
self.stats_data['stats.last_update_time'] = get_datetime()
Modified: branches/trac191-rebased/src/bin/stats/stats.spec.pre.in
==============================================================================
--- branches/trac191-rebased/src/bin/stats/stats.spec.pre.in (original)
+++ branches/trac191-rebased/src/bin/stats/stats.spec.pre.in Tue Sep 28 05:54:52 2010
@@ -114,19 +114,6 @@
]
},
{
- "command_name": "increase",
- "command_description": "increase the current value of specified name up to specified value in statistics data",
- "command_args": [
- {
- "item_name": "stats_data",
- "item_type": "map",
- "item_optional": false,
- "item_default": {},
- "map_item_spec": []
- }
- ]
- },
- {
"command_name": "remove",
"command_description": "remove the specified name from statistics data",
"command_args": [
Modified: branches/trac191-rebased/src/bin/stats/stats_stub.py.in
==============================================================================
--- branches/trac191-rebased/src/bin/stats/stats_stub.py.in (original)
+++ branches/trac191-rebased/src/bin/stats/stats_stub.py.in Tue Sep 28 05:54:52 2010
@@ -92,7 +92,7 @@
self.stub = CCSessionStub(session=session, verbose=verbose)
self.count = { "udp": 0, "tcp": 0 }
- def send_udp_query_count(self, cmd="increase", cnt=0):
+ def send_udp_query_count(self, cmd="set", cnt=0):
"""
count up udp query count
"""
@@ -129,10 +129,14 @@
auth = AuthModuleStub(session=stub.session, verbose=options.verbose)
stub.send_command("status", None)
boss.send_boottime()
- auth.send_udp_query_count(cmd="set", cnt=81120) # This is an example.
+ t_cnt=0
+ u_cnt=81120
+ auth.send_udp_query_count(cnt=u_cnt) # This is an example.
while True:
- auth.send_udp_query_count()
- auth.send_tcp_query_count()
+ u_cnt = u_cnt + 1
+ t_cnt = t_cnt + 1
+ auth.send_udp_query_count(cnt=u_cnt)
+ auth.send_tcp_query_count(cnt=t_cnt)
time.sleep(1)
except OptionValueError:
Modified: branches/trac191-rebased/src/bin/stats/tests/b10-stats_stub_test.py
==============================================================================
--- branches/trac191-rebased/src/bin/stats/tests/b10-stats_stub_test.py (original)
+++ branches/trac191-rebased/src/bin/stats/tests/b10-stats_stub_test.py Tue Sep 28 05:54:52 2010
@@ -80,7 +80,7 @@
env = self.env
result_ok = self.result_ok
self.assertEqual(
- ('increase', {"stats_data": {"auth.queries.udp": 1}}, env),
+ ('set', {"stats_data": {"auth.queries.udp": 1}}, env),
self.auth.send_udp_query_count())
self.assertEqual(result_ok, self.session.get_message("Stats", None))
self.assertEqual(
@@ -92,8 +92,8 @@
self.auth.send_udp_query_count(cmd='set', cnt=100))
self.assertEqual(result_ok, self.session.get_message("Stats", None))
self.assertEqual(
- ('increase', {"stats_data": {"auth.queries.tcp": 99}}, env),
- self.auth.send_tcp_query_count(cmd='increase', cnt=99))
+ ('set', {"stats_data": {"auth.queries.tcp": 99}}, env),
+ self.auth.send_tcp_query_count(cmd='set', cnt=99))
self.assertEqual(result_ok, self.session.get_message("Stats", None))
def test_func_main(self):
Modified: branches/trac191-rebased/src/bin/stats/tests/b10-stats_test.py
==============================================================================
--- branches/trac191-rebased/src/bin/stats/tests/b10-stats_test.py (original)
+++ branches/trac191-rebased/src/bin/stats/tests/b10-stats_test.py Tue Sep 28 05:54:52 2010
@@ -193,74 +193,6 @@
self.assertEqual(result_ok(0, self.stats_data), result_data)
self.assertEqual(len(self.session.message_queue), 0)
- def test_increase_command(self):
- """
- Test for increase command
-
- """
- # test increase command
- self.stats_data['auth.queries.udp'] = self.stats_data['auth.queries.udp'] + int(1)
- self.assertEqual(self.stats_data['auth.queries.udp'], 1)
- self.assertEqual(self.stats_data['auth.queries.tcp'], 0)
- self.session.group_sendmsg({"command": [
- "increase", {'stats_data': {'auth.queries.udp': int(1) }} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- self.assertEqual(result_ok(),
- self.session.get_message("Stats", None))
- self.assertEqual(len(self.session.message_queue), 0)
-
- # test show command
- self.session.group_sendmsg({"command": [ "show", None ]}, "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, self.stats_data), result_data)
- self.assertEqual(len(self.session.message_queue), 0)
-
- # test increase command
- self.stats_data['auth.queries.udp'] = self.stats_data['auth.queries.udp'] + int(1)
- self.assertEqual(self.stats_data['auth.queries.udp'], 2)
- self.assertEqual(self.stats_data['auth.queries.tcp'], 0)
- self.session.group_sendmsg({"command": [
- "increase", {'stats_data': {'auth.queries.udp': int(1) }} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- self.assertEqual(result_ok(),
- self.session.get_message("Stats", None))
- self.assertEqual(len(self.session.message_queue), 0)
-
- # test show command
- self.session.group_sendmsg({"command": [ "show", None ]}, "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, self.stats_data), result_data)
- self.assertEqual(len(self.session.message_queue), 0)
-
- # test increase command
- self.stats_data['auth.queries.tcp'] = self.stats_data['auth.queries.tcp'] + int(1)
- self.assertEqual(self.stats_data['auth.queries.udp'], 2)
- self.assertEqual(self.stats_data['auth.queries.tcp'], 1)
- self.session.group_sendmsg({"command": [
- "increase", {'stats_data': {'auth.queries.tcp': int(1) }} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- self.assertEqual(result_ok(),
- self.session.get_message("Stats", None))
- self.assertEqual(len(self.session.message_queue), 0)
-
- # test show command
- self.session.group_sendmsg({"command": [ "show", None ]}, "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, self.stats_data), result_data)
- self.assertEqual(len(self.session.message_queue), 0)
-
def test_remove_command(self):
"""
Test for remove command
@@ -407,42 +339,6 @@
result_data)
self.assertEqual(len(self.session.message_queue), 0)
- # test increase command
- self.assertEqual(self.stats_data['auth.queries.udp'], 98765)
- self.stats_data['auth.queries.udp'] = 98766
- self.assertEqual(self.stats_data['auth.queries.udp'], 98766)
- self.session.group_sendmsg({"command": [
- "increase",
- {'stats_data': {'auth.queries.udp': 1 }} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- self.assertEqual(result_ok(),
- self.session.get_message("Stats", None))
- self.assertEqual(len(self.session.message_queue), 0)
-
- # check its value
- self.session.group_sendmsg({"command": [ "show", {'stats_item_name' : 'auth.queries.udp'} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- result_data = self.session.get_message("Stats", None)
- result_data = result_data['result'][1]
- self.assertEqual(result_data['auth.queries.udp'], 98766)
- self.assertEqual(self.stats_data['auth.queries.udp'], result_data['auth.queries.udp'])
- self.assertEqual(len(self.session.message_queue), 0)
- self.session.group_sendmsg({"command": [ "show", {'stats_item_name': 'auth.queries.udp'} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, {'auth.queries.udp': 98766}),
- result_data)
- self.assertEqual(result_ok(0,
- {'auth.queries.udp': self.stats_data['auth.queries.udp']}),
- result_data)
- self.assertEqual(len(self.session.message_queue), 0)
-
# test set command 3
self.stats_data['auth.queries.tcp'] = 4321
self.session.group_sendmsg({"command": [
@@ -472,32 +368,7 @@
self.assertEqual(len(self.session.message_queue), 1)
self.subject.check()
result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, {'auth.queries.udp': 98766}),
- result_data)
- self.assertEqual(result_ok(0, {'auth.queries.udp': self.stats_data['auth.queries.udp']}),
- result_data)
- self.assertEqual(len(self.session.message_queue), 0)
-
- # test increase command 2
- self.assertEqual(self.stats_data['auth.queries.udp'], 98766)
- self.stats_data['auth.queries.udp'] = 98776
- self.assertEqual(self.stats_data['auth.queries.udp'], 98776)
- self.session.group_sendmsg({"command": [
- "increase", {'stats_data': {'auth.queries.udp': 10 }} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- self.assertEqual(result_ok(),
- self.session.get_message("Stats", None))
- self.assertEqual(len(self.session.message_queue), 0)
-
- # check value
- self.session.group_sendmsg({"command": [ "show", {'stats_item_name': 'auth.queries.udp'} ]},
- "Stats")
- self.assertEqual(len(self.session.message_queue), 1)
- self.subject.check()
- result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, {'auth.queries.udp': 98776}),
+ self.assertEqual(result_ok(0, {'auth.queries.udp': 98765}),
result_data)
self.assertEqual(result_ok(0, {'auth.queries.udp': self.stats_data['auth.queries.udp']}),
result_data)
@@ -551,10 +422,10 @@
result_data)
self.assertEqual(len(self.session.message_queue), 0)
- # test increase list-type value
+ # test set list-type value
self.assertEqual(self.stats_data['listtype'], [1, 2, 3])
self.session.group_sendmsg({"command": [
- "increase", {'stats_data': {'listtype': [3, 2, 1, 0] }}
+ "set", {'stats_data': {'listtype': [3, 2, 1, 0] }}
]}, "Stats")
self.assertEqual(len(self.session.message_queue), 1)
self.subject.check()
@@ -569,7 +440,7 @@
self.assertEqual(len(self.session.message_queue), 1)
self.subject.check()
result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, {'listtype': [4, 4, 4, 0]}),
+ self.assertEqual(result_ok(0, {'listtype': [3, 2, 1, 0]}),
result_data)
self.assertEqual(len(self.session.message_queue), 0)
@@ -602,10 +473,10 @@
result_data)
self.assertEqual(len(self.session.message_queue), 0)
- # test increase list-type value
+ # test set list-type value
self.assertEqual(self.stats_data['dicttype'], {"a": 1, "b": 2, "c": 3})
self.session.group_sendmsg({"command": [
- "increase", {'stats_data': {'dicttype': {"a": 3, "b": 2, "c": 1, "d": 0} }} ]},
+ "set", {'stats_data': {'dicttype': {"a": 3, "b": 2, "c": 1, "d": 0} }} ]},
"Stats")
self.assertEqual(len(self.session.message_queue), 1)
self.subject.check()
@@ -618,7 +489,7 @@
self.assertEqual(len(self.session.message_queue), 1)
self.subject.check()
result_data = self.session.get_message("Stats", None)
- self.assertEqual(result_ok(0, {'dicttype': {"a": 4, "b": 4, "c": 4, "d": 0} }),
+ self.assertEqual(result_ok(0, {'dicttype': {"a": 3, "b": 2, "c": 1, "d": 0} }),
result_data)
self.assertEqual(len(self.session.message_queue), 0)
More information about the bind10-changes
mailing list