e2ap: rename ric_subscription to e2ap_ric_subscription

srsenb/hdr/enb.h

@@ -33,8 +33,8 @@
 
 #include "srsenb/hdr/stack/mac/sched_interface.h"
 #include "srsgnb/hdr/stack/gnb_stack_nr.h"
+#include "srsgnb/hdr/stack/ric/e2ap_ric_subscription.h"
 #include "srsgnb/hdr/stack/ric/ric_client.h"
-#include "srsgnb/hdr/stack/ric/ric_subscription.h"
 #include "srsran/common/bcd_helpers.h"
 #include "srsran/common/buffer_pool.h"
 #include "srsran/common/interfaces_common.h"

srsgnb/hdr/stack/ric/e2ap_ric_subscription.h

@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef SRSRAN_RIC_SUBSCRIPTION_H
-#define SRSRAN_RIC_SUBSCRIPTION_H
+#ifndef SRSRAN_E2AP_RIC_SUBSCRIPTION_H
+#define SRSRAN_E2AP_RIC_SUBSCRIPTION_H
 
 #include "e2ap.h"
 #include "srsran/common/task_scheduler.h"
@@ -62,4 +62,4 @@ private:
 };
 
 } // namespace srsenb
-#endif // SRSRAN_RIC_SUBSCRIPTION_H
+#endif // SRSRAN_E2AP_RIC_SUBSCRIPTION_H

srsgnb/src/stack/ric/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(SOURCES ric_client.cc ric_subscription.cc e2ap.cc e2sm_kpm_common.cc e2sm_kpm.cc e2sm_kpm_report_service.cc)
+set(SOURCES ric_client.cc e2ap_ric_subscription.cc e2ap.cc e2sm_kpm_common.cc e2sm_kpm.cc e2sm_kpm_report_service.cc)
 add_library(srsgnb_ric STATIC ${SOURCES})
 target_link_libraries(srsgnb_ric srsran_asn1 ric_e2)
 

srsgnb/src/stack/ric/e2ap.cc

@@ -1,7 +1,7 @@
 
 #include "srsgnb/hdr/stack/ric/e2ap.h"
+#include "srsgnb/hdr/stack/ric/e2ap_ric_subscription.h"
 #include "srsgnb/hdr/stack/ric/ric_client.h"
-#include "srsgnb/hdr/stack/ric/ric_subscription.h"
 
 e2ap::e2ap(srslog::basic_logger&         logger,
            ric_client*                   _ric_client,

srsgnb/src/stack/ric/e2ap_ric_subscription.cc

@@ -11,7 +11,7 @@
  *
  */
 
-#include "srsgnb/hdr/stack/ric/ric_subscription.h"
+#include "srsgnb/hdr/stack/ric/e2ap_ric_subscription.h"
 
 e2ap::ric_subscription::ric_subscription(e2ap* e2ap, ricsubscription_request_s ric_subscription_request) :
   parent(e2ap),