From: Thomas Markwalder Date: Thu, 7 May 2026 16:53:27 +0000 (-0400) Subject: [#4492] Addressed some initial comments X-Git-Tag: Kea-3.1.9~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e56955cc1107e3fc5d2b3be82751ebb58d29fb1;p=thirdparty%2Fkea.git [#4492] Addressed some initial comments Mostly typos and minor fixes modified: doc/sphinx/arm/dhcp4-srv.rst modified: doc/sphinx/arm/dhcp6-srv.rst modified: doc/sphinx/arm/hooks-lease-cmds.rst modified: src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc modified: src/hooks/dhcp/lease_cmds/libloadtests/sflq_cmds_unittests.cc modified: src/hooks/dhcp/lease_cmds/sflq_cmds.cc modified: src/hooks/dhcp/lease_cmds/sflq_cmds.h modified: src/lib/dhcp/tests/iface_mgr_unittest.cc modified: src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h modified: src/share/api/sflq-pool4-create.json modified: src/share/api/sflq-pool4-del.json modified: src/share/api/sflq-pool4-get-all.json modified: src/share/api/sflq-pool4-get-by-range.json modified: src/share/api/sflq-pool4-get-by-subnet.json modified: src/share/api/sflq-pool6-create.json modified: src/share/api/sflq-pool6-del.json modified: src/share/api/sflq-pool6-get-all.json modified: src/share/api/sflq-pool6-get-by-range.json modified: src/share/api/sflq-pool6-get-by-subnet.json --- diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst index b5a3099f80..3f8d4cd714 100644 --- a/doc/sphinx/arm/dhcp4-srv.rst +++ b/doc/sphinx/arm/dhcp4-srv.rst @@ -9126,7 +9126,7 @@ Shared Free Lease Queue Allocator .. warning:: - Added in Kea 3.2.0, Shared Free Lease Queue Allocator is considered + Added in Kea 3.1.9, Shared Free Lease Queue Allocator is considered experimental and is not supported for production use. The Shared Free Lease Queue (SFLQ) Allocator is intended for use sites with diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst index c965ab2636..93d7db9d2d 100644 --- a/doc/sphinx/arm/dhcp6-srv.rst +++ b/doc/sphinx/arm/dhcp6-srv.rst @@ -8951,7 +8951,7 @@ Shared Free Lease Queue Allocator .. warning:: - Added in Kea 3.2.0, Shared Free Lease Queue Allocator is considered + Added in Kea 3.1.9, Shared Free Lease Queue Allocator is considered experimental and is not supported for production use. .. note:: diff --git a/doc/sphinx/arm/hooks-lease-cmds.rst b/doc/sphinx/arm/hooks-lease-cmds.rst index a3e878f72f..342c04288c 100644 --- a/doc/sphinx/arm/hooks-lease-cmds.rst +++ b/doc/sphinx/arm/hooks-lease-cmds.rst @@ -113,30 +113,30 @@ This library provides the following commands: - :isccmd:`lease6-write` - writes the IPv6 memfile lease database into a file. -- :isccmd::`sflq-pool4-create` - creates an IPv4 SFLQ pool in the lease back end. +- :iscmd:`sflq-pool4-create` - creates an IPv4 SFLQ pool in the lease back end. -- :isccmd::`sflq-pool6-create` - creates an IPv6 SFLQ pool in the lease back end. +- :iscmd:`sflq-pool6-create` - creates an IPv6 SFLQ pool in the lease back end. -- :isccmd::`sflq-pool4-get-all` - fetches all IPv4 SFLQ pools from the lease back end. +- :iscmd:`sflq-pool4-get-all` - fetches all IPv4 SFLQ pools from the lease back end. -- :isccmd::`sflq-pool6-get-all` - fetches all IPv6 SFLQ pools from the lease back end. +- :iscmd:`sflq-pool6-get-all` - fetches all IPv6 SFLQ pools from the lease back end. -- :isccmd::`sflq-pool4-get-by-subnet` - fetches all IPv4 SFLQ pools that belong to +- :iscmd:`sflq-pool4-get-by-subnet` - fetches all IPv4 SFLQ pools that belong to a subnet from the lease back end. -- :isccmd::`sflq-pool6-get-by-subnet` - fetches all IPv6 SFLQ pools that belong to +- :iscmd:`sflq-pool6-get-by-subnet` - fetches all IPv6 SFLQ pools that belong to a subnet from the lease back end. -- :isccmd::`sflq-pool4-get-by-range` - fetches all IPv4 SFLQ pools that overlap an +- :iscmd:`sflq-pool4-get-by-range` - fetches all IPv4 SFLQ pools that overlap an address range from the lease back end. -- :isccmd::`sflq-pool6-get-by-range` - fetches all IPv6 SFLQ pools that overlap an +- :iscmd:`sflq-pool6-get-by-range` - fetches all IPv6 SFLQ pools that overlap an address range from the lease back end. -- :isccmd::`sflq-pool4-del` - deletes an IPv4 SFLQ pool that matches an address +- :iscmd:`sflq-pool4-del` - deletes an IPv4 SFLQ pool that matches an address range from the lease back end. -- :isccmd::`sflq-pool6-del` - deletes an IPv6 SFLQ pool that matches an address +- :iscmd:`sflq-pool6-del` - deletes an IPv6 SFLQ pool that matches an address range from the lease back end. All commands use JSON syntax and can be issued either using the control @@ -1285,7 +1285,7 @@ recreating an IPv6 SFLQ pool for a prefix delegation pool is shown below: For large pools (e.g. >= 1 million address/prefixes), this command can take twenty seconds or more. During this time the server will not process client queries. Make sure the tool with which you send the commands - is confgured for long time outs. Once submitted to the lease back + is configured for long time outs. Once submitted to the lease back end the query will continue to run, even if the API client disconnects. The command returns a status that indicates either success (result 0) diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc index d1aaf38ba6..db97467eeb 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc @@ -106,7 +106,7 @@ const char* values[] = { "SFLQ_POOL4_CREATE_FAILED", "sflq-pool4-create command failed, (parameters: %1, reason: %2)", "SFLQ_POOL4_DEL", "sflq-pool4-del command succeeded, (parameters: %1) pools deleted: %2", "SFLQ_POOL4_DEL_FAILED", "sflq-pool4-del command failed, (parameters: %1, reason: %2)", - "SFLQ_POOL4_GET_ALL", "sflq-pool4-get-all command succeeded, (parameters: %1) pools found: %2", + "SFLQ_POOL4_GET_ALL", "sflq-pool4-get-all command succeeded, pools found: %1", "SFLQ_POOL4_GET_ALL_FAILED", "sflq-pool4-get-all command failed, (parameters: %1, reason: %2)", "SFLQ_POOL4_GET_BY_RANGE", "sflq-pool4-get-by-range command succeeded, (parameters: %1) pools found: %2", "SFLQ_POOL4_GET_BY_RANGE_FAILED", "sflq-pool4-get-by-range command failed, (parameters: %1, reason: %2)", @@ -116,7 +116,7 @@ const char* values[] = { "SFLQ_POOL6_CREATE_FAILED", "sflq-pool6-create command failed, (parameters: %1, reason: %2)", "SFLQ_POOL6_DEL", "sflq-pool4-del command succeeded, (parameters: %1) pools deleted: %2", "SFLQ_POOL6_DEL_FAILED", "sflq-pool4-del command failed, (parameters: %1, reason: %2)", - "SFLQ_POOL6_GET_ALL", "sflq-pool6-get-all command succeeded, (parameters: %1) pools found: %2", + "SFLQ_POOL6_GET_ALL", "sflq-pool6-get-all command succeeded, pools found: %1", "SFLQ_POOL6_GET_ALL_FAILED", "sflq-pool6-get-all command failed, (parameters: %1, reason: %2)", "SFLQ_POOL6_GET_BY_RANGE", "sflq-pool6-get-by-range command succeeded, (parameters: %1) pools found: %2", "SFLQ_POOL6_GET_BY_RANGE_FAILED", "sflq-pool6-get-by-range command failed, (parameters: %1, reason: %2)", diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/sflq_cmds_unittests.cc b/src/hooks/dhcp/lease_cmds/libloadtests/sflq_cmds_unittests.cc index a4e1e2c66c..0dab1d5420 100644 --- a/src/hooks/dhcp/lease_cmds/libloadtests/sflq_cmds_unittests.cc +++ b/src/hooks/dhcp/lease_cmds/libloadtests/sflq_cmds_unittests.cc @@ -133,7 +133,7 @@ public: /// equal to their rhs counterparts. Asserts if they are not "equal". /// /// @param lhs left-side instance to compare - /// @param rhs reft-side instance to compare + /// @param rhs left-side instance to compare /// @param lineno source line of invocation (pass in __LINE__) void checkPoolInfos(const SflqPoolInfo& lhs, const SflqPoolInfo& rhs, int lineno) { ASSERT_TRUE(lhs.lease_type_ == rhs.lease_type_ && @@ -172,7 +172,7 @@ public: auto family = isc::dhcp::CfgMgr::instance().getFamily(); SflqPoolInfoCollectionPtr pool_infos(new SflqPoolInfoCollection()); - for (int i = 0; i < pools_elem->size(); ++i) { + for (size_t i = 0; i < pools_elem->size(); ++i) { auto pool_elem = pools_elem->get(i); SflqPoolInfoPtr pi(new SflqPoolInfo()); pi->start_address_ = SimpleParser::getAddress(pool_elem, "start-address"); @@ -189,7 +189,7 @@ public: return (pool_infos); } - /// @brief Extracts the value of "lease-type" from commnd parameters + /// @brief Extracts the value of "lease-type" from command parameters /// /// This function is used both for command parameters and unparsing /// JSON pool infos. @@ -364,7 +364,7 @@ void SflqCmds4Test::sflqPool4CreateBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool4-create", "arguments": {)" @@ -386,7 +386,7 @@ void SflqCmds4Test::sflqPool4GetAllBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool4-get-all", "arguments": {)" @@ -422,7 +422,7 @@ void SflqCmds4Test::sflqPool4GetBySubnetBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool4-get-by-subnet", "arguments": {)" @@ -477,7 +477,7 @@ void SflqCmds4Test::sflqPool4GetByRangeBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool4-get-by-range", "arguments": {)" @@ -541,7 +541,7 @@ void SflqCmds4Test::sflqPool4DelBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool4-del", "arguments": {)" @@ -621,7 +621,7 @@ SflqCmds4Test::testSflqCommands() { auto pool_infos = extractPools(cmd_rsp); // Should get them back in order they were created. Dummy back end doesn't sort. - for (int i = 0; i < test_pools.size(); ++i) { + for (size_t i = 0; i < test_pools.size(); ++i) { checkPoolInfos(*(*pool_infos)[i], *test_pools[i], __LINE__); } @@ -944,7 +944,7 @@ void SflqCmds6Test::sflqPool6CreateBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool6-create", "arguments": {)" @@ -966,7 +966,7 @@ void SflqCmds6Test::sflqPool6GetAllBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool6-get-all", "arguments": {)" @@ -1002,7 +1002,7 @@ void SflqCmds6Test::sflqPool6GetBySubnetBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool6-get-by-subnet", "arguments": {)" @@ -1057,7 +1057,7 @@ void SflqCmds6Test::sflqPool6GetByRangeBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool6-get-by-range", "arguments": {)" @@ -1122,7 +1122,7 @@ void SflqCmds6Test::sflqPool6DelBadParams() { for ( auto const& scenario : scenarios) { std::ostringstream oss; - oss << "Scenerio at line: " << scenario.line_; + oss << "Scenario at line: " << scenario.line_; SCOPED_TRACE(oss.str()); std::ostringstream command; command << R"({ "command": "sflq-pool6-del", "arguments": {)" @@ -1208,7 +1208,7 @@ SflqCmds6Test::testSflqCommands(Lease::Type lease_type) { pool_infos = extractPools(cmd_rsp); // Should get them back in order they were created. Dummy back end doesn't sort. - for (int i = 0; i < test_pools.size(); ++i) { + for (size_t i = 0; i < test_pools.size(); ++i) { checkPoolInfos(*(*pool_infos)[i], *test_pools[i], __LINE__); } diff --git a/src/hooks/dhcp/lease_cmds/sflq_cmds.cc b/src/hooks/dhcp/lease_cmds/sflq_cmds.cc index 77dbad12b5..3141f51538 100644 --- a/src/hooks/dhcp/lease_cmds/sflq_cmds.cc +++ b/src/hooks/dhcp/lease_cmds/sflq_cmds.cc @@ -483,7 +483,7 @@ SflqCmdsImpl::extractDelegatedLen(ConstElementPtr& params, << ", it must be >= 1 and =< 128"); } - if (lease_type == Lease::TYPE_NA) { + if (lease_type == Lease::TYPE_NA && val != 128) { isc_throw(BadValue, "'delegated-len' must only be 128 for IA_NA pools"); } diff --git a/src/hooks/dhcp/lease_cmds/sflq_cmds.h b/src/hooks/dhcp/lease_cmds/sflq_cmds.h index 46cc28094e..e967792b7f 100644 --- a/src/hooks/dhcp/lease_cmds/sflq_cmds.h +++ b/src/hooks/dhcp/lease_cmds/sflq_cmds.h @@ -25,7 +25,7 @@ namespace lease_cmds { /// SFLQ pools and data. class SflqCmdsImpl : private config::CmdsImpl { public: - /// @brief Consstructor. + /// @brief Constructor. SflqCmdsImpl() {}; /// @brief Destructor. @@ -329,12 +329,12 @@ public: /// @brief Extracts an ip address range from given parameters map /// - /// Expects the map to contain valid addressess of the the given + /// Expects the map to contain valid addresses of the the given /// family (AF_INET or AF_INET6), specified as 'start-address' and /// 'end-address' and where the former is less than or equal to the /// latter. /// - /// @param params Element map containging the command arguments. + /// @param params Element map containing the command arguments. /// @param family protocol family (AF_INET or AF_INET6). /// @param[out] start_address IOAddress reference which receives the /// extracted start-address value @@ -353,7 +353,7 @@ public: /// value. If the parameter is not found in the map, the function will /// the function will return the default value. /// - /// @param params Element map containging the command arguments. + /// @param params Element map containing the command arguments. /// @param name name of the desired parameter. /// @param default_value value to return if the parameter is optional and /// not specified. @@ -369,7 +369,7 @@ public: /// if it is present and is >= 1 and <= 128. If it is not present /// it returns a value of 128. /// - /// @param params Element map containging the command arguments. + /// @param params Element map containing the command arguments. /// @param lease_type Lease::Type supplied with the arguments (IA_NA /// or IA_PD) /// @@ -384,7 +384,7 @@ public: /// For v4 it can be either "V4" or "3", for V6 it can be "IA_NA" /// "0", "IA_PD", or "2". /// - /// @param params Element map containging the command arguments. + /// @param params Element map containing the command arguments. /// @param family protocol family (AF_INET or AF_INET6). /// /// @throw BadValue if the parameter is not valid for the protocol @@ -395,7 +395,7 @@ public: /// @brief Wrapper class around SFLQ pool commands. /// -/// This provides the interfacew through which callouts +/// This provides the interface through which callouts /// execute the commands. class SflqCmds { public: diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc index f50e6a950b..f61c7fee1f 100644 --- a/src/lib/dhcp/tests/iface_mgr_unittest.cc +++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc @@ -1870,7 +1870,7 @@ TEST_F(IfaceMgrTest, getIfaceByIndex) { ASSERT_TRUE(iface); EXPECT_EQ("lo", iface->getName()); - // Attemt to get an undefined interface. + // Attempt to get an undefined interface. iface = ifacemgr.getIface(3); EXPECT_FALSE(iface); diff --git a/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h b/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h index c41cebeb99..64182ed176 100644 --- a/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h +++ b/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h @@ -59,7 +59,7 @@ struct SflqPool { /// @brief Creates an SflqPoolInfo instance from this pool. /// - /// SflqPoolInfo is the pool representaion returned by SFLQ API + /// SflqPoolInfo is the pool representation returned by SFLQ API /// "get" functions. The SflqPoolInfo timestamp members are set /// to the current time. /// diff --git a/src/share/api/sflq-pool4-create.json b/src/share/api/sflq-pool4-create.json index e16bfa340b..22ccdd4352 100644 --- a/src/share/api/sflq-pool4-create.json +++ b/src/share/api/sflq-pool4-create.json @@ -1,6 +1,6 @@ { "access": "write", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command instructs the lease back end to create a v4 SFLQ pool and its free lease data." ], @@ -8,11 +8,10 @@ "{", " \"command\": \"sflq-pool4-create\",", " \"arguments\": {", - " \"start-address\": \"1.2.3.4\",", - " \"end-address\": \"1.2.3.4\",", - " \"subnet-id\": 123", + " \"start-address\": \"1.2.3.4\",", + " \"end-address\": \"1.2.3.4\",", + " \"subnet-id\": 123,", " \"recreate\" : false", - " } ]", " }", "}" ], diff --git a/src/share/api/sflq-pool4-del.json b/src/share/api/sflq-pool4-del.json index 9e01fd3562..41f1817508 100644 --- a/src/share/api/sflq-pool4-del.json +++ b/src/share/api/sflq-pool4-del.json @@ -1,15 +1,15 @@ { "access": "write", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command deletes a pool that exactly matches an address range from the lease back end." ], "cmd-syntax": [ "{", - " \"command\": \"sflq-pool4-del\"", + " \"command\": \"sflq-pool4-del\",", " \"arguments\": {", - " \"end-address\": \"192.0.2.255\",", " \"start-address\": \"192.0.2.0\",", + " \"end-address\": \"192.0.2.255\",", " \"force\": true", " }", "}" diff --git a/src/share/api/sflq-pool4-get-all.json b/src/share/api/sflq-pool4-get-all.json index 98d97d0b82..d67c415945 100644 --- a/src/share/api/sflq-pool4-get-all.json +++ b/src/share/api/sflq-pool4-get-all.json @@ -1,6 +1,6 @@ { "access": "read", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command fetches a list of all v4 SFLQ pools from the lease back end." ], @@ -26,7 +26,8 @@ " \"start-address\": \"192.0.2.0\",", " \"subnet-id\": 6", " }", - "]]", + " ]", + "},", "\"result\": 0,", "\"text\": \"1 pool(s) found.\"", "}" diff --git a/src/share/api/sflq-pool4-get-by-range.json b/src/share/api/sflq-pool4-get-by-range.json index 03cb64e54a..e975cbbd91 100644 --- a/src/share/api/sflq-pool4-get-by-range.json +++ b/src/share/api/sflq-pool4-get-by-range.json @@ -1,15 +1,15 @@ { "access": "read", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command fetches a list of all v4 SFLQ pools that overlap an address range from the lease back end." ], "cmd-syntax": [ "{", - " \"command\": \"sflq-pool4-get-get-by-range\"", + " \"command\": \"sflq-pool4-get-by-range\",", " \"arguments\": {", - " \"end-address\": \"192.0.2.255\",", - " \"start-address\": \"192.0.2.0\"", + " \"start-address\": \"192.0.2.0\",", + " \"end-address\": \"192.0.2.255\"", " }", "}" ], @@ -30,7 +30,8 @@ " \"start-address\": \"192.0.2.0\",", " \"subnet-id\": 123", " }", - "]]", + " ]", + "},", "\"result\": 0,", "\"text\": \"1 pool(s) found.\"", "}" diff --git a/src/share/api/sflq-pool4-get-by-subnet.json b/src/share/api/sflq-pool4-get-by-subnet.json index 9c9054277f..22e16a1d74 100644 --- a/src/share/api/sflq-pool4-get-by-subnet.json +++ b/src/share/api/sflq-pool4-get-by-subnet.json @@ -1,12 +1,12 @@ { "access": "read", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command fetches a list of all v4 SFLQ pools that belong to a subnet from the lease back end." ], "cmd-syntax": [ "{", - " \"command\": \"sflq-pool4-get-get-by-subnet\"", + " \"command\": \"sflq-pool4-get-by-subnet\",", " \"arguments\": {", " \"subnet-id\": 123", " }", @@ -29,7 +29,8 @@ " \"start-address\": \"192.0.2.0\",", " \"subnet-id\": 123", " }", - "]]", + " ]", + "},", "\"result\": 0,", "\"text\": \"1 pool(s) found.\"", "}" diff --git a/src/share/api/sflq-pool6-create.json b/src/share/api/sflq-pool6-create.json index 3371415253..d6e9809400 100644 --- a/src/share/api/sflq-pool6-create.json +++ b/src/share/api/sflq-pool6-create.json @@ -1,6 +1,6 @@ { "access": "write", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command instructs the lease back end to create a v6 SFLQ pool and its free lease data." ], @@ -8,12 +8,11 @@ "{", " \"command\": \"sflq-pool6-create\",", " \"arguments\": {", - " \"start-address\": \"2001:db8:1::\",", - " \"end-address\": \"2001:db8:1::FFFF\",", + " \"start-address\": \"2001:db8:1::\",", + " \"end-address\": \"2001:db8:1::ffff\",", " \"lease-type\": \"IA_PD\"," , " \"delegated-len\": 120,", " \"recreate\" : false", - " } ]", " }", "}" ], diff --git a/src/share/api/sflq-pool6-del.json b/src/share/api/sflq-pool6-del.json index c329aee496..87f95444b9 100644 --- a/src/share/api/sflq-pool6-del.json +++ b/src/share/api/sflq-pool6-del.json @@ -1,15 +1,15 @@ { "access": "write", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command deletes a pool that exactly matches an address range from the lease back end." ], "cmd-syntax": [ "{", - " \"command\": \"sflq-pool6-get-get-by-range\"", + " \"command\": \"sflq-pool6-del\",", " \"arguments\": {", + " \"start-address\": \"3001::ffff\",", " \"end-address\": \"3001::10\",", - " \"start-address\": \"3001::FFFF\",", " \"force\": true", " }", "}" diff --git a/src/share/api/sflq-pool6-get-all.json b/src/share/api/sflq-pool6-get-all.json index 5a4d7c5dc9..17a48bb0c3 100644 --- a/src/share/api/sflq-pool6-get-all.json +++ b/src/share/api/sflq-pool6-get-all.json @@ -1,6 +1,6 @@ { "access": "read", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command fetches a list of all v6 SFLQ pools from the lease back end." ], diff --git a/src/share/api/sflq-pool6-get-by-range.json b/src/share/api/sflq-pool6-get-by-range.json index f950fde046..7affb7bfa4 100644 --- a/src/share/api/sflq-pool6-get-by-range.json +++ b/src/share/api/sflq-pool6-get-by-range.json @@ -1,15 +1,15 @@ { "access": "read", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command fetches a list of all v6 SFLQ pools that overlap an address range from the lease back end." ], "cmd-syntax": [ "{", - " \"command\": \"sflq-pool6-get-get-by-range\"", + " \"command\": \"sflq-pool6-get-by-range\",", " \"arguments\": {", - " \"end-address\": \"3001::FFFF\",", - " \"start-address\": \"3001::10\"", + " \"start-address\": \"3001::10\",", + " \"end-address\": \"3001::ffff\"", " }", "}" ], diff --git a/src/share/api/sflq-pool6-get-by-subnet.json b/src/share/api/sflq-pool6-get-by-subnet.json index af57ad0a3b..54b7a17af9 100644 --- a/src/share/api/sflq-pool6-get-by-subnet.json +++ b/src/share/api/sflq-pool6-get-by-subnet.json @@ -1,12 +1,12 @@ { "access": "read", - "avail": "3.2.0", + "avail": "3.1.9", "brief": [ "This command fetches a list of all v6 SFLQ pools that belong to a subnet from the lease back end." ], "cmd-syntax": [ "{", - " \"command\": \"sflq-pool6-get-get-by-subnet\"", + " \"command\": \"sflq-pool6-get-by-subnet\",", " \"arguments\": {", " \"subnet-id\": 100", " }",