config UPDATE add config replace test

Added test for replacing configuration data. Renamed configuration setup
API calls. Added loading JSON from files.

examples/server.c

@@ -256,7 +256,7 @@ init(struct ly_ctx **context, struct nc_pollsession **ps, const char *path, NC_T
     }
 
     /* apply the created configuration data */
-    rc = nc_server_config_setup(config);
+    rc = nc_server_config_setup_diff(config);
     if (rc) {
         ERR_MSG_CLEANUP("Application of configuration data failed.\n");
     }

src/server_config.c

@@ -2203,12 +2203,12 @@ nc_server_config_setup_path(const struct ly_ctx *ctx, const char *path)
 
     NC_CHECK_ARG_RET(NULL, path, 1);
 
-    ret = lyd_parse_data_path(ctx, path, LYD_XML, LYD_PARSE_NO_STATE | LYD_PARSE_STRICT, LYD_VALIDATE_NO_STATE, &tree);
+    ret = lyd_parse_data_path(ctx, path, LYD_UNKNOWN, LYD_PARSE_NO_STATE | LYD_PARSE_STRICT, LYD_VALIDATE_NO_STATE, &tree);
     if (ret) {
         goto cleanup;
     }
 
-    ret = nc_server_config_setup(tree);
+    ret = nc_server_config_setup_data(tree);
     if (ret) {
         goto cleanup;
     }
@@ -2240,7 +2240,7 @@ nc_server_config_fill_nectonf_server(const struct lyd_node *data, NC_OPERATION o
 }
 
 API int
-nc_server_config_setup(const struct lyd_node *data)
+nc_server_config_setup_diff(const struct lyd_node *data)
 {
     int ret = 0;
 
@@ -2275,7 +2275,7 @@ nc_server_config_setup(const struct lyd_node *data)
 }
 
 API int
-nc_server_config_setup2(const struct lyd_node *data)
+nc_server_config_setup_data(const struct lyd_node *data)
 {
     int ret = 0;
     struct lyd_node *tree, *iter, *root;

src/server_config.h

@@ -30,33 +30,33 @@ extern "C" {
 /**
  * @brief Configure server based on the given diff data.
  *
- * Expected data is a validated instance of a ietf-netconf-server YANG data.
+ * Expected data are a validated instance of a ietf-netconf-server YANG data.
  * The data must be in the diff format and supported operations are: create, replace,
  * delete and none. Context must already have implemented the required modules, see
  * ::nc_config_load_modules().
  *
- * @param[in] data ietf-netconf-server YANG data.
+ * @param[in] diff ietf-netconf-server YANG diff data.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_setup(const struct lyd_node *data);
+int nc_server_config_setup_diff(const struct lyd_node *diff);
 
 /**
  * @brief Configure server based on the given data.
  *
  * Expected data is a validated instance of a ietf-netconf-server YANG data.
  * Behaves as if all the nodes in data had the replace operation. That means that the current configuration will be deleted
  * and just the given data will all be applied.
- * The data must not contain any operation attribute, see ::nc_config_setup() which works with diff.
+ * The data must not contain any operation attribute, see ::nc_config_setup_diff() which works with diff.
  * Context must already have implemented the required modules, see * ::nc_config_load_modules().
  *
  * @param[in] data ietf-netconf-server YANG data.
  * @return 0 on success, 1 on error.
  */
-int nc_server_config_setup2(const struct lyd_node *data);
+int nc_server_config_setup_data(const struct lyd_node *data);
 
 /**
  * @brief Configure server based on the given ietf-netconf-server YANG data.
- * Wrapper around ::nc_config_setup_server() hiding work with parsing the data.
+ * Wrapper around ::nc_config_setup_server_data() hiding work with parsing the data.
  *
  * @param[in] ctx libyang context.
  * @param[in] path Path to the file with YANG data in XML format.

tests/CMakeLists.txt

@@ -9,7 +9,7 @@ endif()
 
 # list of all the tests in each directory
 #set(tests test_io test_fd_comm test_init_destroy_client test_init_destroy_server test_client_thread test_thread_messages)
-set(tests test_two_channels test_keystore test_unix_socket test_config_new test_truststore test_ec test_ed25519)
+set(tests test_two_channels test_keystore test_unix_socket test_config_new test_truststore test_ec test_ed25519 test_replace)
 
 # only enable PAM tests if the version of PAM is greater than 1.4
 if(LIBPAM_HAVE_CONFDIR)

tests/test_auth.c

@@ -401,7 +401,7 @@ setup_f(void **state)
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
-    ret = nc_server_config_setup(tree);
+    ret = nc_server_config_setup_diff(tree);
     assert_int_equal(ret, 0);
 
     /* initialize client */

tests/test_config_new.c

@@ -168,7 +168,7 @@ setup_f(void **state)
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
-    ret = nc_server_config_setup(tree);
+    ret = nc_server_config_setup_diff(tree);
     assert_int_equal(ret, 0);
 
     /* initialize client */

tests/test_ec.c

@@ -231,7 +231,7 @@ setup_f(void **state)
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
-    ret = nc_server_config_setup(tree);
+    ret = nc_server_config_setup_diff(tree);
     assert_int_equal(ret, 0);
 
     /* initialize client */

tests/test_ed25519.c

@@ -162,7 +162,7 @@ setup_f(void **state)
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
-    ret = nc_server_config_setup(tree);
+    ret = nc_server_config_setup_diff(tree);
     assert_int_equal(ret, 0);
 
     /* initialize client */

tests/test_keystore.c

@@ -218,7 +218,7 @@ setup_f(void **state)
     assert_int_equal(ret, 0);
 
     /* configure the server based on the data */
-    ret = nc_server_config_setup(tree);
+    ret = nc_server_config_setup_diff(tree);
     assert_int_equal(ret, 0);
 
     /* initialize client */