From d2b42039e13493ce809c3699e2bba4bd2cd4fc0d Mon Sep 17 00:00:00 2001
From: Piotr Gawlowicz <piotr@srs.io>
Date: Tue, 4 Apr 2023 10:45:11 +0200
Subject: [PATCH] e2ap: rename ric_subscription to e2ap_ric_subscription

---
 srsenb/hdr/enb.h                                            | 2 +-
 .../ric/{ric_subscription.h => e2ap_ric_subscription.h}     | 6 +++---
 srsgnb/src/stack/ric/CMakeLists.txt                         | 2 +-
 srsgnb/src/stack/ric/e2ap.cc                                | 2 +-
 .../ric/{ric_subscription.cc => e2ap_ric_subscription.cc}   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename srsgnb/hdr/stack/ric/{ric_subscription.h => e2ap_ric_subscription.h} (93%)
 rename srsgnb/src/stack/ric/{ric_subscription.cc => e2ap_ric_subscription.cc} (99%)

diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h
index c2defb76e..5c30752db 100644
--- a/srsenb/hdr/enb.h
+++ b/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"
diff --git a/srsgnb/hdr/stack/ric/ric_subscription.h b/srsgnb/hdr/stack/ric/e2ap_ric_subscription.h
similarity index 93%
rename from srsgnb/hdr/stack/ric/ric_subscription.h
rename to srsgnb/hdr/stack/ric/e2ap_ric_subscription.h
index 7ebbc79e9..180f08dae 100644
--- a/srsgnb/hdr/stack/ric/ric_subscription.h
+++ b/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
diff --git a/srsgnb/src/stack/ric/CMakeLists.txt b/srsgnb/src/stack/ric/CMakeLists.txt
index 86ba74dbd..75c6c2a73 100644
--- a/srsgnb/src/stack/ric/CMakeLists.txt
+++ b/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)
 
diff --git a/srsgnb/src/stack/ric/e2ap.cc b/srsgnb/src/stack/ric/e2ap.cc
index 9b08a4f2e..8efd7d593 100644
--- a/srsgnb/src/stack/ric/e2ap.cc
+++ b/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,
diff --git a/srsgnb/src/stack/ric/ric_subscription.cc b/srsgnb/src/stack/ric/e2ap_ric_subscription.cc
similarity index 99%
rename from srsgnb/src/stack/ric/ric_subscription.cc
rename to srsgnb/src/stack/ric/e2ap_ric_subscription.cc
index 301c870d5..79e54cc1b 100644
--- a/srsgnb/src/stack/ric/ric_subscription.cc
+++ b/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),