Add VES stndDefined PM and subscription for O-DU.

[sim/o1-interface.git] / ntsimulator / ntsim-ng / core / framework.c

diff --git a/ntsimulator/ntsim-ng/core/framework.c b/ntsimulator/ntsim-ng/core/framework.c
index 131243d..75b6217 100644 (file)
--- a/ntsimulator/ntsim-ng/core/framework.c
+++ b/ntsimulator/ntsim-ng/core/framework.c
@@ -46,7 +46,6 @@ static struct argp_option options[] = {
     { "manager", 'm', 0, 0, "Run the daemon as manager." },
     { "network-function", 'f', 0, 0, "Run the daemon as network function." },
     { "blank", 'b', 0, 0, "Run the deamon as a blank network function." },
-    { "generate", 'g', 0, 0, "Generate population data without commiting." },
     { "test-mode", 't', 0, 0, "Test mode." },
     
     // tools
@@ -212,11 +211,6 @@ int framework_init(int argc, char **argv) {
             stderr_file = "log/stderr-supervisor.txt";
             break;
 
-        case NTS_MODE_GENERATE_DATA:
-            log_file = "log/log-generate.txt";
-            stderr_file = "log/stderr-generate.txt";
-            break;
-
         default:
             log_file = "log/log.txt";
             stderr_file = "log/stderr.txt";
@@ -307,6 +301,7 @@ static int framework_env_init(void) {
     framework_environment.sdn_controller.protocol = getenv(ENV_VAR_SDN_CONTROLLER_IP) ? strdup(getenv(ENV_VAR_SDN_CONTROLLER_PROTOCOL)) : strdup("https");
     framework_environment.sdn_controller.ip = getenv(ENV_VAR_SDN_CONTROLLER_IP) ? strdup(getenv(ENV_VAR_SDN_CONTROLLER_IP)) : strdup("127.0.0.1");
     framework_environment.sdn_controller.port = get_int_from_string_with_default(getenv(ENV_VAR_SDN_CONTROLLER_PORT), 8181);
+    framework_environment.sdn_controller.callhome_ip = getenv(ENV_VAR_SDN_CONTROLLER_CALLHOME_IP) ? strdup(getenv(ENV_VAR_SDN_CONTROLLER_CALLHOME_IP)) : strdup("127.0.0.1");
     framework_environment.sdn_controller.callhome_port = get_int_from_string_with_default(getenv(ENV_VAR_SDN_CONTROLLER_CALLHOME_PORT), 6666);
     framework_environment.sdn_controller.username = getenv(ENV_VAR_SDN_CONTROLLER_USERNAME) ? strdup(getenv(ENV_VAR_SDN_CONTROLLER_USERNAME)) : strdup("admin");
     framework_environment.sdn_controller.password = getenv(ENV_VAR_SDN_CONTROLLER_PASSWORD) ? strdup(getenv(ENV_VAR_SDN_CONTROLLER_PASSWORD)) : strdup("admin");
@@ -411,6 +406,7 @@ static int framework_env_init(void) {
     log_add_verbose(2, "[framework-env] sdn_controller.protocol = %s\n", framework_environment.sdn_controller.protocol);
     log_add_verbose(2, "[framework-env] sdn_controller.ip = %s\n", framework_environment.sdn_controller.ip);
     log_add_verbose(2, "[framework-env] sdn_controller.port = %d\n", framework_environment.sdn_controller.port);
+    log_add_verbose(2, "[framework-env] sdn_controller.callhome_ip = %s\n", framework_environment.sdn_controller.callhome_ip);
     log_add_verbose(2, "[framework-env] sdn_controller.callhome_port = %d\n", framework_environment.sdn_controller.callhome_port);
     log_add_verbose(2, "[framework-env] sdn_controller.username = %s\n", framework_environment.sdn_controller.username);
     log_add_verbose(2, "[framework-env] sdn_controller.password = %s\n", framework_environment.sdn_controller.password);
@@ -815,6 +811,7 @@ void framework_free(void) {
     free(framework_environment.host.ip);
     free(framework_environment.sdn_controller.protocol);
     free(framework_environment.sdn_controller.ip);
+    free(framework_environment.sdn_controller.callhome_ip);
     free(framework_environment.sdn_controller.username);
     free(framework_environment.sdn_controller.password);
     free(framework_environment.ves_endpoint.common_header_version);
@@ -914,10 +911,6 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
             iter_arguments->nts_mode = NTS_MODE_BLANK;
             break;
 
-        case 'g':
-            iter_arguments->nts_mode = NTS_MODE_GENERATE_DATA;
-            break;
-
         case 't':
             iter_arguments->nts_mode = NTS_MODE_TEST;
             break;