du: get bind address from F1-U GW

du: fix up du/cu integration test

f1u,du: change get bind address to use gnb_du_id_t instead of uint32_t

Author: alvasMan

include/srsran/f1u/du/f1u_gateway.h

@@ -13,6 +13,7 @@
 #include "srsran/f1u/du/f1u_bearer.h"
 #include "srsran/f1u/du/f1u_config.h"
 #include "srsran/f1u/du/f1u_tx_pdu_notifier.h"
+#include "srsran/ran/gnb_du_id.h"
 #include "srsran/ran/lcid.h"
 #include "srsran/ran/up_transport_layer_info.h"
 #include "srsran/support/timers.h"
@@ -57,7 +58,7 @@ class f1u_du_gateway : public srs_du::f1u_bearer_disconnector
                                                                   timer_factory                              timers,
                                                                   task_executor& ue_executor) = 0;
 
-  virtual expected<std::string> get_du_bind_address(uint32_t du_index) = 0;
+  virtual expected<std::string> get_du_bind_address(gnb_du_id_t gnb_du_id) = 0;
 };
 
 } // namespace srsran::srs_du

include/srsran/f1u/du/split_connector/f1u_split_connector.h

@@ -197,7 +197,7 @@ class f1u_split_connector final : public f1u_du_gateway
 
   void remove_du_bearer(const up_transport_layer_info& dl_up_tnl_info) override;
 
-  expected<std::string> get_du_bind_address(uint32_t du_index) override;
+  expected<std::string> get_du_bind_address(gnb_du_id_t gnb_du_id) override;
 
 private:
   srslog::basic_logger& logger_du;

include/srsran/f1u/local_connector/f1u_local_connector.h

@@ -199,9 +199,9 @@ class f1u_local_connector final : public srs_du::f1u_du_gateway, public f1u_cu_u
 
   void remove_du_bearer(const up_transport_layer_info& dl_up_tnl_info) override;
 
-  expected<std::string> get_du_bind_address(uint32_t du_index) override
+  expected<std::string> get_du_bind_address(gnb_du_id_t gnb_du_id) override
   {
-    return fmt::format("127.0.0.{}", 1 + du_index);
+    return fmt::format("127.0.0.{}", 1 + static_cast<uint32_t>(gnb_du_id));
   }
 
 private:

lib/du_high/du_high_impl.cpp

@@ -116,14 +116,19 @@ du_high_impl::du_high_impl(const du_high_configuration& config_) :
                                     cfg.sched_cfg,
                                     cfg.sched_ue_metrics_notifier ? *cfg.sched_ue_metrics_notifier : *metrics_notifier},
                          cfg.test_cfg);
