From 8e25cb64484b7ece98b6c0236af1d6f3101ae254 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Wed, 29 Jul 2020 12:09:52 +0300 Subject: [PATCH] [#1065] addressed review --- src/hooks/dhcp/lease_cmds/lease_cmds.cc | 10 ---------- src/hooks/dhcp/lease_cmds/lease_parser.cc | 8 -------- 2 files changed, 18 deletions(-) diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds.cc b/src/hooks/dhcp/lease_cmds/lease_cmds.cc index cfc6323432..03c5658a51 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds.cc @@ -428,8 +428,6 @@ LeaseCmdsImpl::updateStatsOnAdd(const Lease6Ptr& lease) { lease->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds"), int64_t(1)); - // @node current code does not check for declined PD - // code must be updated in parser (see @todo in lease_parser.cc) if (lease->stateDeclined()) { StatsMgr::instance().addValue("declined-addresses", int64_t(1)); @@ -512,8 +510,6 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing, "assigned-nas" : "assigned-pds"), int64_t(-1)); } - // @node current code does not check for declined PD - // code must be updated in parser (see @todo in lease_parser.cc) if (existing->stateDeclined()) { // old lease is declined StatsMgr::instance().addValue("declined-addresses", int64_t(-1)); @@ -532,8 +528,6 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing, "assigned-nas" : "assigned-pds"), int64_t(1)); } - // @node current code does not check for declined PD - // code must be updated in parser (see @todo in lease_parser.cc) if (lease->stateDeclined()) { // new lease is declined StatsMgr::instance().addValue("declined-addresses", int64_t(1)); @@ -553,8 +547,6 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing, lease->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds"), int64_t(1)); - // @node current code does not check for declined PD - // code must be updated in parser (see @todo in lease_parser.cc) if (lease->stateDeclined()) { // new lease is declined StatsMgr::instance().addValue("declined-addresses", int64_t(1)); @@ -594,8 +586,6 @@ LeaseCmdsImpl::updateStatsOnDelete(const Lease6Ptr& lease) { lease->type_ == Lease::TYPE_NA ? "assigned-nas" : "assigned-pds"), int64_t(-1)); - // @node current code does not check for declined PD - // code must be updated in parser (see @todo in lease_parser.cc) if (lease->stateDeclined()) { StatsMgr::instance().addValue("declined-addresses", int64_t(-1)); diff --git a/src/hooks/dhcp/lease_cmds/lease_parser.cc b/src/hooks/dhcp/lease_cmds/lease_parser.cc index 257f7aea19..c8048c6ea6 100644 --- a/src/hooks/dhcp/lease_cmds/lease_parser.cc +++ b/src/hooks/dhcp/lease_cmds/lease_parser.cc @@ -137,14 +137,6 @@ Lease4Parser::parse(ConstSrvConfigPtr& cfg, "values are: 0 (default), 1 (declined) and 2 (expired-reclaimed)"); } - /// @todo throw if PD address is in declined state - /* - if (state == Lease::STATE_DECLINED && type == Lease::TYPE_PD) { - isc_throw(isc::InvalidOperation, - "invalid PD address in declined state"); - } - */ - // Handle user context. ConstElementPtr ctx = lease_info->get("user-context"); if (ctx && (ctx->getType() != Element::map)) { -- 2.47.2