X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fntsim-ng%2Fcore%2Ftest.c;h=f2d4cc33ca2aa8399c635b3589438de3d66f0891;hb=caec2fcb18e829420672509fe5e356b48d0c3840;hp=89029841f337837bee108926fdb3d09def182f22;hpb=f1d5c9198acde7a7ce296490087cad37e008f688;p=sim%2Fo1-interface.git

diff --git a/ntsimulator/ntsim-ng/core/test.c b/ntsimulator/ntsim-ng/core/test.c
index 8902984..f2d4cc3 100644
--- a/ntsimulator/ntsim-ng/core/test.c
+++ b/ntsimulator/ntsim-ng/core/test.c
@@ -18,6 +18,7 @@
 #define _GNU_SOURCE
 
 #include "test.h"
+#include "utils/debug_utils.h"
 #include "utils/log_utils.h"
 #include "utils/rand_utils.h"
 #include "utils/type_utils.h"
@@ -26,40 +27,42 @@
 #include <assert.h>
 
 #include <libyang/libyang.h>
+#include <sysrepo.h>
+#include <sysrepo/values.h>
 #include "core/session.h"
 #include "core/framework.h"
 #include "core/docker.h"
 
 #include "core/datastore/schema.h"
 #include "core/datastore/populate.h"
-
+#include "core/datastore/operations.h"
 
 int exhaustive_test_run(void) {
     //first get all xpaths
     char **xpaths = 0;
-    int xpaths_count = schema_get_xpaths(&xpaths);
+    int xpaths_count = datastore_schema_get_xpaths(&xpaths);
     if(xpaths_count < 0) {
-        log_error("schema_get_xpaths failed");
+        log_error("datastore_schema_get_xpaths failed\n");
         return NTS_ERR_FAILED;
     }
     else {
-        log_message(0, "schema_get_xpaths executed with "LOG_COLOR_BOLD_GREEN"success"LOG_COLOR_RESET" (%d)\n", xpaths_count);
+        log_add_verbose(0, "datastore_schema_get_xpaths executed with "LOG_COLOR_BOLD_GREEN"success"LOG_COLOR_RESET" (%d)\n", xpaths_count);
     }
 
     //switching verbosity level to 0 so we don't see logs
     int old_verbosity_level = framework_arguments.verbosity_level;
     framework_arguments.verbosity_level = 0;
 
-    //testing schema_print_xpath()
+    //testing datastore_schema_print_xpath()
     for(int i = 0 ; i < xpaths_count; i++) {
-        int rc = schema_print_xpath(xpaths[i]);
+        int rc = datastore_schema_print_xpath(xpaths[i]);
         if(rc != NTS_ERR_OK) {
-            log_error("error in schema_print_xpath");
+            log_error("error in datastore_schema_print_xpath\n");
             return rc;
         }
     }
 
-    log_message(0, "schema_print_xpath executed with "LOG_COLOR_BOLD_GREEN"success"LOG_COLOR_RESET" for all paths\n");
+    log_add_verbose(0, "datastore_schema_print_xpath executed with "LOG_COLOR_BOLD_GREEN"success"LOG_COLOR_RESET" for all paths\n");
 
     //freeing paths
     for(int i = 0; i < xpaths_count; i++) {
@@ -68,15 +71,14 @@ int exhaustive_test_run(void) {
     free(xpaths);
 
     //testing schema_populate
-    int rc = schema_populate();
+    int rc = datastore_populate_all();
     if(rc != NTS_ERR_OK) {
-        log_error("error in schema_populate");
+        log_error("error in datastore_populate_all\n");
         return rc;
     }
-    
-    log_message(0, "schema_populate executed with "LOG_COLOR_BOLD_GREEN"success"LOG_COLOR_RESET"\n");
 
-    log_message(0, LOG_COLOR_BOLD_GREEN"ALL TESTS WENT GOOD!"LOG_COLOR_RESET"\n\n\n");
+    log_add_verbose(0, "datastore_populate_all executed with "LOG_COLOR_BOLD_GREEN"success"LOG_COLOR_RESET"\n");
+    log_add_verbose(0, LOG_COLOR_BOLD_GREEN"ALL TESTS WENT GOOD!"LOG_COLOR_RESET"\n\n\n");
 
     //switching back verbosity level
     framework_arguments.verbosity_level = old_verbosity_level;