e2: refactoring, use sctp client instead of the old sctp gw

Author: Piotr Gawlowicz

apps/cu/CMakeLists.txt

@@ -12,7 +12,6 @@ add_executable(srscu
 	cu_appconfig_validator.cpp
 	cu_appconfig_yaml_writer.cpp
     ../gnb/gnb_appconfig_translators.cpp
-    ../gnb/adapters/e2_gateway_remote_connector.cpp # TODO: Delete
 )
 
 install(TARGETS srscu

apps/cu/adapters/e2_gateways.h

@@ -0,0 +1,32 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "apps/services/e2/e2_appconfig.h"
+#include "srsran/e2/gateways/e2_network_client_factory.h"
+
+namespace srsran {
+
+/// Instantiates an E2AP client.
+std::unique_ptr<e2_connection_client>
+create_cu_e2_client_gateway(const e2_appconfig& e2_cfg, io_broker& broker, dlt_pcap& f1ap_pcap)
+{
+  sctp_network_connector_config e2ap_sctp{};
+  e2ap_sctp.if_name         = "E2AP";
+  e2ap_sctp.dest_name       = "Near-RT-RIC";
+  e2ap_sctp.connect_address = e2_cfg.ip_addr;
+  e2ap_sctp.connect_port    = e2_cfg.port;
+  e2ap_sctp.ppid            = E2_CP_PPID;
+  e2ap_sctp.bind_address    = e2_cfg.bind_addr;
+  return create_e2_gateway_client(e2_sctp_gateway_config{e2ap_sctp, broker, f1ap_pcap});
+}
+
+} // namespace srsran

apps/cu/cu.cpp

@@ -40,7 +40,7 @@
 #include "srsran/cu_up/cu_up.h"
 
 // TODO remove apps/gnb/*.h
-#include "apps/gnb/adapters/e2_gateway_remote_connector.h"
+#include "apps/cu/adapters/e2_gateways.h"
 #include "apps/gnb/gnb_appconfig_translators.h"
 
 #include "apps/services/application_message_banners.h"
@@ -308,18 +308,18 @@ int main(int argc, char** argv)
   // Create time source that ticks the timers
   io_timer_source time_source{app_timers, *epoll_broker, std::chrono::milliseconds{1}};
 
+  // Instantiate E2AP client gateway.
+  std::unique_ptr<e2_connection_client> e2_gw_cu =
+      create_cu_e2_client_gateway(cu_cfg.e2_cfg, *epoll_broker, *cu_cp_dlt_pcaps.e2ap);
+
   // Create CU-CP config.
   cu_cp_build_dependencies cu_cp_dependencies;
   cu_cp_dependencies.cu_cp_executor = workers.cu_cp_exec;
   cu_cp_dependencies.cu_cp_e2_exec  = workers.cu_cp_e2_exec;
   cu_cp_dependencies.timers         = cu_timers;
   cu_cp_dependencies.ngap_pcap      = cu_cp_dlt_pcaps.ngap.get();
   cu_cp_dependencies.broker         = epoll_broker.get();
-  // E2AP configuration.
-  srsran::sctp_network_connector_config e2_cu_nw_config = generate_e2ap_nw_config(cu_cfg.e2_cfg, E2_CP_PPID);
-  // Create E2AP GW remote connector.
-  e2_gateway_remote_connector e2_gw_cu{*epoll_broker, e2_cu_nw_config, *cu_cp_dlt_pcaps.e2ap};
-  cu_cp_dependencies.e2_gw = &e2_gw_cu;
+  cu_cp_dependencies.e2_gw          = e2_gw_cu.get();
   // create CU-CP.
   auto              cu_cp_obj_and_cmds = cu_cp_app_unit->create_cu_cp(cu_cp_dependencies);
   srs_cu_cp::cu_cp& cu_cp_obj          = *cu_cp_obj_and_cmds.unit;

apps/du/CMakeLists.txt

@@ -12,7 +12,6 @@ add_executable(srsdu
     du_appconfig_validators.cpp
     du_appconfig_translators.cpp
     du_appconfig_yaml_writer.cpp
-    ../gnb/adapters/e2_gateway_remote_connector.cpp # TODO: Delete
 )
 
 install(TARGETS srsdu

apps/du/adapters/e2_gateways.h

@@ -0,0 +1,33 @@
+/*
+ *
+ * Copyright 2021-2024 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "apps/services/e2/e2_appconfig.h"
+#include "srsran/e2/gateways/e2_network_client_factory.h"
+
+namespace srsran {
+
+/// Instantiates an E2AP client.
+std::unique_ptr<e2_connection_client>
+create_du_e2_client_gateway(const e2_appconfig& e2_cfg, io_broker& broker, dlt_pcap& f1ap_pcap)
+{
+  sctp_network_connector_config e2ap_sctp{};
+  e2ap_sctp.if_name         = "E2AP";
+  e2ap_sctp.dest_name       = "Near-RT-RIC";
+  e2ap_sctp.connect_address = e2_cfg.ip_addr;
+  e2ap_sctp.connect_port    = e2_cfg.port;
+  e2ap_sctp.ppid            = E2_DU_PPID;
+  e2ap_sctp.bind_address    = e2_cfg.bind_addr;
+
+  return create_e2_gateway_client(e2_sctp_gateway_config{e2ap_sctp, broker, f1ap_pcap});
+}
+
+} // namespace srsran

apps/du/du.cpp

@@ -32,8 +32,9 @@
 #include "apps/services/worker_manager.h"
 #include "apps/units/flexible_du/split_dynamic/dynamic_du_factory.h"
 
-#include "apps/gnb/adapters/e2_gateway_remote_connector.h"
+#include "apps/du/adapters/e2_gateways.h"
 #include "apps/services/e2/e2_metric_connector_manager.h"
+#include "srsran/e2/gateways/e2_connection_client.h"
 
 // Include ThreadSanitizer (TSAN) options if thread sanitization is enabled.
 // This include is not unused - it helps prevent false alarms from the thread sanitizer.
@@ -288,11 +289,9 @@ int main(int argc, char** argv)
   srslog::sink& json_sink =
       srslog::fetch_udp_sink(du_cfg.metrics_cfg.addr, du_cfg.metrics_cfg.port, srslog::create_json_formatter());
 
-  // E2AP configuration.
-  srsran::sctp_network_connector_config e2_du_nw_config = generate_e2ap_nw_config(du_cfg.e2_cfg, E2_DU_PPID);
-
-  // Create E2AP GW remote connector.
-  e2_gateway_remote_connector e2_gw{*epoll_broker, e2_du_nw_config, *du_pcaps.e2ap};
+  // Instantiate E2AP client gateway.
+  std::unique_ptr<e2_connection_client> e2_gw =
+      create_du_e2_client_gateway(du_cfg.e2_cfg, *epoll_broker, *du_pcaps.e2ap);
 
   app_services::metrics_notifier_proxy_impl metrics_notifier_forwarder;
   du_unit_dependencies                      du_dependencies;
@@ -302,7 +301,7 @@ int main(int argc, char** argv)
   du_dependencies.timer_mng          = &app_timers;
   du_dependencies.mac_p              = du_pcaps.mac.get();
   du_dependencies.rlc_p              = du_pcaps.rlc.get();
-  du_dependencies.e2_client_handler  = &e2_gw;
+  du_dependencies.e2_client_handler  = e2_gw.get();
   du_dependencies.json_sink          = &json_sink;
   du_dependencies.metrics_notifier   = &metrics_notifier_forwarder;
 
@@ -331,12 +330,6 @@ int main(int argc, char** argv)
   // Stop DU activity.
   du_inst.get_power_controller().stop();
 
-  if (du_cfg.e2_cfg.enable_du_e2) {
-    du_logger.info("Closing E2 network connections...");
-    e2_gw.close();
-    du_logger.info("E2 Network connections closed successfully");
-  }
-
   du_logger.info("Closing PCAP files...");
   du_pcaps.close();
   du_logger.info("PCAP files successfully closed.");

apps/gnb/CMakeLists.txt

@@ -12,7 +12,6 @@ add_executable(gnb
         gnb_appconfig_validators.cpp
         gnb_appconfig_translators.cpp
         gnb_appconfig_yaml_writer.cpp
-        adapters/e2_gateway_remote_connector.cpp
         )
 
 install(TARGETS gnb