[#3347] Handle calls with no subnet

Move handling of subnet parmaeter from callouts to
PerfMonMgr::processPktEventStack().

modified:
    perfmon_callouts.cc
    perfmon_mgr.cc
    perfmon_mgr.h
    tests/Makefile.am
    tests/perfmon_mgr_unittests.cc

diff --git a/src/hooks/dhcp/perfmon/perfmon_callouts.cc b/src/hooks/dhcp/perfmon/perfmon_callouts.cc
index b90fc96fee8ae4581829c54438465c3e5df814d5..09df3badbfbf0b001c827a91ddf901c08077dcf8 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_callouts.cc
+++ b/src/hooks/dhcp/perfmon/perfmon_callouts.cc
@@ -73,7 +73,7 @@ int pkt4_send(CalloutHandle& handle) {
     handle.getArgument("subnet4", subnet);
 
     try {
-        mgr->processPktEventStack(query, response, subnet->getID());
+        mgr->processPktEventStack(query, response, subnet);
     } catch (const std::exception& ex) {
         LOG_DEBUG(perfmon_logger, DBGLVL_TRACE_DETAIL, PERFMON_DHCP4_PKT_PROCESS_ERROR)
                 .arg(query->getLabel())
@@ -105,7 +105,7 @@ int pkt6_send(CalloutHandle& handle) {
     handle.getArgument("subnet6", subnet);
 
     try {
-        mgr->processPktEventStack(query, response, subnet->getID());
+        mgr->processPktEventStack(query, response, subnet);
     } catch (const std::exception& ex) {
         LOG_DEBUG(perfmon_logger, DBGLVL_TRACE_DETAIL, PERFMON_DHCP6_PKT_PROCESS_ERROR)
                 .arg(query->getLabel())

diff --git a/src/hooks/dhcp/perfmon/perfmon_mgr.cc b/src/hooks/dhcp/perfmon/perfmon_mgr.cc
index 2a526062e8aa2451d7d83d83d7c35750b8613004..edff6a3f017540c02d14d39e7d208b8797e9455b 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_mgr.cc
+++ b/src/hooks/dhcp/perfmon/perfmon_mgr.cc
@@ -65,9 +65,7 @@ PerfMonMgr::configure(const ConstElementPtr& params) {
 }
 
 void
-PerfMonMgr::processPktEventStack(isc::dhcp::PktPtr query,
-                                 isc::dhcp::PktPtr response,
-                                 const isc::dhcp::SubnetID& subnet_id) {
+PerfMonMgr::processPktEventStack(PktPtr query, PktPtr response, SubnetPtr subnet) {
     if (!query) {
         isc_throw(Unexpected, "PerfMonMgr::processPktEventStack - query is empty!");
     }
@@ -92,6 +90,9 @@ PerfMonMgr::processPktEventStack(isc::dhcp::PktPtr query,
                               << events.size());
     }
 
+    // If we're here without a selected subnet, use global subnet id.
+    SubnetID subnet_id = (subnet ? subnet->getID() : SUBNET_ID_GLOBAL);
+
     LOG_DEBUG(perfmon_logger, DBGLVL_TRACE_DETAIL,
               (family_ == AF_INET ? PERFMON_DHCP4_PKT_EVENTS : PERFMON_DHCP6_PKT_EVENTS))
             .arg(query->getLabel())

diff --git a/src/hooks/dhcp/perfmon/perfmon_mgr.h b/src/hooks/dhcp/perfmon/perfmon_mgr.h
index 2c153b2c92f386511809810d0d058c9dc124f3f5..ef95d96b9d8a7418676e2f2df678fe623d6b3845 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_mgr.h
+++ b/src/hooks/dhcp/perfmon/perfmon_mgr.h
@@ -15,6 +15,7 @@
 #include <monitored_duration_store.h>
 #include <asiolink/io_service.h>
 #include <asiolink/interval_timer.h>
+#include <dhcpsrv/subnet.h>
 
 namespace isc {
 namespace perfmon {
@@ -49,10 +50,11 @@ public:
     ///
     /// @param query query packet whose stack is to be processed.
     /// @param response response packet generated for the query.
-    /// @param subnet_id id of the selected subnet.
+    /// @param subnet selected subnet, if empty use the global
+    /// subnet id.
     void processPktEventStack(isc::dhcp::PktPtr query,
                               isc::dhcp::PktPtr response,
-                              const isc::dhcp::SubnetID& subnet_id);
+                              const isc::dhcp::SubnetPtr subnet);
 
     /// @brief Adds a duration sample to a MonitoredDuration.
     ///

diff --git a/src/hooks/dhcp/perfmon/tests/Makefile.am b/src/hooks/dhcp/perfmon/tests/Makefile.am
index 21269255e7b041ce1aeb7429497a2e1fbabb92b8..b3e474535da8ccf49793a993e72adab66a3c8a67 100644 (file)
--- a/src/hooks/dhcp/perfmon/tests/Makefile.am
+++ b/src/hooks/dhcp/perfmon/tests/Makefile.am
@@ -44,6 +44,7 @@ perfmon_unittests_CXXFLAGS = $(AM_CXXFLAGS)
 
 perfmon_unittests_LDADD  = $(top_builddir)/src/hooks/dhcp/perfmon/libperfmon.la
 perfmon_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
+perfmon_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
 perfmon_unittests_LDADD += $(top_builddir)/src/lib/process/libkea-process.la
 perfmon_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la
 perfmon_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la

diff --git a/src/hooks/dhcp/perfmon/tests/perfmon_mgr_unittests.cc b/src/hooks/dhcp/perfmon/tests/perfmon_mgr_unittests.cc
index fd5cf8a374090c757ed777296a0e153bffa44946..825a8c52f6ed2d8114d05957acf99abd227269be 100644 (file)
--- a/src/hooks/dhcp/perfmon/tests/perfmon_mgr_unittests.cc
+++ b/src/hooks/dhcp/perfmon/tests/perfmon_mgr_unittests.cc
@@ -10,6 +10,7 @@
 #include <dhcp/dhcp6.h>
 #include <dhcp/pkt4.h>
 #include <dhcp/pkt6.h>
+#include <dhcpsrv/subnet.h>
 #include <stats/stats_mgr.h>
 #include <testutils/log_utils.h>
 #include <testutils/gtest_utils.h>
@@ -20,6 +21,7 @@
 
 using namespace std;
 using namespace isc;
+using namespace isc::asiolink;
 using namespace isc::data;
 using namespace isc::dhcp;
 using namespace isc::perfmon;
@@ -75,6 +77,13 @@ public:
         StatsMgr::instance();
         StatsMgr::instance().removeAll();
         StatsMgr::instance().setMaxSampleCountAll(1);
+        if (family_ == AF_INET) {
+            subnet22_.reset(new Subnet4(IOAddress("192.0.22.0"), 8, 100, 200, 300, 22));
+            subnet33_.reset(new Subnet4(IOAddress("192.0.33.0"), 8, 100, 200, 300, 33));
+        } else {
+            subnet22_.reset(new Subnet6(IOAddress("3001:22::"), 64, 100, 200, 300, 300, 22));
+            subnet33_.reset(new Subnet6(IOAddress("3002:33::"), 64, 100, 200, 300, 300, 33));
+        }
     }
 
     /// @brief Destructor.
@@ -478,9 +487,8 @@ public:
         ASSERT_NO_THROW_LOG(createMgr(valid_config));
         PktPtr query;
         PktPtr response;
-        SubnetID subnet_id = SUBNET_ID_GLOBAL;
         // No query
-        ASSERT_THROW_MSG(mgr_->processPktEventStack(query, response, subnet_id), Unexpected,
+        ASSERT_THROW_MSG(mgr_->processPktEventStack(query, response, SubnetPtr()), Unexpected,
                          "PerfMonMgr::processPktEventStack - query is empty!");
 
         // Invalid message pair
@@ -492,12 +500,12 @@ public:
             << (family_ == AF_INET ? Pkt4::getName(response->getType())
                                    : Pkt6::getName(response->getType()));
 
-        ASSERT_THROW_MSG(mgr_->processPktEventStack(response, query, subnet_id), BadValue,
+        ASSERT_THROW_MSG(mgr_->processPktEventStack(response, query, SubnetPtr()), BadValue,
                          oss.str());
 
         // Packet stack size less than 2.
         query->addPktEvent("just one");
-        ASSERT_THROW_MSG(mgr_->processPktEventStack(query, response, subnet_id), Unexpected,
+        ASSERT_THROW_MSG(mgr_->processPktEventStack(query, response, SubnetPtr()), Unexpected,
                          "PerfMonMgr::processPtkEventStack - incomplete stack, size: 1");
     }
 
@@ -528,8 +536,9 @@ public:
 
         // Now process the packets on two different subnets.
         // With monitoring disabled no duration data should be stored.
-        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, 22));
-        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, 33));
+        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, SubnetPtr()));
+        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, subnet22_));
+        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, subnet33_));
 
         // Fetch all the durations in primary key order.
         MonitoredDurationCollectionPtr durations = mgr_->getDurationStore()->getAll();
