[2157] update item definitions

src/bin/auth/statistics.cc.pre

@@ -111,13 +111,7 @@ const int rcode_to_qrcounter[] = {
     QR_RCODE_OTHER,         // Rcode = 13: (Unassigned)
     QR_RCODE_OTHER,         // Rcode = 14: (Unassigned)
     QR_RCODE_OTHER,         // Rcode = 15: (Unassigned)
-    QR_RCODE_BADSIGVERS,    // Rcode = 16: BADVERS, BADSIG
-    QR_RCODE_BADKEY,        // Rcode = 17: BADKEY
-    QR_RCODE_BADTIME,       // Rcode = 18: BADTIME
-    QR_RCODE_BADMODE,       // Rcode = 19: BADMODE
-    QR_RCODE_BADNAME,       // Rcode = 20: BADNAME
-    QR_RCODE_BADALG,        // Rcode = 21: BADALG
-    QR_RCODE_BADTRUNC       // Rcode = 22: BADTRUNC
+    QR_RCODE_BADVERS        // Rcode = 16: (BADVERS)
 };
 const size_t num_rcode_to_qrcounter =
     sizeof(rcode_to_qrcounter) / sizeof(rcode_to_qrcounter[0]);

src/bin/auth/statistics_qr_items.def

@@ -8,7 +8,7 @@ request	QRCounterRequest	Request statistics	=
 	badsig		QR_REQUEST_BADSIG	Number of requests with invalid TSIG or SIG(0) signature received by the b10-auth server.
 	udp		QR_REQUEST_UDP		Number of UDP requests received by the b10-auth server.
 	tcp		QR_REQUEST_TCP		Number of UDP requests received by the b10-auth server.
-	dnssec_ok	QR_REQUEST_DNSSEC_OK	Number of requests with DO bit received by the b10-auth server.
+	dnssec_ok	QR_REQUEST_DNSSEC_OK	Number of requests with "DNSSEC OK" (DO) bit was set received by the b10-auth server.
 	;
 opcode	QRCounterOpcode		Opcode statistics	=
 	query		QR_OPCODE_QUERY		Number of Opcode=QUERY requests received by the b10-auth server.
@@ -43,12 +43,6 @@ rcode		QRCounterRcode	Rcode statistics	=
 	nxrrset		QR_RCODE_NXRRSET	Number of queries received by the b10-auth server resulted in RCODE = 8 (NXRRSet).
 	notauth		QR_RCODE_NOTAUTH	Number of queries received by the b10-auth server resulted in RCODE = 9 (NotAuth).
 	notzone		QR_RCODE_NOTZONE	Number of queries received by the b10-auth server resulted in RCODE = 10 (NotZone).
-	badsigvers	QR_RCODE_BADSIGVERS	Number of queries received by the b10-auth server resulted in RCODE = 16 (BADVERS, BADSIG).
-	badkey		QR_RCODE_BADKEY		Number of queries received by the b10-auth server resulted in RCODE = 17 (BADKEY).
-	badtime		QR_RCODE_BADTIME	Number of queries received by the b10-auth server resulted in RCODE = 18 (BADTIME).
-	badmode		QR_RCODE_BADMODE	Number of queries received by the b10-auth server resulted in RCODE = 19 (BADMODE).
-	badname		QR_RCODE_BADNAME	Number of queries received by the b10-auth server resulted in RCODE = 20 (BADNAME).
-	badalg		QR_RCODE_BADALG		Number of queries received by the b10-auth server resulted in RCODE = 21 (BADALG).
-	badtrunc	QR_RCODE_BADTRUNC	Number of queries received by the b10-auth server resulted in RCODE = 22 (BADTRUNC).
+	badvers		QR_RCODE_BADVERS	Number of queries received by the b10-auth server resulted in RCODE = 16 (BADVERS).
 	other		QR_RCODE_OTHER		Number of queries received by the b10-auth server resulted in other RCODEs.
 	;

src/bin/auth/tests/auth_srv_unittest.cc

@@ -138,9 +138,7 @@ protected:
     // Checks whether all Rcode counters are set to zero except the given
     // rcode (it is checked to be set to 'value')
     void checkAllRcodeCountersZeroExcept(const Rcode& rcode, int value) const {
-        // rcode 16 is registered as both BADVERS and BADSIG
-        std::string target_rcode_name =
-            rcode.toText() == "BADVERS" ? "BADSIGVERS" : rcode.toText();
+        std::string target_rcode_name = rcode.toText();
         std::transform(target_rcode_name.begin(), target_rcode_name.end(),
                        target_rcode_name.begin(), ::tolower);