mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[#2436] More review comments

Browse Source 
Use "client-classes" not "classes" in user-context

src/lib/dhcpsrv/memfile_lease_limits.cc
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc
This commit is contained in:
Thomas Markwalder
2022-06-24 10:54:00 -04:00
parent 34a229f6e8
commit aea23444dc
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/dhcpsrv/memfile_lease_limits.cc
View File

@@ -58,7 +58,7 @@ ClassLeaseCounter::getLeaseClientClasses(LeasePtr lease) const {
ConstElementPtr classes; ConstElementPtr classes;
auto ctx = lease->getContext(); auto ctx = lease->getContext();
if (ctx) { if (ctx) {
classes = ctx->find("ISC/classes"); classes = ctx->find("ISC/client-classes");
if (classes && classes->getType() != Element::list) { if (classes && classes->getType() != Element::list) {
isc_throw(Unexpected, "getLeaseClientClasses: " isc_throw(Unexpected, "getLeaseClientClasses: "
<< lease->toText() << " is not a list!"); << lease->toText() << " is not a list!");
@@ -116,7 +116,7 @@ ClassLeaseCounter::updateLease(LeasePtr new_lease, LeasePtr old_lease) {
uint32_t old_state = old_lease->state_; uint32_t old_state = old_lease->state_;
// Did we change states or classes? // Did we change states or classes?
// Note we do not worry about lease type changes, because its makes no // Note we do not worry about lease type changes, because it makes no
// business sense to repurpose a lease as a different type. Other than // business sense to repurpose a lease as a different type. Other than
// some unit tests unrelated to this it never occurs in the code. // some unit tests unrelated to this it never occurs in the code.
if ((old_state != new_state) || (old_classes != new_classes)) { if ((old_state != new_state) || (old_classes != new_classes)) {

6
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
View File

@@ -4015,9 +4015,9 @@ GenericLeaseMgrTest::makeContextWithClasses(const std::list<ClientClass>& classe
clist->add(Element::create(client_class)); clist->add(Element::create(client_class));
} }
ElementPtr extended_info = Element::createMap(); ElementPtr client_classes = Element::createMap();
extended_info->set("classes", clist); client_classes->set("client-classes", clist);
ctx->set("ISC", extended_info); ctx->set("ISC", client_classes);
} }
return (ctx); return (ctx);

8
src/lib/dhcpsrv/tests/memfile_lease_limits_unittest.cc
View File

@@ -48,7 +48,7 @@ public:
/// ///
/// { /// {
/// "ISC": { /// "ISC": {
/// "classes": [ "class0", "class1", ... ] /// "client-classes": [ "class0", "class1", ... ]
/// } /// }
/// } /// }
/// ///
@@ -62,9 +62,9 @@ public:
clist->add(Element::create(client_class)); clist->add(Element::create(client_class));
} }
ElementPtr extended_info = Element::createMap(); ElementPtr client_classes = Element::createMap();
extended_info->set("classes", clist); client_classes->set("client-classes", clist);
ctx->set("ISC", extended_info); ctx->set("ISC", client_classes);
} }
return (ctx); return (ctx);