@@ -537,8 +546,9 @@ public:
 
         // Enabled monitoring and process the queries again.
         mgr_->setEnableMonitoring(true);
-        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, 22));
-        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, 33));
+        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, SubnetPtr()));
+        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, subnet22_));
+        ASSERT_NO_THROW_LOG(mgr_->processPktEventStack(query, response, subnet33_));
 
         // Fetch all the durations in primary key order.
         durations = mgr_->getDurationStore()->getAll();
@@ -555,19 +565,19 @@ public:
 
         // Specifies the expected durations in the order they should be returned.
         std::list<ExpectedDuration> exp_data_rows {
-            { "buffer_read", "process_started", 0,  2, 8 },
+            { "buffer_read", "process_started", 0,  3, 12 },
             { "buffer_read", "process_started", 22, 1, 4 },
             { "buffer_read", "process_started", 33, 1, 4 },
 
-            { "composite", "total_response", 0,  2, 24 },
+            { "composite", "total_response", 0,  3, 36 },
             { "composite", "total_response", 22, 1, 12 },
             { "composite", "total_response", 33, 1, 12 },
 
-            { "process_started", "process_completed", 0,  2, 6 },
+            { "process_started", "process_completed", 0,  3, 9 },
             { "process_started", "process_completed", 22, 1, 3 },
             { "process_started", "process_completed", 33, 1, 3 },
 
-            { "socket_received", "buffer_read", 0,  2, 10 },
+            { "socket_received", "buffer_read", 0,  3, 15 },
             { "socket_received", "buffer_read", 22, 1,  5 },
             { "socket_received", "buffer_read", 33, 1,  5 }
         };
@@ -618,6 +628,11 @@ public:
 
     /// @brief PerfMonMgr instance used in test functions.
     PerfMonMgrPtr mgr_;
+
+    /// @brief Family specific subnets.
+    SubnetPtr subnet22_;
+    SubnetPtr subnet33_;
+
 };
 
 /// @brief Test fixture for testing PerfMonConfig for DHCPV4.