e2sm: use asn1 namespaces

srsgnb/hdr/stack/ric/e2sm.h

@@ -18,7 +18,7 @@
 #ifndef SRSRAN_E2SM_H
 #define SRSRAN_E2SM_H
 
-enum e2sm_type_t { E2SM_KPM, UNKNOWN };
+using namespace asn1::e2ap;
 
 struct RANfunction_description;
 
@@ -29,9 +29,9 @@ struct RIC_event_trigger_definition {
 };
 
 struct E2AP_RIC_action {
-  uint16_t                      ric_action_id;
+  uint16_t          ric_action_id;
-  asn1::e2ap::ri_caction_type_e ric_action_type;
+  ri_caction_type_e ric_action_type;
-  uint32_t                      sm_local_ric_action_id;
+  uint32_t          sm_local_ric_action_id;
 };
 
 typedef struct {
@@ -39,7 +39,7 @@ typedef struct {
   uint32_t                     ric_instance_id;
   uint32_t                     ra_nfunction_id;
   uint32_t                     ri_caction_id;
-  asn1::e2ap::ri_cind_type_e   indication_type;
+  ri_cind_type_e               indication_type;
   srsran::unique_byte_buffer_t ri_cind_hdr;
   srsran::unique_byte_buffer_t ri_cind_msg;
 } ric_indication_t;
@@ -58,10 +58,10 @@ public:
   uint32_t    get_revision() { return _revision; };
 
   virtual bool generate_ran_function_description(RANfunction_description& desc, srsran::unique_byte_buffer_t& buf) = 0;
-  virtual bool process_ric_event_trigger_definition(asn1::e2ap::ricsubscription_request_s subscription_request,
+  virtual bool process_ric_event_trigger_definition(ricsubscription_request_s     subscription_request,
-                                                    RIC_event_trigger_definition&         event_def)                       = 0;
+                                                    RIC_event_trigger_definition& event_def)                       = 0;
-  virtual bool process_ric_action_definition(asn1::e2ap::ri_caction_to_be_setup_item_s ric_action,
+  virtual bool process_ric_action_definition(ri_caction_to_be_setup_item_s ric_action,
-                                             E2AP_RIC_action&                          action_entry)                                        = 0;
+                                             E2AP_RIC_action&              action_entry)                           = 0;
   virtual bool remove_ric_action_definition(E2AP_RIC_action& action_entry)                                         = 0;
   virtual bool execute_action_fill_ric_indication(E2AP_RIC_action& action_entry, ric_indication_t& ric_indication) = 0;
 
@@ -80,7 +80,6 @@ private:
 struct RANfunction_description {
   bool        accepted          = false;
   int         function_instance = 0;
-  e2sm_type_t sm_type;
   e2sm*       sm_ptr;
   std::string function_shortname;
   std::string function_e2_sm_oid;

srsgnb/src/stack/ric/e2ap.cc

@@ -10,7 +10,6 @@ e2ap::e2ap(srslog::basic_logger& logger, srsenb::e2_interface_metrics* _gnb_metr
   uint32_t                local_ran_function_id = 147;
   RANfunction_description add_func;
   add_func.function_instance           = 0;
-  add_func.sm_type                     = e2sm_type_t::E2SM_KPM;
   add_func.sm_ptr                      = &e2sm_;
   ran_functions[local_ran_function_id] = add_func;
 }