[#810, !471] fixed sphinx docs

diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json
index 069952392abb8b92e54c8efe7d659f554c6f2024..86852122c1971f185b46ad230887caeaf8b10630 100644 (file)
--- 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 0cea24e0c328fdae9825cd52eb7a2a469dc5f395..f8fce814f425ef3f0207f5c44c7f17bcbdbf094e 100644 (file)
--- 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 219ccd766f8813028ace9bddf500f3954b561b54..cacdd2780e3efc84f0ff0c8333d6dcd11c9f21f5 100644 (file)
--- 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 69a17d6b28e46b571bced9e1dd76273c98dd1a76..7a38fe185786ec93ef25698545db25c82fcba5ad 100644 (file)
--- 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 bc45c27a6c81f7366bf207c7c8ffbd4912815b00..bafbdb065423f96ac9659470ea302d3f02279a01 100644 (file)
--- 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 a1d7d238dc3401b979abfd4fa417ecf1459e8092..00727d2533e5a3d6342f135269c36d9aec6bae1c 100644 (file)
--- 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 fe704c9b846b45fb995fe13c9dcc9a645eb807ff..7daaf995cb074c0c3309310e37bfc39533e8cba0 100644 (file)
--- 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 b4b393d9d1a4facc7f6f9b5a15e42b939f9d0c77..516ca103b3c47c250387d945639963e7c77ad81b 100644 (file)
--- 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 e54309dc55d87297a033bb2954a339afeafe10bc..7c3b6c3c8055be2c4deaec98dcc4593fbd16333c 100644 (file)
--- 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 367fd07e079b31fd5a3a9aa56f4ec613172afe76..83c704cd65951dfddcc061a4984a2a3b51ab593a 100644 (file)
--- 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 9316865d9227fe2e65ce14bec4fc808aaf9703a3..4c4ab6f1a255dd0d6df10fc35d3b701c92eff11a 100644 (file)
--- 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 c1fd8bc9806549a10c3c383bf7f1d0ec65701a53..b37ac8176064d5d7d8f4829fc6234812de084942 100644 (file)
--- 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 1925d7eedc45b725ddc930919f748a0d6733b6db..69231977d7145945226e029aca3f4766cae35b63 100644 (file)
--- 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 fd28a86a468febb8848634e7e51b0249fd29773d..ba15afe5a8ad1c9c24f8a82709a08eae58ddbbfe 100755 (executable)
--- 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