Browse Source

[trac930] update argument name and argument format of set command in
auth module and boss module and also update related unittests of
their modules

Naoki Kambe 14 years ago
parent
commit
36a53f41a7

+ 4 - 3
src/bin/auth/statistics.cc

@@ -67,10 +67,11 @@ AuthCountersImpl::submitStatistics() const {
     }
     }
     std::stringstream statistics_string;
     std::stringstream statistics_string;
     statistics_string << "{\"command\": [\"set\","
     statistics_string << "{\"command\": [\"set\","
-                      <<   "{ \"stats_data\": "
-                      <<     "{ \"auth.queries.udp\": "
+                      <<   "{ \"owner\": \"Auth\","
+                      <<   "  \"data\":"
+                      <<     "{ \"queries.udp\": "
                       <<     counters_.at(AuthCounters::COUNTER_UDP_QUERY)
                       <<     counters_.at(AuthCounters::COUNTER_UDP_QUERY)
-                      <<     ", \"auth.queries.tcp\": "
+                      <<     ", \"queries.tcp\": "
                       <<     counters_.at(AuthCounters::COUNTER_TCP_QUERY)
                       <<     counters_.at(AuthCounters::COUNTER_TCP_QUERY)
                       <<   " }"
                       <<   " }"
                       <<   "}"
                       <<   "}"

+ 5 - 3
src/bin/auth/tests/statistics_unittest.cc

@@ -201,12 +201,14 @@ TEST_F(AuthCountersTest, submitStatistics) {
     // Command is "set".
     // Command is "set".
     EXPECT_EQ("set", statistics_session_.sent_msg->get("command")
     EXPECT_EQ("set", statistics_session_.sent_msg->get("command")
                          ->get(0)->stringValue());
                          ->get(0)->stringValue());
+    EXPECT_EQ("Auth", statistics_session_.sent_msg->get("command")
+                         ->get(1)->get("owner")->stringValue());
     ConstElementPtr statistics_data = statistics_session_.sent_msg
     ConstElementPtr statistics_data = statistics_session_.sent_msg
                                           ->get("command")->get(1)
                                           ->get("command")->get(1)
-                                          ->get("stats_data");
+                                          ->get("data");
     // UDP query counter is 2 and TCP query counter is 1.
     // UDP query counter is 2 and TCP query counter is 1.
-    EXPECT_EQ(2, statistics_data->get("auth.queries.udp")->intValue());
-    EXPECT_EQ(1, statistics_data->get("auth.queries.tcp")->intValue());
+    EXPECT_EQ(2, statistics_data->get("queries.udp")->intValue());
+    EXPECT_EQ(1, statistics_data->get("queries.tcp")->intValue());
 }
 }
 
 
 }
 }

+ 5 - 2
src/bin/bind10/bind10_src.py.in

@@ -85,7 +85,7 @@ isc.util.process.rename(sys.argv[0])
 # number, and the overall BIND 10 version number (set in configure.ac).
 # number, and the overall BIND 10 version number (set in configure.ac).
 VERSION = "bind10 20110223 (BIND 10 @PACKAGE_VERSION@)"
 VERSION = "bind10 20110223 (BIND 10 @PACKAGE_VERSION@)"
 
 
-# This is for bind10.boottime of stats module
+# This is for boot_time of Boss
 _BASETIME = time.gmtime()
 _BASETIME = time.gmtime()
 
 
 class RestartSchedule:
 class RestartSchedule:
@@ -326,7 +326,10 @@ class BoB:
             elif command == "sendstats":
             elif command == "sendstats":
                 # send statistics data to the stats daemon immediately
                 # send statistics data to the stats daemon immediately
                 cmd = isc.config.ccsession.create_command(
                 cmd = isc.config.ccsession.create_command(
-                    'set', self._get_stats_data())
+                    'set', { "owner": "Boss",
+                             "data": {
+                            'boot_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', _BASETIME)
+                            }})
                 seq = self.cc_session.group_sendmsg(cmd, 'Stats')
                 seq = self.cc_session.group_sendmsg(cmd, 'Stats')
                 # Consume the answer, in case it becomes a orphan message.
                 # Consume the answer, in case it becomes a orphan message.
                 try:
                 try:

+ 3 - 2
src/bin/bind10/tests/bind10_test.py.in

@@ -159,8 +159,9 @@ class TestBoB(unittest.TestCase):
         self.assertEqual(bob.cc_session.group, "Stats")
         self.assertEqual(bob.cc_session.group, "Stats")
         self.assertEqual(bob.cc_session.msg,
         self.assertEqual(bob.cc_session.msg,
                          isc.config.ccsession.create_command(
                          isc.config.ccsession.create_command(
-                'set', { "stats_data": {
-                        'bind10.boot_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', _BASETIME)
+                "set", { "owner": "Boss",
+                         "data": {
+                        "boot_time": time.strftime("%Y-%m-%dT%H:%M:%SZ", _BASETIME)
                         }}))
                         }}))
         # "ping" command
         # "ping" command
         self.assertEqual(bob.command_handler("ping", None),
         self.assertEqual(bob.command_handler("ping", None),