X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2FE2SM%2Fe2sm.hpp;fp=src%2FE2SM%2Fe2sm.hpp;h=c0877b47876926540b695a3a494f1bd999a86ba0;hb=dc68642f5676cdd49f3ef92f983b319e21f16afa;hp=d10a98c00d7428abee59c311bdca6b317ca8d09c;hpb=0054ece5d9d4bcb28ecda2f0f36584f6a64fc869;p=ric-app%2Fadmin.git

diff --git a/src/E2SM/e2sm.hpp b/src/E2SM/e2sm.hpp
index d10a98c..c0877b4 100644
--- a/src/E2SM/e2sm.hpp
+++ b/src/E2SM/e2sm.hpp
@@ -26,19 +26,19 @@
 #include <sstream>
 #include <e2sm_helpers.hpp>
 #include <mdclog/mdclog.h>
-#include <E2SM-gNB-X2-indicationHeader.h>
-#include <E2SM-gNB-X2-indicationMessage.h>
-#include <E2SM-gNB-X2-controlHeader.h>
-#include <E2SM-gNB-X2-controlMessage.h>
-#include <E2SM-gNB-X2-eventTriggerDefinition.h>
+#include <E2N_E2SM-gNB-X2-indicationHeader.h>
+#include <E2N_E2SM-gNB-X2-indicationMessage.h>
+#include <E2N_E2SM-gNB-X2-controlHeader.h>
+#include <E2N_E2SM-gNB-X2-controlMessage.h>
+#include <E2N_E2SM-gNB-X2-eventTriggerDefinition.h>
 
-#include <GlobalGNB-ID.h>
-#include <TypeOfMessage.h>
-#include <InterfaceProtocolIE-Item.h>
+#include <E2N_GlobalGNB-ID.h>
+#include <E2N_TypeOfMessage.h>
+#include <E2N_InterfaceProtocolIE-Item.h>
 
-#include<InterfaceProtocolIE-ID.h>
-#include<InterfaceProtocolIE-Value.h>
-#include<InterfaceProtocolIE-Test.h>
+#include<E2N_InterfaceProtocolIE-ID.h>
+#include<E2N_InterfaceProtocolIE-Value.h>
+#include<E2N_InterfaceProtocolIE-Test.h>
 
 #define INITIAL_LIST_SIZE 4
 
@@ -52,21 +52,21 @@ public:
   e2sm_event_trigger(void);
   ~e2sm_event_trigger(void);
     
-  bool set_fields(E2SM_gNB_X2_eventTriggerDefinition_t *, e2sm_event_trigger_helper &);
-  bool get_fields(E2SM_gNB_X2_eventTriggerDefinition_t *, e2sm_event_trigger_helper &);
+  bool set_fields(E2N_E2SM_gNB_X2_eventTriggerDefinition_t *, e2sm_event_trigger_helper &);
+  bool get_fields(E2N_E2SM_gNB_X2_eventTriggerDefinition_t *, e2sm_event_trigger_helper &);
   bool encode_event_trigger(unsigned char *, size_t *, e2sm_event_trigger_helper &);
 
   std::string  get_error (void) const {return error_string ;};
   
 private:
 
-  E2SM_gNB_X2_eventTriggerDefinition_t * event_trigger; // used for encoding
-  GlobalGNB_ID_t gNodeB_ID;
-  struct InterfaceProtocolIE_Item * ie_list;
+  E2N_E2SM_gNB_X2_eventTriggerDefinition_t * event_trigger; // used for encoding
+  E2N_GlobalGNB_ID_t gNodeB_ID;
+  struct E2N_InterfaceProtocolIE_Item * ie_list;
   unsigned int ie_list_size;
     
   //std::vector<struct InterfaceProtocolIE_Item> ie_list;
-  E2SM_gNB_X2_eventTriggerDefinition::E2SM_gNB_X2_eventTriggerDefinition__interfaceProtocolIE_List *condition_list;
+  E2N_E2SM_gNB_X2_eventTriggerDefinition::E2N_E2SM_gNB_X2_eventTriggerDefinition__interfaceProtocolIE_List *condition_list;
     
   char errbuf[128];
   size_t errbuf_len;
@@ -82,14 +82,14 @@ public:
   e2sm_indication(void);
   ~e2sm_indication(void);
     
