[#2869] Updated v6 status-get

diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
index 94244c14dbb6ae080725b827e789ea2d48f076a6..8202bd5698dffb957fb4509ddad705b46c98ed7c 100644 (file)
--- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc
+++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc
@@ -772,6 +772,13 @@ ControlledDhcpv6Srv::commandStatusGetHandler(const string&,
         status->set("multi-threading-enabled", Element::create(false));
     }
 
+    status->set("extended-info-tables",
+                Element::create(LeaseMgrFactory::instance().getExtendedInfoTablesEnabled()));
+    status->set("by-relay-id-table-size",
+                Element::create(static_cast<long long>(LeaseMgrFactory::instance().byRelayId6size())));
+    status->set("by-remote-id-table-size",
+                Element::create(static_cast<long long>(LeaseMgrFactory::instance().byRemoteId6size())));
+
     // Iterate through the interfaces and get all the errors.
     ElementPtr socket_errors(Element::createList());
     for (IfacePtr const& interface : IfaceMgr::instance().getIfaces()) {

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index f39062b9494f76e5a4c03a5af83b8fa65ac13040..1a6d83b1fe979a5d4c466bec68f86e138b5390b3 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -1094,6 +1094,18 @@ TEST_F(CtrlChannelDhcpv6SrvTest, statusGet) {
     ASSERT_TRUE(found_queue_stats);
     EXPECT_FALSE(found_queue_stats->str().empty());
 
+    auto found_extended_info_tables = arguments->get("extended-info-tables");
+    ASSERT_TRUE(found_extended_info_tables);
+    EXPECT_FALSE(found_extended_info_tables->boolValue());
+
+    auto found_by_relay_id_table_size = arguments->get("by-relay-id-table-size");
+    ASSERT_TRUE(found_by_relay_id_table_size);
+    EXPECT_LE(0, found_by_relay_id_table_size->intValue());
+
+    auto found_by_remote_id_table_size = arguments->get("by-remote-id-table-size");
+    ASSERT_TRUE(found_by_remote_id_table_size);
+    EXPECT_LE(0, found_by_remote_id_table_size->intValue());
+
     MultiThreadingMgr::instance().setMode(true);
     MultiThreadingMgr::instance().setThreadPoolSize(4);
     MultiThreadingMgr::instance().setPacketQueueSize(64);