X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fntsim-ng%2Futils%2Fnts_utils.c;h=92fac837a3a52052b3dccc28755127175c988b91;hb=f379349d310d61b27d2c0bf7334d2268cc8f42e2;hp=f1a71acc118cadcb03c18d6b192660656878e3f2;hpb=92903642ea9a10306817529ca546ea2432c741a1;p=sim%2Fo1-interface.git

diff --git a/ntsimulator/ntsim-ng/utils/nts_utils.c b/ntsimulator/ntsim-ng/utils/nts_utils.c
index f1a71ac..92fac83 100644
--- a/ntsimulator/ntsim-ng/utils/nts_utils.c
+++ b/ntsimulator/ntsim-ng/utils/nts_utils.c
@@ -22,21 +22,11 @@
 #include "utils/sys_utils.h"
 #include "core/framework.h"
 #include "core/session.h"
+#include "core/xpath.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
-#define NTS_MANAGER_SDN_CONTROLLER_CONFIG_XPATH             "/nts-manager:simulation/sdn-controller"
-#define NTS_NF_SDN_CONTROLLER_CONFIG_XPATH                  "/nts-network-function:simulation/sdn-controller"
-#define NTS_MANAGER_VES_ENDPOINT_CONFIG_XPATH               "/nts-manager:simulation/ves-endpoint"
-#define NTS_NF_VES_ENDPOINT_CONFIG_XPATH                    "/nts-network-function:simulation/ves-endpoint"
-
-#define NTS_NETWORK_FUNCTION_FTYPE_SCHEMA_XPATH             "/nts-network-function:simulation/network-function/function-type"
-#define NTS_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH              "/nts-network-function:simulation/network-function/mount-point-addressing-method"
-#define NTS_NETWORK_FUNCTION_FAULT_GENERATION_SCHEMA_XPATH  "/nts-network-function:simulation/network-function/fault-generation"
-#define NTS_NETWORK_FUNCTION_NETCONF_SCHEMA_XPATH           "/nts-network-function:simulation/network-function/netconf"
-#define NTS_NETWORK_FUNCTION_VES_SCHEMA_XPATH               "/nts-network-function:simulation/network-function/ves"
-
 
 cJSON* ves_create_common_event_header(const char *domain, const char *event_type, const char *hostname, int port, const char *priority, int seq_id) {
     assert(domain);
@@ -188,7 +178,7 @@ nts_mount_point_addressing_method_t nts_mount_point_addressing_method_get(sr_ses
     }
 
     sr_val_t *value = 0;
-    rc = sr_get_item(session_running, NTS_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH, 0, &value);
+    rc = sr_get_item(current_session, NTS_NF_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH, 0, &value);
     if(rc == SR_ERR_OK) {
         if(strcmp(value->data.enum_val, "host-mapping") == 0) {
             ret = HOST_MAPPING;
@@ -229,10 +219,10 @@ ves_details_t *ves_endpoint_details_get(sr_session_ctx_t *current_session) {
     char *xpath_to_get;
 
     if(framework_arguments.nts_mode == NTS_MODE_MANAGER) {
-        xpath_to_get = "/nts-manager:simulation/ves-endpoint";
+        xpath_to_get = NTS_MANAGER_VES_ENDPOINT_CONFIG_XPATH;
     }
     else {
-        xpath_to_get = "/nts-network-function:simulation/ves-endpoint";
+        xpath_to_get = NTS_NF_VES_ENDPOINT_CONFIG_XPATH;
     }
 
     rc = sr_get_subtree(current_session, xpath_to_get, 0, &data);
@@ -303,7 +293,15 @@ ves_details_t *ves_endpoint_details_get(sr_session_ctx_t *current_session) {
         asprintf(&ret->url, "%s://[%s]:%d/eventListener/v7", ret->protocol, ret->ip, ret->port);
     }
     else {
-        asprintf(&ret->url, "%s://%s:%d/eventListener/v7", ret->protocol, ret->ip, ret->port);
+        if (framework_environment.ves_endpoint.port_absent == true) {
+            // hostname addressing with port missing
+            asprintf(&ret->url, "%s://%s/eventListener/v7", ret->protocol, ret->ip);
+        }
+        else {
+            // normal addressing with IP and Port
+            asprintf(&ret->url, "%s://%s:%d/eventListener/v7", ret->protocol, ret->ip, ret->port);
+        }
+        
     }
     
     if((ret->protocol == 0) || (ret->ip == 0) || (ret->auth_method == 0) || (ret->username == 0) || (ret->password == 0) || (ret->url == 0)) {
@@ -352,10 +350,10 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session)
     char *xpath_to_get;
 
     if(framework_arguments.nts_mode == NTS_MODE_MANAGER) {
-        xpath_to_get = "/nts-manager:simulation/sdn-controller";
+        xpath_to_get = NTS_MANAGER_SDN_CONTROLLER_CONFIG_XPATH;
     }
     else {
-        xpath_to_get = "/nts-network-function:simulation/sdn-controller";
+        xpath_to_get = NTS_NF_SDN_CONTROLLER_CONFIG_XPATH;
     }
 
     rc = sr_get_subtree(current_session, xpath_to_get, 0, &data);
@@ -392,6 +390,7 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session)
     ret->protocol = 0;
     ret->ip = 0;
     ret->port = 0;
+    ret->nc_callhome_ip = 0;
     ret->nc_callhome_port = 0;
     ret->auth_method = 0;
     ret->username = 0;
@@ -412,6 +411,9 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session)
         else if(strcmp(chd->schema->name, "controller-port") == 0) {
             ret->port = ((const struct lyd_node_leaf_list *)chd)->value.uint16;
         }
+        else if(strcmp(chd->schema->name, "controller-netconf-call-home-ip") == 0) {
+            ret->nc_callhome_ip = strdup(val);
+        }
         else if(strcmp(chd->schema->name, "controller-netconf-call-home-port") == 0) {
             ret->nc_callhome_port = ((const struct lyd_node_leaf_list *)chd)->value.uint16;
         }
@@ -429,12 +431,20 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session)
         asprintf(&ret->base_url, "%s://[%s]:%d", ret->protocol, ret->ip, ret->port);
     }
     else {
-        asprintf(&ret->base_url, "%s://%s:%d", ret->protocol, ret->ip, ret->port);
+        if (framework_environment.sdn_controller.port_absent == true) {
+            // hostname without port addressing
+            asprintf(&ret->base_url, "%s://%s", ret->protocol, ret->ip);
+        }
+        else {
+            // normal IP and Port addressing
+            asprintf(&ret->base_url, "%s://%s:%d", ret->protocol, ret->ip, ret->port);
+        }
     }
 
