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

[#2883] changed declined-nas to declined-addresses

Browse Source
This commit is contained in:
Razvan Becheriu
2023-06-14 20:23:35 +03:00
parent c6c2ead8a2
commit df21029e5b
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/sphinx/arm/hooks-stat-cmds.rst
View File

@@ -188,7 +188,7 @@ The response to either command will contain three elements:
- ``assigned-nas`` - the number of NA addresses in the subnet that - ``assigned-nas`` - the number of NA addresses in the subnet that
are currently assigned to a client. are currently assigned to a client.
- ``declined-nas`` - the number of NA addresses that are currently - ``declined-addresses`` - the number of NA addresses that are currently
declined and are thus unavailable for assignment. declined and are thus unavailable for assignment.
- ``total-pds`` - the total number of PD prefixes available of DHCPv6 - ``total-pds`` - the total number of PD prefixes available of DHCPv6
@@ -239,7 +239,7 @@ PD pools:
"text": "stat-lease6-get: 2 rows found", "text": "stat-lease6-get: 2 rows found",
"arguments": { "arguments": {
"result-set": { "result-set": {
"columns": [ "subnet-id", "total-nas", "cumulative-assigned-nas", "assigned-nas", "declined-nas", "total-pds", "cumulative-assigned-pds", "assigned-pds" ], "columns": [ "subnet-id", "total-nas", "cumulative-assigned-nas", "assigned-nas", "declined-addresses", "total-pds", "cumulative-assigned-pds", "assigned-pds" ],
"rows": [ "rows": [
[ 10, 4096, 5000, 2400, 3, 0, 0, 0], [ 10, 4096, 5000, 2400, 3, 0, 0, 0],
[ 20, 0, 0, 0, 0, 1048, 300, 233 ], [ 20, 0, 0, 0, 0, 1048, 300, 233 ],

2
src/bin/dhcp6/dhcp6_srv.cc
View File

@@ -3990,7 +3990,7 @@ Dhcpv6Srv::declineLease(const Pkt6Ptr& decline, const Lease6Ptr lease,
// We do not want to decrease the assigned-nas at this time. While // We do not want to decrease the assigned-nas at this time. While
// technically a declined address is no longer allocated, the // technically a declined address is no longer allocated, the
// primary usage of the assigned-nas statistic is to monitor pool // primary usage of the assigned-nas statistic is to monitor pool
// utilization. Most people would forget to include declined-nas // utilization. Most people would forget to include declined-addresses
// in the calculation, and simply do assigned-nas/total-nas. This // in the calculation, and simply do assigned-nas/total-nas. This
// would have a bias towards under-representing pool utilization, // would have a bias towards under-representing pool utilization,
// if we decreased allocated immediately after receiving DHCPDECLINE, // if we decreased allocated immediately after receiving DHCPDECLINE,

2
src/hooks/dhcp/stat_cmds/stat_cmds.cc
View File

@@ -592,7 +592,7 @@ LeaseStatCmdsImpl::makeResultSet6(const ElementPtr& result_wrapper,
std::vector<std::string>column_labels = { "subnet-id", "total-nas", std::vector<std::string>column_labels = { "subnet-id", "total-nas",
"cumulative-assigned-nas", "cumulative-assigned-nas",
"assigned-nas", "assigned-nas",
"declined-nas", "total-pds", "declined-addresses", "total-pds",
"cumulative-assigned-pds", "cumulative-assigned-pds",
"assigned-pds" }; "assigned-pds" };
ElementPtr value_rows = createResultSet(result_wrapper, column_labels); ElementPtr value_rows = createResultSet(result_wrapper, column_labels);

2
src/hooks/dhcp/stat_cmds/stat_cmds.dox
View File

@@ -187,7 +187,7 @@ and DHCPv6 response might look like this:
"result-set": { "result-set": {
"columns": [ "columns": [
"subnet-id", "total-nas", "cumulative-assigned-nas", "subnet-id", "total-nas", "cumulative-assigned-nas",
"assigned-nas", "declined-nas", "total-pds", "assigned-nas", "declined-addresses", "total-pds",
"cumulative-assigned-pds", "assigned-pds" "cumulative-assigned-pds", "assigned-pds"
], ],
"rows": [ "rows": [

2
src/hooks/dhcp/stat_cmds/stat_cmds.h
View File

@@ -99,7 +99,7 @@ public:
/// "timestamp": "2018-03-22 09:43:30.815371", /// "timestamp": "2018-03-22 09:43:30.815371",
/// "columns": ["subnet_id", "total-nas", /// "columns": ["subnet_id", "total-nas",
/// "cumulative-assigned-nas", /// "cumulative-assigned-nas",
/// "assigned-nas", "declined-nas", /// "assigned-nas", "declined-addresses",
/// "total-pds", "cumulative-assigned-pds", /// "total-pds", "cumulative-assigned-pds",
/// "assigned-pds"], /// "assigned-pds"],
/// "rows": [ /// "rows": [

16
src/hooks/dhcp/stat_cmds/tests/stat_cmds_unittest.cc
View File

@@ -1253,7 +1253,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1277,7 +1277,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1304,7 +1304,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1330,7 +1330,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1358,7 +1358,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1386,7 +1386,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1414,7 +1414,7 @@ TEST_F(StatCmdsTest, statLease6GetValid) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"
@@ -1581,7 +1581,7 @@ TEST_F(StatCmdsTest, statLease6OrphanedStats) {
" \"columns\": [\n" " \"columns\": [\n"
" \"subnet-id\", \"total-nas\",\n" " \"subnet-id\", \"total-nas\",\n"
" \"cumulative-assigned-nas\", \"assigned-nas\",\n" " \"cumulative-assigned-nas\", \"assigned-nas\",\n"
" \"declined-nas\", \"total-pds\",\n" " \"declined-addresses\", \"total-pds\",\n"
" \"cumulative-assigned-pds\", \"assigned-pds\"\n" " \"cumulative-assigned-pds\", \"assigned-pds\"\n"
" ],\n" " ],\n"
" \"rows\": [\n" " \"rows\": [\n"

2
src/share/api/stat-lease6-get.json
View File

@@ -21,7 +21,7 @@
" \"text\": \"stat-lease6-get: 2 rows found\",", " \"text\": \"stat-lease6-get: 2 rows found\",",
" \"arguments\": {", " \"arguments\": {",
" \"result-set\": {", " \"result-set\": {",
" \"columns\": [ \"subnet-id\", \"total-nas\", \"cumulative-assigned-nas\", \"assigned-nas\", \"declined-nas\", \"total-pds\", \"cumulative-assigned-pds\", \"assigned-pds\" ],", " \"columns\": [ \"subnet-id\", \"total-nas\", \"cumulative-assigned-nas\", \"assigned-nas\", \"declined-addresses\", \"total-pds\", \"cumulative-assigned-pds\", \"assigned-pds\" ],",
" \"rows\": [", " \"rows\": [",
" [ 10, 4096, 3000, 2400, 3, 0, 0],", " [ 10, 4096, 3000, 2400, 3, 0, 0],",
" [ 20, 0, 0, 0, 1048, 500, 233 ],", " [ 20, 0, 0, 0, 1048, 500, 233 ],",