du_mgr: store the NR Cell Global Identity of the UE's serving cell in DU UE context

Author: herlesupreeth

lib/du_manager/converters/scheduler_configuration_helpers.cpp

@@ -75,8 +75,7 @@ srsran::srs_du::make_sched_cell_config_req(du_cell_index_t          cell_index,
   return sched_req;
 }
 
-sched_ue_config_request srsran::srs_du::create_scheduler_ue_config_request(const du_ue&         ue_ctx,
-                                                                           const plmn_identity& ue_plmn_id)
+sched_ue_config_request srsran::srs_du::create_scheduler_ue_config_request(const du_ue& ue_ctx)
 {
   sched_ue_config_request sched_cfg;
 
@@ -104,7 +103,7 @@ sched_ue_config_request srsran::srs_du::create_scheduler_ue_config_request(const
     sched_lc_ch.lc_sr_delay_timer_applied = bearer.second->mac_cfg.lc_sr_delay_applied;
     sched_lc_ch.sr_id.emplace(bearer.second->mac_cfg.sr_id);
     sched_lc_ch.rrm_policy.s_nssai = bearer.second->s_nssai;
-    sched_lc_ch.rrm_policy.plmn_id = ue_plmn_id.to_string();
+    sched_lc_ch.rrm_policy.plmn_id = ue_ctx.nr_cgi.plmn_id.to_string();
 
     sched_cfg.drb_info_list.emplace_back(sched_drb_info{.lcid         = bearer.second->lcid,
                                                         .s_nssai      = bearer.second->s_nssai,

lib/du_manager/converters/scheduler_configuration_helpers.h

@@ -27,7 +27,7 @@ sched_cell_configuration_request_message make_sched_cell_config_req(du_cell_inde
                                                                     span<const units::bytes> si_payload_sizes);
 
 // Create scheduler UE Configuration Request based on DU UE configuration context.
-sched_ue_config_request create_scheduler_ue_config_request(const du_ue& u, const plmn_identity& ue_plmn_id);
+sched_ue_config_request create_scheduler_ue_config_request(const du_ue& u);
 
 } // namespace srs_du
-} // namespace srsran
+} // namespace srsran

lib/du_manager/du_ue/du_ue.h

@@ -21,15 +21,21 @@ namespace srs_du {
 
 /// \brief This class holds the context of an UE in the DU.
 struct du_ue_context {
-  du_ue_context(du_ue_index_t ue_index_, du_cell_index_t pcell_index_, rnti_t rnti_) :
-    ue_index(ue_index_), rnti(rnti_), f1ap_ue_id(int_to_gnb_du_ue_f1ap_id(ue_index_)), pcell_index(pcell_index_)
+  du_ue_context(du_ue_index_t ue_index_, du_cell_index_t pcell_index_, rnti_t rnti_, nr_cell_global_id_t nr_cgi_) :
+    ue_index(ue_index_),
+    rnti(rnti_),
+    f1ap_ue_id(int_to_gnb_du_ue_f1ap_id(ue_index_)),
+    pcell_index(pcell_index_),
+    nr_cgi(nr_cgi_)
   {
   }
 
   const du_ue_index_t ue_index;
   rnti_t              rnti = rnti_t::INVALID_RNTI;
   gnb_du_ue_f1ap_id_t f1ap_ue_id;
   du_cell_index_t     pcell_index;
+  /// \brief The NR Cell Global Identity of the UE's serving cell.
+  nr_cell_global_id_t nr_cgi;
 };
 
 /// The interface exposes the methods to interact with the state of a DU UE.

lib/du_manager/procedures/ue_configuration_procedure.cpp

@@ -231,10 +231,8 @@ async_task<mac_ue_reconfiguration_response> ue_configuration_procedure::update_m
     lc_ch.dl_bearer = &bearer.connector.mac_tx_sdu_notifier;
   }
 
-  // Fetch the DU cell configuration of the primary cell UE is connected to.
-  const auto& cell_cfg = du_params.ran.cells[ue->pcell_index];
   // Create Scheduler UE Reconfig Request that will be embedded in the mac configuration request.
-  mac_ue_reconf_req.sched_cfg = create_scheduler_ue_config_request(*ue, cell_cfg.nr_cgi.plmn_id);
+  mac_ue_reconf_req.sched_cfg = create_scheduler_ue_config_request(*ue);
 
   return du_params.mac.ue_cfg.handle_ue_reconfiguration_request(mac_ue_reconf_req);
 }

lib/du_manager/procedures/ue_creation_procedure.cpp

@@ -98,8 +98,10 @@ expected<du_ue*, std::string> ue_creation_procedure::create_du_ue_context()
     return make_unexpected(ue_res.get_error());
   }
 
+  // Fetch the DU cell configuration of the primary cell UE is connected to.
+  const auto& cell_cfg = du_params.ran.cells[req.pcell_index];
   // Create the DU UE context.
-  return ue_mng.add_ue(du_ue_context(req.ue_index, req.pcell_index, req.tc_rnti), std::move(ue_res));
+  return ue_mng.add_ue(du_ue_context(req.ue_index, req.pcell_index, req.tc_rnti, cell_cfg.nr_cgi), std::move(ue_res));
 }
 
 async_task<void> ue_creation_procedure::clear_ue()
@@ -201,10 +203,8 @@ async_task<mac_ue_create_response> ue_creation_procedure::create_mac_ue()
   }
   mac_ue_create_msg.ul_ccch_msg = not req.ul_ccch_msg.empty() ? &req.ul_ccch_msg : nullptr;
 
-  // Fetch the DU cell configuration of the primary cell UE is connected to.
-  const auto& cell_cfg = du_params.ran.cells[ue_ctx->pcell_index];
   // Create Scheduler UE Config Request that will be embedded in the mac UE creation request.
-  mac_ue_create_msg.sched_cfg = create_scheduler_ue_config_request(*ue_ctx, cell_cfg.nr_cgi.plmn_id);
+  mac_ue_create_msg.sched_cfg = create_scheduler_ue_config_request(*ue_ctx);
 
   // Request MAC to create new UE.
   return du_params.mac.ue_cfg.handle_ue_create_request(mac_ue_create_msg);