-  E2SM_gNB_X2_indicationHeader_t * get_header(void);
-  E2SM_gNB_X2_indicationMessage_t * get_message(void);
+  E2N_E2SM_gNB_X2_indicationHeader_t * get_header(void);
+  E2N_E2SM_gNB_X2_indicationMessage_t * get_message(void);
 
-  bool set_header_fields(E2SM_gNB_X2_indicationHeader_t *, e2sm_header_helper &);
-  bool get_header_fields(E2SM_gNB_X2_indicationHeader_t *, e2sm_header_helper &);
+  bool set_header_fields(E2N_E2SM_gNB_X2_indicationHeader_t *, e2sm_header_helper &);
+  bool get_header_fields(E2N_E2SM_gNB_X2_indicationHeader_t *, e2sm_header_helper &);
     
-  bool set_message_fields(E2SM_gNB_X2_indicationMessage_t *, e2sm_message_helper &);
-  bool get_message_fields(E2SM_gNB_X2_indicationMessage_t *, e2sm_message_helper &);
+  bool set_message_fields(E2N_E2SM_gNB_X2_indicationMessage_t *, e2sm_message_helper &);
+  bool get_message_fields(E2N_E2SM_gNB_X2_indicationMessage_t *, e2sm_message_helper &);
 
   bool encode_indication_header(unsigned char * , size_t * , e2sm_header_helper &); 
   bool encode_indication_message(unsigned char *, size_t *, e2sm_message_helper &);
@@ -97,12 +97,12 @@ public:
     
 private:
   
-  E2SM_gNB_X2_indicationHeader_t *header; // used for encoding
-  E2SM_gNB_X2_indicationMessage_t *message; // used for encoding
+  E2N_E2SM_gNB_X2_indicationHeader_t *header; // used for encoding
+  E2N_E2SM_gNB_X2_indicationMessage_t *message; // used for encoding
     
   char errbuf[128];
   size_t errbuf_len;
-  GlobalGNB_ID_t gNodeB_ID;
+  E2N_GlobalGNB_ID_t gNodeB_ID;
   std::string error_string;
 
   
@@ -116,14 +116,14 @@ public:
   e2sm_control(void);
   ~e2sm_control(void);
     
-  E2SM_gNB_X2_controlHeader_t * get_header(void);
-  E2SM_gNB_X2_controlMessage_t * get_message(void);
+  E2N_E2SM_gNB_X2_controlHeader_t * get_header(void);
+  E2N_E2SM_gNB_X2_controlMessage_t * get_message(void);
 
-  bool set_header_fields(E2SM_gNB_X2_controlHeader_t *, e2sm_header_helper &);
-  bool get_header_fields(E2SM_gNB_X2_controlHeader_t *, e2sm_header_helper &);
+  bool set_header_fields(E2N_E2SM_gNB_X2_controlHeader_t *, e2sm_header_helper &);
+  bool get_header_fields(E2N_E2SM_gNB_X2_controlHeader_t *, e2sm_header_helper &);
     
-  bool set_message_fields(E2SM_gNB_X2_controlMessage_t *, e2sm_message_helper &);
-  bool get_message_fields(E2SM_gNB_X2_controlMessage_t *, e2sm_message_helper &);
+  bool set_message_fields(E2N_E2SM_gNB_X2_controlMessage_t *, e2sm_message_helper &);
+  bool get_message_fields(E2N_E2SM_gNB_X2_controlMessage_t *, e2sm_message_helper &);
 
   bool encode_control_header(unsigned char * , size_t * , e2sm_header_helper &); 
   bool encode_control_message(unsigned char *, size_t *, e2sm_message_helper &);
@@ -131,12 +131,12 @@ public:
     
 private:
   
-  E2SM_gNB_X2_controlHeader_t *header; // used for encoding
-  E2SM_gNB_X2_controlMessage_t *message; // used for encoding
+  E2N_E2SM_gNB_X2_controlHeader_t *header; // used for encoding
+  E2N_E2SM_gNB_X2_controlMessage_t *message; // used for encoding
     
   char errbuf[128];
   size_t errbuf_len;
-  GlobalGNB_ID_t gNodeB_ID;
+  E2N_GlobalGNB_ID_t gNodeB_ID;
   std::string error_string;