-    if((ret->protocol == 0) || (ret->ip == 0) || (ret->auth_method == 0) || (ret->username == 0) || (ret->password == 0) || (ret->base_url == 0)) {
+    if((ret->protocol == 0) || (ret->ip == 0) || (ret->nc_callhome_ip == 0) || (ret->auth_method == 0) || (ret->username == 0) || (ret->password == 0) || (ret->base_url == 0)) {
         free(ret->protocol);
         free(ret->ip);
+        free(ret->nc_callhome_ip);
         free(ret->auth_method);
         free(ret->username);
         free(ret->password);
@@ -451,6 +461,7 @@ void controller_details_free(controller_details_t *instance) {
 
     free(instance->protocol);
     free(instance->ip);
+    free(instance->nc_callhome_ip);
     free(instance->base_url);
     free(instance->auth_method);
     free(instance->username);
@@ -586,6 +597,19 @@ int nts_utils_populate_info(sr_session_ctx_t *current_session, const char *funct
         return NTS_ERR_FAILED;
     }
 
+    if(strlen(framework_environment.sdn_controller.callhome_ip)) {
+        if(manager) {
+            rc = sr_set_item_str(current_session, NTS_MANAGER_SDN_CONTROLLER_CONFIG_XPATH"/controller-netconf-call-home-ip", (const char*)framework_environment.sdn_controller.callhome_ip, 0, 0);
+        }
+        else {
+            rc = sr_set_item_str(current_session, NTS_NF_SDN_CONTROLLER_CONFIG_XPATH"/controller-netconf-call-home-ip", (const char*)framework_environment.sdn_controller.callhome_ip, 0, 0);
+        }
+        if(rc != SR_ERR_OK) {
+            log_error("sr_set_item_str failed\n");
+            return NTS_ERR_FAILED;
+        }
+    }
+
     sprintf(int_to_str, "%d", framework_environment.sdn_controller.callhome_port);
     if(manager) {
         rc = sr_set_item_str(current_session, NTS_MANAGER_SDN_CONTROLLER_CONFIG_XPATH"/controller-netconf-call-home-port", (const char*)int_to_str, 0, 0);
@@ -717,19 +741,19 @@ int nts_utils_populate_info(sr_session_ctx_t *current_session, const char *funct
 
     if(manager == false) {
         //presence containers
-        rc = sr_set_item_str(current_session, NTS_NETWORK_FUNCTION_FAULT_GENERATION_SCHEMA_XPATH, 0, 0, 0);
+        rc = sr_set_item_str(current_session, NTS_NF_FAULT_GENERATION_SCHEMA_XPATH, 0, 0, 0);
         if(rc != SR_ERR_OK) {
             log_error("sr_set_item_str failed\n");
             return NTS_ERR_FAILED;
         }
 
-        rc = sr_set_item_str(current_session, NTS_NETWORK_FUNCTION_NETCONF_SCHEMA_XPATH, 0, 0, 0);
+        rc = sr_set_item_str(current_session, NTS_NF_NETCONF_SCHEMA_XPATH, 0, 0, 0);
         if(rc != SR_ERR_OK) {
             log_error("sr_set_item_str failed\n");
             return NTS_ERR_FAILED;
         }
 
-        rc = sr_set_item_str(current_session, NTS_NETWORK_FUNCTION_VES_SCHEMA_XPATH, 0, 0, 0);
+        rc = sr_set_item_str(current_session, NTS_NF_VES_SCHEMA_XPATH, 0, 0, 0);
         if(rc != SR_ERR_OK) {
             log_error("sr_set_item_str failed\n");
             return NTS_ERR_FAILED;
@@ -737,14 +761,14 @@ int nts_utils_populate_info(sr_session_ctx_t *current_session, const char *funct
     }
 
     //also set the network-function module for easy identifying the function type
-    rc = sr_set_item_str(current_session, NTS_NETWORK_FUNCTION_FTYPE_SCHEMA_XPATH, function_type, 0, 0);
+    rc = sr_set_item_str(current_session, NTS_NF_NETWORK_FUNCTION_FTYPE_SCHEMA_XPATH, function_type, 0, 0);
     if(rc != SR_ERR_OK) {
         log_error("sr_set_item_str failed\n");
         return NTS_ERR_FAILED;
     }
 
     //mount-point-addressing-method
-    rc = sr_set_item_str(current_session, NTS_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH, "docker-mapping", 0, 0);
+    rc = sr_set_item_str(current_session, NTS_NF_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH, framework_environment.nts.nf_mount_point_addressing_method, 0, 0);
     if(rc != SR_ERR_OK) {
         log_error("sr_set_item_str failed\n");
         return NTS_ERR_FAILED;