e2ap: change generate_subscription_delete_response signature

master
Piotr Gawlowicz 2 years ago committed by Justin Tallon
parent 0c7d499250
commit 15d3cc54bd

@ -57,8 +57,7 @@ public:
int process_subscription_request(ricsubscription_request_s subscription_request); int process_subscription_request(ricsubscription_request_s subscription_request);
e2_ap_pdu_c generate_subscription_response(ric_subscription_reponse_t ric_subscription_reponse); e2_ap_pdu_c generate_subscription_response(ric_subscription_reponse_t ric_subscription_reponse);
e2_ap_pdu_c generate_subscription_failure(ric_subscription_reponse_t ric_subscription_reponse); e2_ap_pdu_c generate_subscription_failure(ric_subscription_reponse_t ric_subscription_reponse);
e2_ap_pdu_c e2_ap_pdu_c generate_subscription_delete_response(ric_subscription_reponse_t ric_subscription_reponse);
generate_subscription_delete_response(uint32_t ric_requestor_id, uint32_t ric_instance_id, uint32_t ra_nfunction_id);
e2_ap_pdu_c generate_indication(ric_indication_t& ric_indication); e2_ap_pdu_c generate_indication(ric_indication_t& ric_indication);
e2_ap_pdu_c generate_reset_request(); e2_ap_pdu_c generate_reset_request();
e2_ap_pdu_c generate_reset_response(); e2_ap_pdu_c generate_reset_response();

@ -135,9 +135,7 @@ e2_ap_pdu_c e2ap::generate_subscription_failure(ric_subscription_reponse_t ric_s
return pdu; return pdu;
} }
e2_ap_pdu_c e2ap::generate_subscription_delete_response(uint32_t ric_requestor_id, e2_ap_pdu_c e2ap::generate_subscription_delete_response(ric_subscription_reponse_t ric_subscription_reponse)
uint32_t ric_instance_id,
uint32_t ra_nfunction_id)
{ {
e2_ap_pdu_c pdu; e2_ap_pdu_c pdu;
successful_outcome_s& success = pdu.set_successful_outcome(); successful_outcome_s& success = pdu.set_successful_outcome();
@ -146,11 +144,11 @@ e2_ap_pdu_c e2ap::generate_subscription_delete_response(uint32_t ric_requestor_i
ricsubscription_delete_resp_s& sub_resp = success.value.ricsubscription_delete_resp(); ricsubscription_delete_resp_s& sub_resp = success.value.ricsubscription_delete_resp();
sub_resp->ri_crequest_id.crit = asn1::crit_opts::reject; sub_resp->ri_crequest_id.crit = asn1::crit_opts::reject;
sub_resp->ri_crequest_id->ric_requestor_id = ric_requestor_id; sub_resp->ri_crequest_id->ric_requestor_id = ric_subscription_reponse.ric_requestor_id;
sub_resp->ri_crequest_id->ric_instance_id = ric_instance_id; sub_resp->ri_crequest_id->ric_instance_id = ric_subscription_reponse.ric_instance_id;
sub_resp->ra_nfunction_id.crit = asn1::crit_opts::reject; sub_resp->ra_nfunction_id.crit = asn1::crit_opts::reject;
sub_resp->ra_nfunction_id->value = ra_nfunction_id; sub_resp->ra_nfunction_id->value = ric_subscription_reponse.ra_nfunction_id;
return pdu; return pdu;
} }

@ -135,8 +135,11 @@ void ric_client::ric_subscription::delete_subscription()
} }
parent->logger.debug("Send RIC Subscription Delete Response to RIC Requestor ID: %i\n", ric_requestor_id); parent->logger.debug("Send RIC Subscription Delete Response to RIC Requestor ID: %i\n", ric_requestor_id);
e2_ap_pdu_c send_pdu = ric_subscription_reponse_t ric_subscription_reponse;
parent->e2ap_.generate_subscription_delete_response(ric_requestor_id, ric_instance_id, ra_nfunction_id); ric_subscription_reponse.ric_requestor_id = ric_requestor_id;
ric_subscription_reponse.ric_instance_id = ric_instance_id;
ric_subscription_reponse.ra_nfunction_id = ra_nfunction_id;
e2_ap_pdu_c send_pdu = parent->e2ap_.generate_subscription_delete_response(ric_subscription_reponse);
parent->queue_send_e2ap_pdu(send_pdu); parent->queue_send_e2ap_pdu(send_pdu);
} }

Loading…
Cancel
Save