From: Razvan Becheriu Date: Fri, 9 Aug 2019 06:46:38 +0000 (+0300) Subject: [#810, !471] fixed sphinx docs X-Git-Tag: Kea-1.6.0~41^2~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fceb85995ea3a1ab1fccd5172b086aeb79fad522;p=thirdparty%2Fkea.git [#810, !471] fixed sphinx docs --- diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json index 069952392a..86852122c1 100644 --- a/doc/sphinx/api/class-del.json +++ b/doc/sphinx/api/class-del.json @@ -16,7 +16,7 @@ "name": "class-del", "resp-comment": [ "The command will return a result of 3 (empty) if the client", - "class doesn't exist. If the client class exists, the retured", + "class doesn't exist. If the client class exists, the returned", "result is 0 if the deletion was successful and the result is 1", "if the deletion is unsuccessful." ], diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json index 0cea24e0c3..f8fce814f4 100644 --- a/doc/sphinx/api/class-update.json +++ b/doc/sphinx/api/class-update.json @@ -30,7 +30,7 @@ "resp-comment": [ "The command will return the result of 3 (empty) if the client", "class doesn't exist. If the client class exists, the returned", - "result is 0 if the update was successful; the result is 1", + "result is 0 if the update was successful and the result is 1", "if the update is unsuccessful." ], "resp-syntax": [ diff --git a/doc/sphinx/api/remote-global-parameter4-get.json b/doc/sphinx/api/remote-global-parameter4-get.json index 219ccd766f..cacdd2780e 100644 --- a/doc/sphinx/api/remote-global-parameter4-get.json +++ b/doc/sphinx/api/remote-global-parameter4-get.json @@ -1,7 +1,7 @@ { "avail": "1.6.0", "brief": [ - "This command is used to fetch selected global parameter for the server from the specified database." + "This command is used to fetch the selected global parameter for the server from the specified database." ], "cmd-comment": [ "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global parameter value shared by all servers." diff --git a/doc/sphinx/api/remote-global-parameter6-get.json b/doc/sphinx/api/remote-global-parameter6-get.json index 69a17d6b28..7a38fe1857 100644 --- a/doc/sphinx/api/remote-global-parameter6-get.json +++ b/doc/sphinx/api/remote-global-parameter6-get.json @@ -1,7 +1,7 @@ { "avail": "1.6.0", "brief": [ - "This command is used to fetch selected global parameter for the server from the specified database." + "This command is used to fetch the selected global parameter for the server from the specified database." ], "cmd-comment": [ "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global parameter value shared by all servers." diff --git a/doc/sphinx/api/remote-network4-list.json b/doc/sphinx/api/remote-network4-list.json index bc45c27a6c..bafbdb0654 100644 --- a/doc/sphinx/api/remote-network4-list.json +++ b/doc/sphinx/api/remote-network4-list.json @@ -4,7 +4,7 @@ "This command is used to fetch a list of all IPv4 shared networks from the configuration database." ], "cmd-comment": [ - "The ``server-tags`` list is required for this command. This list must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value." + "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value." ], "cmd-syntax": [ "{", diff --git a/doc/sphinx/api/remote-network6-list.json b/doc/sphinx/api/remote-network6-list.json index a1d7d238dc..00727d2533 100644 --- a/doc/sphinx/api/remote-network6-list.json +++ b/doc/sphinx/api/remote-network6-list.json @@ -4,7 +4,7 @@ "This command is used to fetch a list of all IPv6 shared networks from the configuration database." ], "cmd-comment": [ - "The ``server-tags`` list is required for this command. This list must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value." + "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value." ], "cmd-syntax": [ "{", diff --git a/doc/sphinx/api/remote-option-def4-del.json b/doc/sphinx/api/remote-option-def4-del.json index fe704c9b84..7daaf995cb 100644 --- a/doc/sphinx/api/remote-option-def4-del.json +++ b/doc/sphinx/api/remote-option-def4-del.json @@ -4,7 +4,7 @@ "This command is used to delete a DHCPv4 option definition from the configuration database." ], "cmd-comment": [ - "This command includes a list with exactly one option definition specification comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error." + "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error." ], "cmd-syntax": [ "{", diff --git a/doc/sphinx/api/remote-option-def6-del.json b/doc/sphinx/api/remote-option-def6-del.json index b4b393d9d1..516ca103b3 100644 --- a/doc/sphinx/api/remote-option-def6-del.json +++ b/doc/sphinx/api/remote-option-def6-del.json @@ -4,7 +4,7 @@ "This command is used to delete a DHCPv6 option definition from the configuration database." ], "cmd-comment": [ - "This command includes a list with exactly one option definition specification comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error." + "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error." ], "cmd-syntax": [ "{", diff --git a/doc/sphinx/api/remote-subnet4-del-by-id.json b/doc/sphinx/api/remote-subnet4-del-by-id.json index e54309dc55..7c3b6c3c80 100644 --- a/doc/sphinx/api/remote-subnet4-del-by-id.json +++ b/doc/sphinx/api/remote-subnet4-del-by-id.json @@ -4,7 +4,7 @@ "This command is used to delete an IPv4 subnet by ID from the configuration database." ], "cmd-comment": [ - "This command includes a list with exactly one id of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command." + "This command includes a list with exactly one ID of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command." ], "cmd-syntax": [ "{", diff --git a/doc/sphinx/api/remote-subnet6-del-by-id.json b/doc/sphinx/api/remote-subnet6-del-by-id.json index 367fd07e07..83c704cd65 100644 --- a/doc/sphinx/api/remote-subnet6-del-by-id.json +++ b/doc/sphinx/api/remote-subnet6-del-by-id.json @@ -4,7 +4,7 @@ "This command is used to delete an IPv6 subnet by ID from the configuration database." ], "cmd-comment": [ - "This command includes a list with exactly one id of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command." + "This command includes a list with exactly one ID of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command." ], "cmd-syntax": [ "{", diff --git a/doc/sphinx/api/reservation-del.json b/doc/sphinx/api/reservation-del.json index 9316865d92..4c4ab6f1a2 100644 --- a/doc/sphinx/api/reservation-del.json +++ b/doc/sphinx/api/reservation-del.json @@ -4,7 +4,7 @@ "Deletes an existing host reservation." ], "cmd-comment": [ - "The host reservation can be identified by either (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)." + "The host reservation can be identified by either the (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)." ], "cmd-syntax": [ "{", diff --git a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc index c1fd8bc980..b37ac81760 100644 --- a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc @@ -277,7 +277,7 @@ TEST(MySqlConnection, checkTimeConversion) { } // This test verifies that database backend can operate in Read-Only mode. -TEST_F(MySqlHostDataSourceTest, testReadOnlyDatabase) { +TEST_F(MySqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) { testReadOnlyDatabase(MYSQL_VALID_TYPE); } diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc index 1925d7eedc..69231977d7 100644 --- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc @@ -263,7 +263,7 @@ TEST(PgSqlHostDataSource, NoCallbackOnOpenFail) { } // This test verifies that database backend can operate in Read-Only mode. -TEST_F(PgSqlHostDataSourceTest, testReadOnlyDatabase) { +TEST_F(PgSqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) { testReadOnlyDatabase(PGSQL_VALID_TYPE); } diff --git a/tools/sysrepo_config b/tools/sysrepo_config index fd28a86a46..ba15afe5a8 100755 --- a/tools/sysrepo_config +++ b/tools/sysrepo_config @@ -78,10 +78,8 @@ if [ "$1" = "--libs" ]; then fi if [ "$1" = "--modversion" ]; then - MAJOR="1" - MINOR="0" - PATCH="0" - echo "${MAJOR}.${MINOR}.${PATCH}" + VERSION=$(sysrepoctl -v | tr -s " " | cut -d " " -f 7) + echo "${VERSION}" exit 0 fi