X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fntsim-ng%2Fmain.c;h=c418204aadd5d99ea0c82518d96542f530af5b7d;hb=caec2fcb18e829420672509fe5e356b48d0c3840;hp=316fe0a4c879d8686e07ce8f10f8ba19e1a1315a;hpb=3bbf9d8a3c81afebcffb2b926cef219336dd53d6;p=sim%2Fo1-interface.git diff --git a/ntsimulator/ntsim-ng/main.c b/ntsimulator/ntsim-ng/main.c index 316fe0a..c418204 100644 --- a/ntsimulator/ntsim-ng/main.c +++ b/ntsimulator/ntsim-ng/main.c @@ -35,8 +35,8 @@ #include "core/app/supervisor.h" #include "core/app/manager.h" #include "core/app/network_function.h" +#include "core/app/blank.h" #include "core/datastore/schema.h" -#include "core/datastore/generate.h" #include "core/datastore/populate.h" int main(int argc, char **argv) { @@ -52,7 +52,6 @@ int main(int argc, char **argv) { switch(framework_arguments.nts_mode) { case NTS_MODE_MANAGER: case NTS_MODE_NETWORK_FUNCTION: - case NTS_MODE_GENERATE_DATA: case NTS_MODE_TEST: case NTS_MODE_DEFAULT: sr_log_stderr(SR_LL_INF); //checkAL WRN @@ -80,6 +79,7 @@ int main(int argc, char **argv) { switch(framework_arguments.nts_mode) { case NTS_MODE_MANAGER: case NTS_MODE_NETWORK_FUNCTION: + case NTS_MODE_TEST: //checkAL remove this //configure local netconf server if(netconf_configure() != NTS_ERR_OK) { log_error("netconf_configure() failed\n") @@ -104,7 +104,7 @@ int main(int argc, char **argv) { case NTS_MODE_SUPERVISOR: //run in supervisor mode - if(supervisor_run() != NTS_ERR_OK) { + if(supervisor_run(argc, argv) != NTS_ERR_OK) { log_error("supervisor_run() failed\n"); return_code = EXIT_FAILURE; } @@ -130,13 +130,13 @@ int main(int argc, char **argv) { goto main_clean; break; - case NTS_MODE_GENERATE_DATA: - if(datastore_generate_data(DATASTORE_RUNNING_PATH, DATASTORE_OPERATIONAL_PATH) != NTS_ERR_OK) { - log_error("datastore_generate_data() failed\n"); + case NTS_MODE_BLANK: + if(blank_run() != NTS_ERR_OK) { + log_error("blank_run() failed\n"); return_code = EXIT_FAILURE; } - goto main_clean; + goto main_clean_framework; break; case NTS_MODE_TEST: @@ -175,7 +175,7 @@ int main(int argc, char **argv) { } main_clean: - log_add_verbose(1, LOG_COLOR_BOLD_RED"\nstopping now...\n"LOG_COLOR_RESET); + log_add_verbose(1, LOG_COLOR_BOLD_RED"stopping now...\n"LOG_COLOR_RESET); nc_client_destroy(); main_clean_context: context_free();