du_mgr: populate RRM policy member fields in logical channel configuration for DRBs

Author: herlesupreeth

lib/du_manager/converters/scheduler_configuration_helpers.cpp

@@ -73,7 +73,8 @@ 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)
+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 sched_cfg;
 
@@ -100,6 +101,8 @@ sched_ue_config_request srsran::srs_du::create_scheduler_ue_config_request(const
     sched_lc_ch.lc_sr_mask                = bearer.second->mac_cfg.lc_sr_mask;
     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_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

@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include "srsran/ran/plmn_identity.h"
 #include "srsran/scheduler/scheduler_configurator.h"
 
 namespace srsran {
@@ -26,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);
+sched_ue_config_request create_scheduler_ue_config_request(const du_ue& u, const plmn_identity& ue_plmn_id);
 
 } // namespace srs_du
 } // namespace srsran

lib/du_manager/procedures/ue_configuration_procedure.cpp

@@ -231,8 +231,10 @@ 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);
+  mac_ue_reconf_req.sched_cfg = create_scheduler_ue_config_request(*ue, cell_cfg.nr_cgi.plmn_id);
 
   return du_params.mac.ue_cfg.handle_ue_reconfiguration_request(mac_ue_reconf_req);
 }

lib/du_manager/procedures/ue_creation_procedure.cpp

@@ -201,8 +201,10 @@ 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);
+  mac_ue_create_msg.sched_cfg = create_scheduler_ue_config_request(*ue_ctx, cell_cfg.nr_cgi.plmn_id);
 
   // Request MAC to create new UE.
   return du_params.mac.ue_cfg.handle_ue_create_request(mac_ue_create_msg);