X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fntsim-ng%2Futils%2Fnts_utils.c;h=07d0b313cb8a475faddb1a943e2d864eb596aecf;hb=5ef280448456cd6962faa4028da63ea9f14ff84b;hp=60fa0157d72294374d327e257bce008123b22cd0;hpb=3bbf9d8a3c81afebcffb2b926cef219336dd53d6;p=sim%2Fo1-interface.git

diff --git a/ntsimulator/ntsim-ng/utils/nts_utils.c b/ntsimulator/ntsim-ng/utils/nts_utils.c
index 60fa015..07d0b31 100644
--- a/ntsimulator/ntsim-ng/utils/nts_utils.c
+++ b/ntsimulator/ntsim-ng/utils/nts_utils.c
@@ -22,26 +22,16 @@
 #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 *source_name, const char *priority, int seq_id) {
+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);
     assert(event_type);
-    assert(source_name);
+    assert(hostname);
     assert(priority);
 
     char *eventId = 0;
@@ -100,6 +90,14 @@ cJSON* ves_create_common_event_header(const char *domain, const char *event_type
         return 0;
     }
 
+    char source_name[512];
+    if(port) {
+        sprintf(source_name, "%s-%d", hostname, port);
+    }
+    else {
+        sprintf(source_name, "%s", hostname);
+    }
+
     if(cJSON_AddStringToObject(common_event_header, "reportingEntityName", source_name) == 0) {
         log_error("cJSON AddStringToObject error\n");
         cJSON_Delete(common_event_header);
@@ -180,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;
@@ -221,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);
@@ -344,10 +342,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);
@@ -709,19 +707,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;
@@ -729,14 +727,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;