mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-02 23:15:20 +00:00
Code Issues Releases Wiki Activity

[#1065] fixed rebase

Browse Source
This commit is contained in:
Razvan Becheriu
2020-08-03 15:31:08 +03:00
parent 8e25cb6448
commit 3bb1911280
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/hooks/dhcp/lease_cmds/lease_cmds.cc
View File

@@ -1858,7 +1858,6 @@ LeaseCmdsImpl::lease4WipeHandler(CalloutHandle& handle) {
StatsMgr::generateName("subnet", id, "assigned-addresses"), StatsMgr::generateName("subnet", id, "assigned-addresses"),
int64_t(0)); int64_t(0));
StatsMgr::instance().setValue( StatsMgr::instance().setValue(
StatsMgr::generateName("subnet", id, "declined-addresses"), StatsMgr::generateName("subnet", id, "declined-addresses"),
int64_t(0)); int64_t(0));

24
src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
View File

@@ -4620,12 +4620,6 @@ TEST_F(LeaseCmdsTest, Lease6Update) {
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet", ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "assigned-pds"))->getInteger().first, 0); 99, "assigned-pds"))->getInteger().first, 0);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
66, "declined-addresses"))->getInteger().first, 2);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "declined-addresses"))->getInteger().first, 2);
// Now send the command. // Now send the command.
string txt = string txt =
"{\n" "{\n"
@@ -4687,6 +4681,12 @@ TEST_F(LeaseCmdsTest, Lease6UpdateWithStats) {
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet", ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "assigned-pds"))->getInteger().first, 0); 99, "assigned-pds"))->getInteger().first, 0);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
66, "declined-addresses"))->getInteger().first, 2);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "declined-addresses"))->getInteger().first, 2);
// Now send the command. // Now send the command.
string txt = string txt =
"{\n" "{\n"
@@ -4754,12 +4754,6 @@ TEST_F(LeaseCmdsTest, Lease6UpdateNoSubnetId) {
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet", ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "assigned-pds"))->getInteger().first, 0); 99, "assigned-pds"))->getInteger().first, 0);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
66, "declined-addresses"))->getInteger().first, 2);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "declined-addresses"))->getInteger().first, 2);
// Now send the command. // Now send the command.
string txt = string txt =
"{\n" "{\n"
@@ -4823,6 +4817,12 @@ TEST_F(LeaseCmdsTest, Lease6UpdateNoSubnetIdWithStats) {
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet", ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "assigned-pds"))->getInteger().first, 0); 99, "assigned-pds"))->getInteger().first, 0);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
66, "declined-addresses"))->getInteger().first, 2);
ASSERT_EQ(StatsMgr::instance().getObservation(StatsMgr::generateName("subnet",
99, "declined-addresses"))->getInteger().first, 2);
// Now send the command. // Now send the command.
string txt = string txt =
"{\n" "{\n"