cu-cp: refactor f1ap ue context setup procedure

Author: frankist

lib/f1ap/cu_cp/f1ap_asn1_helpers.h

@@ -25,315 +25,6 @@
 namespace srsran {
 namespace srs_cu_cp {
 
-/// \brief Convert the UE Context Setup Request from common type to ASN.1.
-/// \param[out] asn1_request The ASN.1 struct to store the result.
-/// \param[in] request The common type UE Context Setup Request.
-inline void fill_asn1_ue_context_setup_request(asn1::f1ap::ue_context_setup_request_s& asn1_request,
-                                               const f1ap_ue_context_setup_request&    request)
-{
-  // sp cell id
-  asn1_request->sp_cell_id = nr_cgi_to_f1ap_asn1(request.sp_cell_id);
-
-  // serv cell idx
-  asn1_request->serv_cell_idx = request.serv_cell_idx;
-
-  // sp cell ul cfg
-  if (request.sp_cell_ul_cfg.has_value()) {
-    asn1_request->sp_cell_ul_cfg = cell_ul_cfg_to_asn1(request.sp_cell_ul_cfg.value());
-  }
-
-  // cu to du rrc info
-  cu_to_du_rrc_info_to_asn1(asn1_request->cu_to_du_rrc_info, request.cu_to_du_rrc_info);
-
-  // candidate sp cell list
-  if (!request.candidate_sp_cell_list.empty()) {
-    asn1_request->candidate_sp_cell_list_present = true;
-    for (const auto& candidate_cell_item : request.candidate_sp_cell_list) {
-      asn1::protocol_ie_single_container_s<asn1::f1ap::candidate_sp_cell_item_ies_o> asn1_candidate_cell_item_container;
-      asn1_candidate_cell_item_container.load_info_obj(ASN1_F1AP_ID_CANDIDATE_SP_CELL_ITEM);
-
-      auto& asn1_candidate_cell_item = asn1_candidate_cell_item_container.value().candidate_sp_cell_item();
-      asn1_candidate_cell_item.candidate_sp_cell_id = nr_cgi_to_f1ap_asn1(candidate_cell_item.candidate_sp_cell_id);
-
-      asn1_request->candidate_sp_cell_list.push_back(asn1_candidate_cell_item_container);
-    }
-  }
-
-  // drx cycle
-  if (request.drx_cycle.has_value()) {
-    asn1_request->drx_cycle_present = true;
-    // long drx cycle len
-    asn1::number_to_enum(asn1_request->drx_cycle.long_drx_cycle_len, request.drx_cycle.value().long_drx_cycle_len);
-
-    // short drx cycle len
-    if (request.drx_cycle.value().short_drx_cycle_len.has_value()) {
-      asn1_request->drx_cycle.short_drx_cycle_len_present = true;
-      asn1::number_to_enum(asn1_request->drx_cycle.short_drx_cycle_len,
-                           request.drx_cycle.value().short_drx_cycle_len.value());
-    }
-
-    // short drx cycle timer
-    if (request.drx_cycle.value().short_drx_cycle_timer.has_value()) {
-      asn1_request->drx_cycle.short_drx_cycle_timer_present = true;
-      asn1_request->drx_cycle.short_drx_cycle_timer         = request.drx_cycle.value().short_drx_cycle_timer.value();
-    }
-  }
-
-  // res coordination transfer container
-  if (!request.res_coordination_transfer_container.empty()) {
-    asn1_request->res_coordination_transfer_container_present = true;
-    asn1_request->res_coordination_transfer_container         = request.res_coordination_transfer_container.copy();
-  }
-
-  // scell to be setup list
-  if (!request.scell_to_be_setup_list.empty()) {
-    asn1_request->scell_to_be_setup_list_present = true;
-
-    for (const auto& scell_to_be_setup_item : request.scell_to_be_setup_list) {
-      asn1::protocol_ie_single_container_s<asn1::f1ap::scell_to_be_setup_item_ies_o>
-          asn1_scell_to_be_setup_item_container;
-      asn1_scell_to_be_setup_item_container.load_info_obj(ASN1_F1AP_ID_SCELL_TO_BE_SETUP_ITEM);
-
-      auto& asn1_scell_to_be_setup_item = asn1_scell_to_be_setup_item_container.value().scell_to_be_setup_item();
-
-      f1ap_scell_to_be_setup_mod_item_to_asn1(asn1_scell_to_be_setup_item, scell_to_be_setup_item);
-      asn1_request->scell_to_be_setup_list.push_back(asn1_scell_to_be_setup_item_container);
-    }
-  }
-
-  // srbs to be setup list
-  if (!request.srbs_to_be_setup_list.empty()) {
-    asn1_request->srbs_to_be_setup_list_present = true;
-
-    for (const auto& srbs_to_be_setup_item : request.srbs_to_be_setup_list) {
-      asn1::protocol_ie_single_container_s<asn1::f1ap::srbs_to_be_setup_item_ies_o>
-          asn1_srbs_to_be_setup_item_container;
-      asn1_srbs_to_be_setup_item_container.set_item(ASN1_F1AP_ID_SRBS_TO_BE_SETUP_ITEM);
-      auto& asn1_srbs_to_be_setup_item = asn1_srbs_to_be_setup_item_container.value().srbs_to_be_setup_item();
-
-      f1ap_srbs_to_be_setup_mod_item_to_asn1(asn1_srbs_to_be_setup_item, srbs_to_be_setup_item);
-
-      asn1_request->srbs_to_be_setup_list.push_back(asn1_srbs_to_be_setup_item_container);
-    }
-  }
-
-  // drbs to be setup list
-  if (!request.drbs_to_be_setup_list.empty()) {
-    asn1_request->drbs_to_be_setup_list_present = true;
-
-    for (const auto& drb_to_be_setup_item : request.drbs_to_be_setup_list) {
-      asn1::protocol_ie_single_container_s<asn1::f1ap::drbs_to_be_setup_item_ies_o> asn1_drb_to_be_setup_item_container;
-      asn1_drb_to_be_setup_item_container.load_info_obj(ASN1_F1AP_ID_DRBS_TO_BE_SETUP_ITEM);
-
-      f1ap_drbs_to_be_setup_mod_item_to_asn1(asn1_drb_to_be_setup_item_container.value().drbs_to_be_setup_item(),
-                                             drb_to_be_setup_item);
-
-      asn1_request->drbs_to_be_setup_list.push_back(asn1_drb_to_be_setup_item_container);
-    }
-  }
-
-  // inactivity monitoring request
-  if (request.inactivity_monitoring_request.has_value()) {
-    asn1_request->inactivity_monitoring_request_present = true;
-    asn1::bool_to_enum(asn1_request->inactivity_monitoring_request, request.inactivity_monitoring_request.value());
-  }
-
-  // rat freq prio info
-  if (request.rat_freq_prio_info.has_value()) {
-    asn1_request->rat_freq_prio_info_present = true;
-    asn1_request->rat_freq_prio_info         = f1ap_rat_freq_prio_info_to_asn1(request.rat_freq_prio_info.value());
-  }
-
-  // rrc container
-  if (!request.rrc_container.empty()) {
-    asn1_request->rrc_container_present = true;
-    asn1_request->rrc_container         = request.rrc_container.copy();
-  }
-
-  // masked imeisv
-  if (request.masked_imeisv.has_value()) {
-    asn1_request->masked_imeisv_present = true;
-    asn1_request->masked_imeisv.from_number(request.masked_imeisv.value());
-  }
-
-  // serving plmn
-  if (request.serving_plmn.has_value()) {
-    asn1_request->serving_plmn_present = true;
-    asn1_request->serving_plmn.from_string(request.serving_plmn.value());
-  }
-
-  // gnb du ue ambr ul
-  if (request.gnb_du_ue_ambr_ul.has_value()) {
-    asn1_request->gnb_du_ue_ambr_ul_present = true;
-    asn1_request->gnb_du_ue_ambr_ul         = request.gnb_du_ue_ambr_ul.value();
-  }
-
-  // rrc delivery status request
-  if (request.rrc_delivery_status_request.has_value()) {
-    asn1_request->rrc_delivery_status_request_present = true;
-    asn1::bool_to_enum(asn1_request->rrc_delivery_status_request, request.rrc_delivery_status_request.value());
-  }
-
-  // res coordination transfer info
-  if (request.res_coordination_transfer_info.has_value()) {
-    asn1_request->res_coordination_transfer_info_present                                  = true;
-    asn1_request->res_coordination_transfer_info.res_coordination_eutra_cell_info_present = false;
-    asn1_request->res_coordination_transfer_info.m_enb_cell_id.from_number(
-        request.res_coordination_transfer_info.value().m_enb_cell_id);
-  }
-
-  // serving cell mo
-  if (request.serving_cell_mo.has_value()) {
-    asn1_request->serving_cell_mo_present = true;
-    asn1_request->serving_cell_mo         = request.serving_cell_mo.value();
-  }
-
-  // new gnb cu ue f1ap id
-  if (request.new_gnb_cu_ue_f1ap_id.has_value()) {
-    asn1_request->new_gnb_cu_ue_f1ap_id_present = true;
-    asn1_request->new_gnb_cu_ue_f1ap_id         = gnb_cu_ue_f1ap_id_to_uint(request.new_gnb_cu_ue_f1ap_id.value());
-  }
-
-  // ran ue id
-  if (request.ran_ue_id.has_value()) {
-    asn1_request->ran_ue_id_present = true;
-    asn1_request->ran_ue_id.from_number(ran_ue_id_to_uint(request.ran_ue_id.value()));
-  }
-}
-
-/// \brief Convert the UE Context Setup Response from ASN.1 to common type.
-/// \param[out] response  The common type struct to store the result.
-/// \param[in] asn1_response The ASN.1 UE Context Setup Response.
-
-inline void fill_f1ap_ue_context_setup_response(f1ap_ue_context_setup_response&            response,
-                                                ue_index_t                                 ue_index,
-                                                const asn1::f1ap::ue_context_setup_resp_s& asn1_response)
-{
-  response.success  = true;
-  response.ue_index = ue_index;
-
-  // du to cu rrc info
-  response.du_to_cu_rrc_info.cell_group_cfg      = asn1_response->du_to_cu_rrc_info.cell_group_cfg.copy();
-  response.du_to_cu_rrc_info.meas_gap_cfg        = asn1_response->du_to_cu_rrc_info.meas_gap_cfg.copy();
-  response.du_to_cu_rrc_info.requested_p_max_fr1 = asn1_response->du_to_cu_rrc_info.requested_p_max_fr1.copy();
-
-  // c rnti
-  if (asn1_response->c_rnti_present) {
-    response.c_rnti = to_rnti(asn1_response->c_rnti);
-  }
-
-  // res coordination transfer container
-  if (asn1_response->res_coordination_transfer_container_present) {
-    response.res_coordination_transfer_container = asn1_response->res_coordination_transfer_container.copy();
-  }
-
-  // full cfg
-  if (asn1_response->full_cfg_present) {
-    response.full_cfg = asn1::enum_to_bool(asn1_response->full_cfg);
-  }
-
-  // drbs setup list
-  if (asn1_response->drbs_setup_list_present) {
-    for (auto asn1_drbs_setup_list_item : asn1_response->drbs_setup_list) {
-      auto& asn1_drb_mod_item = asn1_drbs_setup_list_item.value().drbs_setup_item();
-
-      f1ap_drbs_setup_mod_item drb_setup_item = asn1_to_f1ap_drbs_setup_mod_item(asn1_drb_mod_item);
-
-      response.drbs_setup_list.emplace(drb_setup_item.drb_id, drb_setup_item);
-    }
-  }
-
-  // srbs failed to be setup list
-  if (asn1_response->srbs_failed_to_be_setup_list_present) {
-    for (auto asn1_srbs_failed_setup_list_item : asn1_response->srbs_failed_to_be_setup_list) {
-      auto& asn1_srb_failed_item = asn1_srbs_failed_setup_list_item.value().srbs_failed_to_be_setup_item();
-
-      f1ap_srbs_failed_to_be_setup_mod_item srb_failed_item =
-          asn1_to_f1ap_srbs_failed_to_be_setup_mod_item(asn1_srb_failed_item);
-
-      response.srbs_failed_to_be_setup_list.emplace(srb_failed_item.srb_id, srb_failed_item);
-    }
-  }
-
-  // drbs failed to be setup list
-  if (asn1_response->drbs_failed_to_be_setup_list_present) {
-    for (auto asn1_drbs_failed_setup_list_item : asn1_response->drbs_failed_to_be_setup_list) {
-      auto& asn1_drb_failed_item = asn1_drbs_failed_setup_list_item.value().drbs_failed_to_be_setup_item();
-
-      f1ap_drbs_failed_to_be_setup_mod_item drb_failed_item =
-          asn1_to_f1ap_drbs_failed_to_be_setup_mod_item(asn1_drb_failed_item);
-
-      response.drbs_failed_to_be_setup_list.emplace(drb_failed_item.drb_id, drb_failed_item);
-    }
-  }
-
-  // scell failed to setup list
-  if (asn1_response->scell_failedto_setup_list_present) {
-    for (const auto& asn1_scell_failed_to_setup_item : asn1_response->scell_failedto_setup_list) {
-      f1ap_scell_failed_to_setup_mod_item scell_failed_to_setup_item;
-
-      // scell id
-      scell_failed_to_setup_item.scell_id =
-          f1ap_asn1_to_nr_cgi(asn1_scell_failed_to_setup_item->scell_failedto_setup_item().scell_id);
-
-      // cause
-      if (asn1_scell_failed_to_setup_item->scell_failedto_setup_item().cause_present) {
-        scell_failed_to_setup_item.cause =
-            f1ap_asn1_to_cause(asn1_scell_failed_to_setup_item->scell_failedto_setup_item().cause);
-      }
-
-      response.scell_failed_to_setup_list.push_back(scell_failed_to_setup_item);
-    }
-  }
-
-  // Add inactivity monitoring response
-  if (asn1_response->inactivity_monitoring_resp_present) {
-    bool inactivity_monitoring_resp     = asn1::enum_to_bool(asn1_response->inactivity_monitoring_resp);
-    response.inactivity_monitoring_resp = inactivity_monitoring_resp;
-  }
-
-  // srbs setup list
-  if (asn1_response->srbs_setup_list_present) {
-    for (auto asn1_srbs_setup_list_item : asn1_response->srbs_setup_list) {
-      auto& asn1_srbs_setup_item = asn1_srbs_setup_list_item.value().srbs_setup_item();
-
-      f1ap_srbs_setup_mod_item srbs_setup_item = asn1_to_f1ap_srbs_setup_mod_item(asn1_srbs_setup_item);
-
-      response.srbs_setup_list.emplace(srbs_setup_item.srb_id, srbs_setup_item);
-    }
-  }
-}
-
-/// \brief Convert the UE Context Setup Response from ASN.1 to common type.
-/// \param[out] response  The common type struct to store the result.
-/// \param[in] asn1_failure The ASN.1 UE Context Setup Failure.
-
-inline void fill_f1ap_ue_context_setup_response(f1ap_ue_context_setup_response&            response,
-                                                const asn1::f1ap::ue_context_setup_fail_s& asn1_failure)
-{
-  response.success = false;
-
-  // cause
-  response.cause = f1ap_asn1_to_cause(asn1_failure->cause);
-
-  // potential sp cell list
-  if (asn1_failure->potential_sp_cell_list_present) {
-    f1ap_potential_sp_cell_item potential_sp_cell_item;
-
-    for (const auto& asn1_potential_sp_cell_item : asn1_failure->potential_sp_cell_list) {
-      potential_sp_cell_item.potential_sp_cell_id =
-          f1ap_asn1_to_nr_cgi(asn1_potential_sp_cell_item->potential_sp_cell_item().potential_sp_cell_id);
-
-      response.potential_sp_cell_list.push_back(potential_sp_cell_item);
-    }
-  }
-
-  // crit diagnostics
-  if (asn1_failure->crit_diagnostics_present) {
-    // TODO: Add crit diagnostics
-  }
-}
-
 /// \brief Convert the UE Context Modification Request from common type to ASN.1.
 /// \param[out] asn1_request The ASN.1 struct to store the result.
 /// \param[in] request The common type UE Context Modification Request.