e2ap: splitting e2_subscriber into 2 interfaces

Author: yagoda

include/srsran/e2/subscription/e2_subscription.h

@@ -36,21 +36,34 @@ struct e2_subscription_t {
   eager_async_task<void> indication_task;
 };
 
-class e2_subscription_manager
+class e2_subscription_proc
 {
 public:
-  virtual ~e2_subscription_manager() = default;
-
+  virtual ~e2_subscription_proc() = default;
   /// \brief Handle the incoming subscription message.
   virtual e2_subscribe_reponse_message handle_subscription_setup(const asn1::e2ap::ricsubscription_request_s& msg) = 0;
   /// \brief start the subscription request
   virtual int start_subscription(int ric_instance_id, e2_event_manager& ev_mng, uint16_t ran_func_id) = 0;
+};
 
+class e2_subscriber_mgmt
+{
+public:
+  virtual ~e2_subscriber_mgmt() = default;
+  /// \brief  adds e2sm service to the subscriber
+  /// \param oid The oid of the e2sm service
+  /// \param e2sm_iface pointer to the e2sm interface
   virtual void add_e2sm_service(std::string oid, std::unique_ptr<e2sm_interface> e2sm_iface) = 0;
 
   virtual e2sm_interface* get_e2sm_interface(const std::string oid) = 0;
 
   virtual void add_ran_function_oid(uint16_t ran_func_id, std::string oid) = 0;
 };
 
+class e2_subscription_manager : public e2_subscription_proc, public e2_subscriber_mgmt
+{
+public:
+  virtual ~e2_subscription_manager() = default;
+};
+
 } // namespace srsran

lib/e2/common/e2_impl.cpp

@@ -25,7 +25,7 @@ e2_impl::e2_impl(timer_factory            timers_,
   timers(timers_),
   pdu_notifier(e2_pdu_notifier_),
   subscription_mngr(subscription_mngr_),
-  subscribe_proc(e2_pdu_notifier_, subscription_mngr, timers, logger),
+  subscribe_proc(e2_pdu_notifier_, subscription_mngr_, timers, logger),
   events(std::make_unique<e2_event_manager>(timers))
 {
 }

lib/e2/common/e2_impl.h

@@ -75,7 +75,7 @@ class e2_impl final : public e2_interface
   std::map<uint16_t, asn1::e2ap::ra_nfunction_item_s>  candidate_ran_functions;
   std::map<uint16_t, asn1::e2ap::ra_nfunction_item_s>  allowed_ran_functions;
   std::map<std::string, std::unique_ptr<e2sm_handler>> e2sm_handlers;
-  e2_subscription_manager&                             subscription_mngr;
+  e2_subscriber_mgmt&                                  subscription_mngr;
   e2_subscription_setup_procedure                      subscribe_proc;
   std::unique_ptr<e2_event_manager>                    events;
 

lib/e2/procedures/e2_subscription_setup_procedure.cpp

@@ -12,10 +12,10 @@
 using namespace srsran;
 using namespace asn1::e2ap;
 
-e2_subscription_setup_procedure::e2_subscription_setup_procedure(e2_message_notifier&     ric_notif_,
-                                                                 e2_subscription_manager& subscription_mngr_,
-                                                                 timer_factory            timers_,
-                                                                 srslog::basic_logger&    logger_) :
+e2_subscription_setup_procedure::e2_subscription_setup_procedure(e2_message_notifier&  ric_notif_,
+                                                                 e2_subscription_proc& subscription_mngr_,
+                                                                 timer_factory         timers_,
+                                                                 srslog::basic_logger& logger_) :
   logger(logger_), ric_notif(ric_notif_), subscription_mngr(subscription_mngr_), timers(timers_)
 {
 }

lib/e2/procedures/e2_subscription_setup_procedure.h

@@ -23,10 +23,10 @@ namespace srsran {
 class e2_subscription_setup_procedure
 {
 public:
-  e2_subscription_setup_procedure(e2_message_notifier&     ric_notif_,
-                                  e2_subscription_manager& subscription_mngr_,
-                                  timer_factory            timers_,
-                                  srslog::basic_logger&    logger_);
+  e2_subscription_setup_procedure(e2_message_notifier&  ric_notif_,
+                                  e2_subscription_proc& subscription_mngr_,
+                                  timer_factory         timers_,
+                                  srslog::basic_logger& logger_);
 
   void run_subscription_procedure(const asn1::e2ap::ricsubscription_request_s request_,
                                   e2_event_manager&                           event_manager);
@@ -38,7 +38,7 @@ class e2_subscription_setup_procedure
 
   srslog::basic_logger&    logger;
   e2_message_notifier&     ric_notif;
-  e2_subscription_manager& subscription_mngr;
+  e2_subscription_proc&    subscription_mngr;
   timer_factory            timers;
 };