du_mgr: return empty cellGroupConfig if no SCells, DRBs or SRBs to setup or release

Author: herlesupreeth

lib/du_manager/procedures/ue_configuration_procedure.cpp

@@ -38,8 +38,9 @@ void ue_configuration_procedure::operator()(coro_context<async_task<f1ap_ue_cont
 
   if (request.drbs_to_setup.empty() and request.srbs_to_setup.empty() and request.drbs_to_rem.empty() and
       request.scells_to_setup.empty() and request.scells_to_rem.empty()) {
-    proc_logger.log_proc_failure("No SCells, DRBs or SRBs to setup or release");
-    CORO_EARLY_RETURN(make_ue_config_failure());
+    // No SCells, DRBs or SRBs to setup or release so nothing to do.
+    proc_logger.log_proc_completed();
+    CORO_EARLY_RETURN(make_empty_ue_config_response());
   }
 
   prev_cell_group = ue->resources.value();
@@ -340,3 +341,18 @@ f1ap_ue_context_update_response ue_configuration_procedure::make_ue_config_failu
   resp.result = false;
   return resp;
 }
+
+f1ap_ue_context_update_response ue_configuration_procedure::make_empty_ue_config_response()
+{
+  f1ap_ue_context_update_response resp;
+  resp.result = true;
+  // > Calculate ASN.1 CellGroupConfig to be sent in DU-to-CU container.
+  asn1::rrc_nr::cell_group_cfg_s asn1_cell_group;
+  // Pack cellGroupConfig.
+  {
+    asn1::bit_ref     bref{resp.du_to_cu_rrc_container};
+    asn1::SRSASN_CODE code = asn1_cell_group.pack(bref);
+    srsran_assert(code == asn1::SRSASN_SUCCESS, "Invalid cellGroupConfig");
+  }
+  return resp;
+}

lib/du_manager/procedures/ue_configuration_procedure.h

@@ -40,6 +40,7 @@ class ue_configuration_procedure
   async_task<mac_ue_reconfiguration_response> update_mac_mux_and_demux();
 
   f1ap_ue_context_update_response make_ue_config_response();
+  f1ap_ue_context_update_response make_empty_ue_config_response();
   f1ap_ue_context_update_response make_ue_config_failure();
 
   const f1ap_ue_context_update_request request;

tests/unittests/du_manager/procedures/ue_configuration_test.cpp

@@ -322,7 +322,7 @@ TEST_F(ue_config_tester, when_config_is_invalid_of_drb_to_create_then_drb_is_inc
   ASSERT_EQ(resp.drbs_failed_to_setup[0], drb_id_t::drb1);
 }
 
-TEST_F(ue_config_tester, when_config_is_empty_then_procedure_avoids_configuring_other_layers_and_returns_failure)
+TEST_F(ue_config_tester, when_config_is_empty_then_procedure_avoids_configuring_other_layers_and_returns_success)
 {
   // Start Procedure.
   f1ap_ue_context_update_request req = create_f1ap_ue_context_update_request(test_ue->ue_index, {}, {});
@@ -335,8 +335,8 @@ TEST_F(ue_config_tester, when_config_is_empty_then_procedure_avoids_configuring_
   // Procedure completes with failure.
   ASSERT_TRUE(proc.ready());
   f1ap_ue_context_update_response resp = proc.get();
-  ASSERT_FALSE(resp.result);
-  ASSERT_TRUE(resp.du_to_cu_rrc_container.empty());
+  ASSERT_TRUE(resp.result);
+  ASSERT_FALSE(resp.du_to_cu_rrc_container.empty());
   ASSERT_TRUE(resp.drbs_setup.empty());
   ASSERT_TRUE(resp.drbs_failed_to_setup.empty());
 }