-  f1ap       = create_du_high_f1ap(*cfg.f1c_client,
+  f1ap = create_du_high_f1ap(*cfg.f1c_client,
                              adapters->f1_to_du_notifier,
                              cfg.exec_mapper->du_control_executor(),
                              cfg.exec_mapper->ue_mapper(),
                              adapters->f1ap_paging_notifier,
                              cfg.test_cfg);
+
+  expected<std::string> f1u_bind_string = config_.f1u_gw->get_du_bind_address(cfg.gnb_du_id);
+  assert(f1u_bind_string.has_value());
+  transport_layer_address f1u_bind_addr = transport_layer_address::create_from_string(f1u_bind_string.value());
+
   du_manager = create_du_manager(du_manager_params{
-      {cfg.gnb_du_name, cfg.gnb_du_id, 1, cfg.du_bind_addr, cfg.cells, cfg.srbs, cfg.qos},
+      {cfg.gnb_du_name, cfg.gnb_du_id, 1, f1u_bind_addr, cfg.cells, cfg.srbs, cfg.qos},
       {timers, cfg.exec_mapper->du_control_executor(), cfg.exec_mapper->ue_mapper(), cfg.exec_mapper->cell_mapper()},
       {*f1ap, *f1ap},
       {*config_.f1u_gw},

lib/f1u/du/split_connector/f1u_split_connector.cpp

@@ -75,7 +75,7 @@ void f1u_split_connector::remove_du_bearer(const up_transport_layer_info& dl_up_
   logger_du.debug("Removed CU F1-U bearer with UL GTP Tunnel={}.", dl_up_tnl_info);
 }
 
-expected<std::string> f1u_split_connector::get_du_bind_address(uint32_t du_index)
+expected<std::string> f1u_split_connector::get_du_bind_address(gnb_du_id_t gnb_du_id)
 {
   std::string ip_address;
   if (not udp_session->get_bind_address(ip_address)) {

tests/benchmarks/du_high/du_high_benchmark.cpp

@@ -340,7 +340,7 @@ class cu_up_simulator : public f1u_du_gateway
 
   void remove_du_bearer(const up_transport_layer_info& dl_tnl) override {}
 
-  expected<std::string> get_du_bind_address(uint32_t du_index) override { return std::string("127.0.0.1"); }
+  expected<std::string> get_du_bind_address(gnb_du_id_t gnb_du_id) override { return std::string("127.0.0.1"); }
 };
 
 /// \brief Instantiation of the DU-high workers and executors for the benchmark.

tests/integrationtests/du_high_cu/cu_du_test.cpp

@@ -76,6 +76,7 @@ class cu_du_test : public ::testing::Test
     srsran::srs_du::du_high_configuration du_cfg{};
     du_cfg.exec_mapper = &workers.exec_mapper;
     du_cfg.f1c_client  = &f1c_gw;
+    du_cfg.f1u_gw      = &f1u_gw;
     du_cfg.phy_adapter = &phy;
     du_cfg.timers      = &timers;
     du_cfg.cells       = {config_helpers::make_default_du_cell_config()};
@@ -94,6 +95,7 @@ class cu_du_test : public ::testing::Test
   timer_manager          timers;
   srslog::basic_logger&  test_logger = srslog::fetch_basic_logger("TEST");
   f1c_test_local_gateway f1c_gw{};
+  f1u_test_local_gateway f1u_gw{};
 
   std::unique_ptr<srs_cu_cp::mock_amf> amf{srs_cu_cp::create_mock_amf()};
   std::unique_ptr<srs_cu_cp::cu_cp>    cu_cp_obj;

tests/test_doubles/f1ap/f1c_test_local_gateway.h

@@ -13,6 +13,7 @@
 #include "srsran/cu_cp/cu_cp_f1c_handler.h"
 #include "srsran/f1ap/common/f1ap_message.h"
 #include "srsran/f1ap/gateways/f1c_connection_client.h"
+#include "srsran/f1u/du/f1u_gateway.h"
 
 namespace srsran {
 
@@ -105,4 +106,23 @@ class f1c_test_local_gateway : public srs_du::f1c_connection_client
   std::vector<std::unique_ptr<du_connection_test_context>> connections;
 };
 
+class f1u_test_local_gateway : public srs_du::f1u_du_gateway
+{
+  std::unique_ptr<srs_du::f1u_du_gateway_bearer> create_du_bearer(uint32_t                       ue_index,
+                                                                  drb_id_t                       drb_id,
+                                                                  srs_du::f1u_config             config,
+                                                                  const up_transport_layer_info& dl_up_tnl_info,
+                                                                  const up_transport_layer_info& ul_up_tnl_info,
+                                                                  srs_du::f1u_du_gateway_bearer_rx_notifier& du_rx,
+                                                                  timer_factory                              timers,
+                                                                  task_executor& ue_executor) override
+  {
+    return nullptr;
+  }
+
+  void remove_du_bearer(const up_transport_layer_info& dl_up_tnl_info) override {}
+
+  expected<std::string> get_du_bind_address(gnb_du_id_t du_index) override { return std::string("127.0.0.1"); }
+};
+
 } // namespace srsran

tests/test_doubles/f1u/dummy_f1u_du_gateway.h

@@ -69,7 +69,7 @@ class cu_up_simulator : public f1u_du_gateway
     }
   }
 
-  expected<std::string> get_du_bind_address(uint32_t du_index) override { return std::string("127.0.0.1"); }
+  expected<std::string> get_du_bind_address(gnb_du_id_t du_index) override { return std::string("127.0.0.1"); }
 };
 
 } // namespace srs_du

tests/unittests/du_manager/du_manager_test_helpers.h

@@ -196,7 +196,7 @@ class f1u_gateway_dummy : public f1u_du_gateway
     f1u_bearers.erase(bearer_it);
   }
 
-  expected<std::string> get_du_bind_address(uint32_t du_index) override { return std::string("127.0.0.1"); }
+  expected<std::string> get_du_bind_address(gnb_du_id_t du_index) override { return std::string("127.0.0.1"); }
 
   std::map<up_transport_layer_info, std::map<up_transport_layer_info, f1u_gw_bearer_dummy*>> f1u_bearers;
 };