From: Razvan Becheriu <razvan@isc.org>
Date: Mon, 27 Jul 2020 09:30:04 +0000 (+0300)
Subject: [#1065] updated stats
X-Git-Tag: Kea-1.8.0~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=370fdd51b8844fcc26d01aa1eabb7672ff7db3c0;p=thirdparty%2Fkea.git

[#1065] updated stats
---

diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
index b79d64adc4..a2017ed996 100644
--- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc
+++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc
@@ -462,6 +462,14 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& lease4,
                 StatsMgr::generateName("subnet", lease4->subnet_id_,
                                        "assigned-addresses"),
                 int64_t(-1));
+
+            if (lease4->stateDeclined()) {
+                // old lease is declined
+                StatsMgr::instance().addValue(
+                    StatsMgr::generateName("subnet", lease4->subnet_id_,
+                                           "declined-addresses"),
+                    int64_t(-1));
+            }
         }
         if (!lease->stateExpiredReclaimed()) {
             // new lease is non expired-reclaimed
@@ -470,6 +478,14 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& lease4,
                     StatsMgr::generateName("subnet", lease->subnet_id_,
                                            "assigned-addresses"),
                     int64_t(1));
+
+                if (lease->stateDeclined()) {
+                    // new lease is declined
+                    StatsMgr::instance().addValue(
+                        StatsMgr::generateName("subnet", lease->subnet_id_,
+                                               "declined-addresses"),
+                        int64_t(1));
+                }
             }
         } else {
             // new lease is expired-reclaimed
@@ -489,6 +505,14 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& lease4,
                                        "assigned-addresses"),
                 int64_t(1));
 
+            if (lease->stateDeclined()) {
+                // new lease is declined
+                StatsMgr::instance().addValue(
+                    StatsMgr::generateName("subnet", lease->subnet_id_,
+                                           "declined-addresses"),
+                    int64_t(1));
+            }
+
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", lease4->subnet_id_,
                                        "reclaimed-leases"),
@@ -521,6 +545,14 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& lease6,
                                        lease->type_ == Lease::TYPE_NA ?
                                        "assigned-nas" : "assigned-pds"),
                 int64_t(-1));
+
+            if (lease6->stateDeclined()) {
+                // old lease is declined
+                StatsMgr::instance().addValue(
+                    StatsMgr::generateName("subnet", lease6->subnet_id_,
+                                           "declined-addresses"),
+                    int64_t(-1));
+            }
         }
         if (!lease->stateExpiredReclaimed()) {
             // new lease is non expired-reclaimed
@@ -530,6 +562,14 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& lease6,
                                            lease->type_ == Lease::TYPE_NA ?
                                            "assigned-nas" : "assigned-pds"),
                     int64_t(1));
+
+                if (lease->stateDeclined()) {
+                    // new lease is declined
+                    StatsMgr::instance().addValue(
+                        StatsMgr::generateName("subnet", lease->subnet_id_,
+                                               "declined-addresses"),
+                        int64_t(1));
+                }
             }
         } else {
             // new lease is expired-reclaimed
@@ -550,6 +590,14 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& lease6,
                                        "assigned-nas" : "assigned-pds"),
                 int64_t(1));
 
+            if (lease->stateDeclined()) {
+                // new lease is declined
+                StatsMgr::instance().addValue(
+                    StatsMgr::generateName("subnet", lease->subnet_id_,
+                                           "declined-addresses"),
+                    int64_t(1));
+            }
+
             StatsMgr::instance().addValue(
                 StatsMgr::generateName("subnet", lease6->subnet_id_,
                                        "reclaimed-leases"),