From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 5 Dec 2013 06:30:12 +0000 (+0100)
Subject: [3181] Added an exchange name for Release-Reply in perfdhcp StatsMgr.
X-Git-Tag: bind10-1.2.0beta1-release~178^2~4^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68ec7bd3331f98e87e5a0f59cc0894d4e6792a84;p=thirdparty%2Fkea.git

[3181] Added an exchange name for Release-Reply in perfdhcp StatsMgr.
---

diff --git a/tests/tools/perfdhcp/stats_mgr.h b/tests/tools/perfdhcp/stats_mgr.h
index cee3d7470b..98efedb147 100644
--- a/tests/tools/perfdhcp/stats_mgr.h
+++ b/tests/tools/perfdhcp/stats_mgr.h
@@ -1186,6 +1186,8 @@ public:
             return("REQUEST-REPLY");
         case XCHG_RN:
             return("RENEW-REPLY");
+        case XCHG_RL:
+            return("RELEASE-REPLY");
         default:
             return("Unknown exchange type");
         }
diff --git a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
index c7cae7eb88..348ab42a31 100644
--- a/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
+++ b/tests/tools/perfdhcp/tests/stats_mgr_unittest.cc
@@ -264,6 +264,29 @@ TEST_F(StatsMgrTest, MultipleExchanges) {
               stats_mgr->getRcvdPacketsNum(StatsMgr6::XCHG_RR));
 }
 
+TEST_F(StatsMgrTest, ExchangeToString) {
+    // Test DHCPv4 specific exchange names.
+    StatsMgr4 stats_mgr4;
+    stats_mgr4.addExchangeStats(StatsMgr4::XCHG_DO);
+    stats_mgr4.addExchangeStats(StatsMgr4::XCHG_RA);
+    EXPECT_EQ("DISCOVER-OFFER",
+              stats_mgr4.exchangeToString(StatsMgr4::XCHG_DO));
+    EXPECT_EQ("REQUEST-ACK", stats_mgr4.exchangeToString(StatsMgr4::XCHG_RA));
+
+    // Test DHCPv6 specific exchange names.
+    StatsMgr6 stats_mgr6;
+    stats_mgr6.addExchangeStats(StatsMgr6::XCHG_SA);
+    stats_mgr6.addExchangeStats(StatsMgr6::XCHG_RR);
+    stats_mgr6.addExchangeStats(StatsMgr6::XCHG_RN);
+    stats_mgr6.addExchangeStats(StatsMgr6::XCHG_RL);
+    EXPECT_EQ("SOLICIT-ADVERTISE",
+              stats_mgr6.exchangeToString(StatsMgr6::XCHG_SA));
+    EXPECT_EQ("REQUEST-REPLY", stats_mgr6.exchangeToString(StatsMgr6::XCHG_RR));
+    EXPECT_EQ("RENEW-REPLY", stats_mgr6.exchangeToString(StatsMgr6::XCHG_RN));
+    EXPECT_EQ("RELEASE-REPLY", stats_mgr6.exchangeToString(StatsMgr6::XCHG_RL));
+
+}
+
 TEST_F(StatsMgrTest, SendReceiveSimple) {
     boost::scoped_ptr<StatsMgr4> stats_mgr(new StatsMgr4());
     boost::shared_ptr<Pkt4> sent_packet(createPacket4(DHCPDISCOVER,