du_high: decouple cu-cp headers from du_high_test

frankist · frankist · commit 609c5e019d58 · 2023-06-19T13:03:08.000Z
diff --git a/tests/integrationtests/du_cu_cp/cu_du_test.cpp b/tests/integrationtests/du_cu_cp/cu_du_test.cpp
@@ -8,10 +8,11 @@
  *
  */
 
-#include "../../../lib/du_high/du_high.h"
-#include "../../../lib/du_high/du_high_executor_strategies.h"
+#include "lib/du_high/du_high.h"
+#include "lib/du_high/du_high_executor_strategies.h"
 #include "tests/unittests/du_high/test_utils/du_high_worker_manager.h"
 #include "tests/unittests/f1ap/common/test_helpers.h"
+#include "tests/unittests/f1ap/cu_cp/f1ap_cu_test_helpers.h"
 #include "tests/unittests/ngap/test_helpers.h"
 #include "srsran/cu_cp/cu_cp.h"
 #include "srsran/cu_cp/cu_cp_factory.h"
@@ -48,9 +49,9 @@ class cu_du_test : public ::testing::Test
     srslog::init();
 
     // create message handler for CU and DU to relay messages back and forth
-    dummy_cu_cp_f1ap_pdu_notifier      cu_msg_handler(nullptr, nullptr);
-    dummy_f1ap_pdu_notifier            du_msg_handler(nullptr);
-    srs_cu_cp::dummy_ngap_amf_notifier ngap_amf_notifier;
+    srs_cu_cp::dummy_cu_cp_f1ap_pdu_notifier cu_msg_handler(nullptr, nullptr);
+    dummy_f1ap_pdu_notifier                  du_msg_handler(nullptr);
+    srs_cu_cp::dummy_ngap_amf_notifier       ngap_amf_notifier;
     // create CU-CP config
     srs_cu_cp::cu_cp_configuration cu_cfg;
     cu_cfg.cu_cp_executor = &workers.ctrl_exec;
diff --git a/tests/unittests/f1ap/common/CMakeLists.txt b/tests/unittests/f1ap/common/CMakeLists.txt
@@ -6,7 +6,7 @@
 # the distribution.
 #
 
-add_library(f1ap_test_helpers f1ap_cu_test_messages.cpp f1ap_du_test_messages.cpp test_helpers.cpp)
+add_library(f1ap_test_helpers f1ap_cu_test_messages.cpp f1ap_du_test_messages.cpp)
 target_include_directories(f1ap_test_helpers PRIVATE ${CMAKE_SOURCE_DIR})
 target_link_libraries(f1ap_test_helpers srsran_support f1ap_asn1 srslog)
 
diff --git a/tests/unittests/f1ap/common/test_helpers.cpp b/tests/unittests/f1ap/common/test_helpers.cpp
diff --git a/tests/unittests/f1ap/common/test_helpers.h b/tests/unittests/f1ap/common/test_helpers.h
@@ -10,113 +10,18 @@
 
 #pragma once
 
-#include "srsran/cu_cp/cu_cp.h"
-#include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/f1ap/common/f1ap_common.h"
-#include "srsran/f1ap/cu_cp/f1ap_cu.h"
 #include "srsran/gateways/network_gateway.h"
 
 namespace srsran {
 
-/// \brief Generate a random gnb_cu_ue_f1ap_id
-gnb_cu_ue_f1ap_id_t generate_random_gnb_cu_ue_f1ap_id();
-
-/// \brief Generate a random gnb_du_ue_f1ap_id
-gnb_du_ue_f1ap_id_t generate_random_gnb_du_ue_f1ap_id();
-
 inline bool is_f1ap_pdu_packable(const asn1::f1ap::f1ap_pdu_c& pdu)
 {
   byte_buffer   buffer;
   asn1::bit_ref bref(buffer);
   return pdu.pack(bref) == asn1::SRSASN_SUCCESS;
 }
 
-class dummy_f1ap_rrc_message_notifier : public srs_cu_cp::f1ap_rrc_message_notifier
-{
-public:
-  dummy_f1ap_rrc_message_notifier() = default;
-  void on_new_rrc_message(asn1::unbounded_octstring<true> rrc_container) override
-  {
-    logger.info("Received RRC message");
-    last_rrc_container = rrc_container;
-  };
-
-  asn1::unbounded_octstring<true> last_rrc_container;
-
-private:
-  srslog::basic_logger& logger = srslog::fetch_basic_logger("TEST");
-};
-
-class dummy_f1ap_du_processor_notifier : public srs_cu_cp::f1ap_du_processor_notifier
-{
-public:
-  dummy_f1ap_du_processor_notifier() : logger(srslog::fetch_basic_logger("TEST")) {}
-
-  srs_cu_cp::du_index_t get_du_index() override { return srs_cu_cp::du_index_t::min; }
-
-  void on_f1_setup_request_received(const srs_cu_cp::cu_cp_f1_setup_request& msg) override
-  {
-    logger.info("Received F1SetupRequest");
-    last_f1_setup_request_msg.gnb_du_id          = msg.gnb_du_id;
-    last_f1_setup_request_msg.gnb_du_name        = msg.gnb_du_name;
-    last_f1_setup_request_msg.gnb_du_rrc_version = msg.gnb_du_rrc_version;
-    for (const auto& served_cell : msg.gnb_du_served_cells_list) {
-      srs_cu_cp::cu_cp_du_served_cells_item served_cell_item;
-      served_cell_item.served_cell_info.nr_cgi          = served_cell.served_cell_info.nr_cgi;
-      served_cell_item.served_cell_info.nr_pci          = served_cell.served_cell_info.nr_pci;
-      served_cell_item.served_cell_info.five_gs_tac     = served_cell.served_cell_info.five_gs_tac;
-      served_cell_item.served_cell_info.cfg_eps_tac     = served_cell.served_cell_info.cfg_eps_tac;
-      served_cell_item.served_cell_info.served_plmns    = served_cell.served_cell_info.served_plmns;
-      served_cell_item.served_cell_info.nr_mode_info    = served_cell.served_cell_info.nr_mode_info;
-      served_cell_item.served_cell_info.meas_timing_cfg = served_cell.served_cell_info.meas_timing_cfg.copy();
-
-      if (served_cell.gnb_du_sys_info.has_value()) {
-        srs_cu_cp::cu_cp_gnb_du_sys_info gnb_du_sys_info;
-        gnb_du_sys_info.mib_msg  = served_cell.gnb_du_sys_info.value().mib_msg.copy();
-        gnb_du_sys_info.sib1_msg = served_cell.gnb_du_sys_info.value().sib1_msg.copy();
-
-        served_cell_item.gnb_du_sys_info = gnb_du_sys_info;
-      }
-
-      last_f1_setup_request_msg.gnb_du_served_cells_list.push_back(served_cell_item);
-    }
-  }
-
-  srs_cu_cp::ue_creation_complete_message on_create_ue(const srs_cu_cp::f1ap_initial_ul_rrc_message& msg) override
-  {
-    logger.info("Received UeCreationRequest");
-    last_ue_creation_request_msg                = msg;
-    srs_cu_cp::ue_creation_complete_message ret = {};
-    ret.ue_index                                = srs_cu_cp::ue_index_t::invalid;
-    if (ue_id < srs_cu_cp::MAX_NOF_UES_PER_DU) {
-      ret.ue_index          = srs_cu_cp::uint_to_ue_index(ue_id);
-      last_created_ue_index = ret.ue_index;
-      ue_id++;
-      for (uint32_t i = 0; i < MAX_NOF_SRBS; i++) {
-        ret.srbs[i] = rx_notifier.get();
-      }
-    }
-    return ret;
-  }
-
-  void on_du_initiated_ue_context_release_request(const srs_cu_cp::f1ap_ue_context_release_request& req) override
-  {
-    logger.info("Received UEContextReleaseRequest");
-    // TODO
-  }
-
-  void set_ue_id(uint16_t ue_id_) { ue_id = ue_id_; }
-
-  srs_cu_cp::cu_cp_f1_setup_request                last_f1_setup_request_msg;
-  srs_cu_cp::f1ap_initial_ul_rrc_message           last_ue_creation_request_msg;
-  optional<srs_cu_cp::ue_index_t>                  last_created_ue_index;
-  std::unique_ptr<dummy_f1ap_rrc_message_notifier> rx_notifier = std::make_unique<dummy_f1ap_rrc_message_notifier>();
-
-private:
-  srslog::basic_logger& logger;
-  uint16_t              ue_id = ue_index_to_uint(srs_cu_cp::ue_index_t::min);
-};
-
 /// Reusable notifier class that a) stores the received PDU for test inspection and b)
 /// calls the registered PDU handler (if any). The handler can be added upon construction
 /// or later via the attach_handler() method.
@@ -160,39 +65,6 @@ class f1ap_null_notifier : public f1ap_message_notifier
   }
 };
 
-/// Reusable notifier class that a) stores the received PDU for test inspection and b)
-/// calls the registered PDU handler (if any). The handler can be added upon construction
-/// or later via the attach_handler() method.
-class dummy_cu_cp_f1ap_pdu_notifier : public f1ap_message_notifier
-{
-public:
-  dummy_cu_cp_f1ap_pdu_notifier(srs_cu_cp::cu_cp_interface* cu_cp_, f1ap_message_handler* handler_) :
-    logger(srslog::fetch_basic_logger("TEST")), cu_cp(cu_cp_), handler(handler_){};
-
-  void attach_handler(srs_cu_cp::cu_cp_interface* cu_cp_, f1ap_message_handler* handler_)
-  {
-    cu_cp   = cu_cp_;
-    handler = handler_;
-    cu_cp->handle_new_du_connection();
-  };
-  void on_new_message(const f1ap_message& msg) override
-  {
-    logger.info("Received a PDU of type {}", msg.pdu.type().to_string());
-    last_f1ap_msg = msg; // store msg
-
-    if (handler != nullptr) {
-      logger.info("Forwarding PDU");
-      handler->handle_message(msg);
-    }
-  }
-  f1ap_message last_f1ap_msg;
-
-private:
-  srslog::basic_logger&       logger;
-  srs_cu_cp::cu_cp_interface* cu_cp   = nullptr;
-  f1ap_message_handler*       handler = nullptr;
-};
-
 /// Dummy handler just printing the received PDU.
 class dummy_f1ap_message_handler : public f1ap_message_handler
 {
diff --git a/tests/unittests/f1ap/cu_cp/f1ap_cu_test_helpers.cpp b/tests/unittests/f1ap/cu_cp/f1ap_cu_test_helpers.cpp
@@ -10,10 +10,17 @@
 
 #include "f1ap_cu_test_helpers.h"
 #include "srsran/support/async/async_test_utils.h"
+#include "srsran/support/test_utils.h"
 
 using namespace srsran;
 using namespace srs_cu_cp;
 
+gnb_cu_ue_f1ap_id_t srsran::srs_cu_cp::generate_random_gnb_cu_ue_f1ap_id()
+{
+  return int_to_gnb_cu_ue_f1ap_id(test_rgen::uniform_int<uint64_t>(
+      gnb_cu_ue_f1ap_id_to_uint(gnb_cu_ue_f1ap_id_t::min), gnb_cu_ue_f1ap_id_to_uint(gnb_cu_ue_f1ap_id_t::max) - 1));
+}
+
 f1ap_cu_test::f1ap_cu_test()
 {
   test_logger.set_level(srslog::basic_levels::debug);
diff --git a/tests/unittests/f1ap/cu_cp/f1ap_cu_test_helpers.h b/tests/unittests/f1ap/cu_cp/f1ap_cu_test_helpers.h
@@ -12,6 +12,7 @@
 
 #include "../common/f1ap_cu_test_messages.h"
 #include "../common/test_helpers.h"
+#include "srsran/cu_cp/cu_cp.h"
 #include "srsran/cu_cp/cu_cp_types.h"
 #include "srsran/f1ap/common/f1ap_common.h"
 #include "srsran/f1ap/cu_cp/f1ap_cu.h"
@@ -22,6 +23,128 @@
 namespace srsran {
 namespace srs_cu_cp {
 
+/// \brief Generate a random gnb_cu_ue_f1ap_id
+gnb_cu_ue_f1ap_id_t generate_random_gnb_cu_ue_f1ap_id();
+
+/// Reusable notifier class that a) stores the received PDU for test inspection and b)
+/// calls the registered PDU handler (if any). The handler can be added upon construction
+/// or later via the attach_handler() method.
+class dummy_cu_cp_f1ap_pdu_notifier : public f1ap_message_notifier
+{
+public:
+  dummy_cu_cp_f1ap_pdu_notifier(srs_cu_cp::cu_cp_interface* cu_cp_, f1ap_message_handler* handler_) :
+    logger(srslog::fetch_basic_logger("TEST")), cu_cp(cu_cp_), handler(handler_){};
+
+  void attach_handler(srs_cu_cp::cu_cp_interface* cu_cp_, f1ap_message_handler* handler_)
+  {
+    cu_cp   = cu_cp_;
+    handler = handler_;
+    cu_cp->handle_new_du_connection();
+  };
+  void on_new_message(const f1ap_message& msg) override
+  {
+    logger.info("Received a PDU of type {}", msg.pdu.type().to_string());
+    last_f1ap_msg = msg; // store msg
+
+    if (handler != nullptr) {
+      logger.info("Forwarding PDU");
+      handler->handle_message(msg);
+    }
+  }
+  f1ap_message last_f1ap_msg;
+
+private:
+  srslog::basic_logger&       logger;
+  srs_cu_cp::cu_cp_interface* cu_cp   = nullptr;
+  f1ap_message_handler*       handler = nullptr;
+};
+
+class dummy_f1ap_rrc_message_notifier : public srs_cu_cp::f1ap_rrc_message_notifier
+{
+public:
+  dummy_f1ap_rrc_message_notifier() = default;
+  void on_new_rrc_message(asn1::unbounded_octstring<true> rrc_container) override
+  {
+    logger.info("Received RRC message");
+    last_rrc_container = rrc_container;
+  };
+
+  asn1::unbounded_octstring<true> last_rrc_container;
+
+private:
+  srslog::basic_logger& logger = srslog::fetch_basic_logger("TEST");
+};
+
+class dummy_f1ap_du_processor_notifier : public srs_cu_cp::f1ap_du_processor_notifier
+{
+public:
+  dummy_f1ap_du_processor_notifier() : logger(srslog::fetch_basic_logger("TEST")) {}
+
+  srs_cu_cp::du_index_t get_du_index() override { return srs_cu_cp::du_index_t::min; }
+
+  void on_f1_setup_request_received(const srs_cu_cp::cu_cp_f1_setup_request& msg) override
+  {
+    logger.info("Received F1SetupRequest");
+    last_f1_setup_request_msg.gnb_du_id          = msg.gnb_du_id;
+    last_f1_setup_request_msg.gnb_du_name        = msg.gnb_du_name;
+    last_f1_setup_request_msg.gnb_du_rrc_version = msg.gnb_du_rrc_version;
+    for (const auto& served_cell : msg.gnb_du_served_cells_list) {
+      srs_cu_cp::cu_cp_du_served_cells_item served_cell_item;
+      served_cell_item.served_cell_info.nr_cgi          = served_cell.served_cell_info.nr_cgi;
+      served_cell_item.served_cell_info.nr_pci          = served_cell.served_cell_info.nr_pci;
+      served_cell_item.served_cell_info.five_gs_tac     = served_cell.served_cell_info.five_gs_tac;
+      served_cell_item.served_cell_info.cfg_eps_tac     = served_cell.served_cell_info.cfg_eps_tac;
+      served_cell_item.served_cell_info.served_plmns    = served_cell.served_cell_info.served_plmns;
+      served_cell_item.served_cell_info.nr_mode_info    = served_cell.served_cell_info.nr_mode_info;
+      served_cell_item.served_cell_info.meas_timing_cfg = served_cell.served_cell_info.meas_timing_cfg.copy();
+
+      if (served_cell.gnb_du_sys_info.has_value()) {
+        srs_cu_cp::cu_cp_gnb_du_sys_info gnb_du_sys_info;
+        gnb_du_sys_info.mib_msg  = served_cell.gnb_du_sys_info.value().mib_msg.copy();
+        gnb_du_sys_info.sib1_msg = served_cell.gnb_du_sys_info.value().sib1_msg.copy();
+
+        served_cell_item.gnb_du_sys_info = gnb_du_sys_info;
+      }
+
+      last_f1_setup_request_msg.gnb_du_served_cells_list.push_back(served_cell_item);
+    }
+  }
+
+  srs_cu_cp::ue_creation_complete_message on_create_ue(const srs_cu_cp::f1ap_initial_ul_rrc_message& msg) override
+  {
+    logger.info("Received UeCreationRequest");
+    last_ue_creation_request_msg                = msg;
+    srs_cu_cp::ue_creation_complete_message ret = {};
+    ret.ue_index                                = srs_cu_cp::ue_index_t::invalid;
+    if (ue_id < srs_cu_cp::MAX_NOF_UES_PER_DU) {
+      ret.ue_index          = srs_cu_cp::uint_to_ue_index(ue_id);
+      last_created_ue_index = ret.ue_index;
+      ue_id++;
+      for (uint32_t i = 0; i < MAX_NOF_SRBS; i++) {
+        ret.srbs[i] = rx_notifier.get();
+      }
+    }
+    return ret;
+  }
+
+  void on_du_initiated_ue_context_release_request(const srs_cu_cp::f1ap_ue_context_release_request& req) override
+  {
+    logger.info("Received UEContextReleaseRequest");
+    // TODO
+  }
+
+  void set_ue_id(uint16_t ue_id_) { ue_id = ue_id_; }
+
+  srs_cu_cp::cu_cp_f1_setup_request                last_f1_setup_request_msg;
+  srs_cu_cp::f1ap_initial_ul_rrc_message           last_ue_creation_request_msg;
+  optional<srs_cu_cp::ue_index_t>                  last_created_ue_index;
+  std::unique_ptr<dummy_f1ap_rrc_message_notifier> rx_notifier = std::make_unique<dummy_f1ap_rrc_message_notifier>();
+
+private:
+  srslog::basic_logger& logger;
+  uint16_t              ue_id = ue_index_to_uint(srs_cu_cp::ue_index_t::min);
+};
+
 /// Reusable notifier class that a) stores the received du_index for test inspection and b)
 /// calls the registered DU handler (if any). The handler can be added upon construction
 /// or later via the attach_handler() method.
diff --git a/tests/unittests/f1ap/cu_cp/f1ap_cu_ue_context_test.cpp b/tests/unittests/f1ap/cu_cp/f1ap_cu_ue_context_test.cpp
@@ -9,6 +9,7 @@
  */
 
 #include "../common/test_helpers.h"
+#include "f1ap_cu_test_helpers.h"
 #include "lib/f1ap/cu_cp/ue_context/f1ap_cu_ue_context.h"
 #include "srsran/support/executors/manual_task_worker.h"
 #include "srsran/support/test_utils.h"
@@ -27,13 +28,13 @@ class f1ap_cu_ue_context_test : public ::testing::Test
   {
     // flush logger after each test
     srslog::flush();
-  };
+  }
 
   ue_index_t generate_random_ue_index()
   {
     return uint_to_ue_index(
         test_rgen::uniform_int<uint64_t>(ue_index_to_uint(ue_index_t::min), ue_index_to_uint(ue_index_t::max) - 1));
-  };
+  }
 
   timer_manager        timer_mng;
   manual_task_worker   ctrl_worker{128};
diff --git a/tests/unittests/f1ap/du/f1ap_du_test_helpers.cpp b/tests/unittests/f1ap/du/f1ap_du_test_helpers.cpp
diff --git a/tests/unittests/f1ap/du/f1ap_du_test_helpers.h b/tests/unittests/f1ap/du/f1ap_du_test_helpers.h

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# the distribution.`
`7`	`7`	`#`
`8`	`8`
`9`		`-add_library(f1ap_test_helpers f1ap_cu_test_messages.cpp f1ap_du_test_messages.cpp test_helpers.cpp)`
	`9`	`+add_library(f1ap_test_helpers f1ap_cu_test_messages.cpp f1ap_du_test_messages.cpp)`
`10`	`10`	`target_include_directories(f1ap_test_helpers PRIVATE ${CMAKE_SOURCE_DIR})`
`11`	`11`	`target_link_libraries(f1ap_test_helpers srsran_support f1ap_asn1 srslog)`
`12`	`12`