X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fxapp-asn%2Fe2ap%2Fsubscription_delete_response.cc;fp=src%2Fxapp-asn%2Fe2ap%2Fsubscription_delete_response.cc;h=249b3cd6c5fe543d3f0a1908bae7d5b122bca1a4;hb=0f5c234d5da8897f2f831e02ff03912e582ba6e9;hp=c1c166cdb5428197a540b2fb31fc4afef5002844;hpb=3baf0b7442b45212ad859904fb061c3de4daef69;p=ric-app%2Fhw.git diff --git a/src/xapp-asn/e2ap/subscription_delete_response.cc b/src/xapp-asn/e2ap/subscription_delete_response.cc index c1c166c..249b3cd 100644 --- a/src/xapp-asn/e2ap/subscription_delete_response.cc +++ b/src/xapp-asn/e2ap/subscription_delete_response.cc @@ -1,6 +1,6 @@ /* ================================================================================== - Copyright (c) 2018-2019 AT&T Intellectual Property. + Copyright (c) 2019-2020 AT&T Intellectual Property. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -28,23 +28,23 @@ not generate a response. Generating response however is included to support test subscription_delete_response::subscription_delete_response(void){ e2ap_pdu_obj = 0; - e2ap_pdu_obj = (E2N_E2AP_PDU_t *)calloc(1, sizeof(E2N_E2AP_PDU_t)); + e2ap_pdu_obj = (E2AP_PDU_t *)calloc(1, sizeof(E2AP_PDU_t)); assert(e2ap_pdu_obj != 0); successMsg = 0; - successMsg = (E2N_SuccessfulOutcome_t *)calloc(1, sizeof(E2N_SuccessfulOutcome_t)); + successMsg = (SuccessfulOutcome_t *)calloc(1, sizeof(SuccessfulOutcome_t)); assert(successMsg != 0); unsuccessMsg = 0; - unsuccessMsg = (E2N_UnsuccessfulOutcome_t *)calloc(1, sizeof(E2N_UnsuccessfulOutcome_t)); + unsuccessMsg = (UnsuccessfulOutcome_t *)calloc(1, sizeof(UnsuccessfulOutcome_t)); assert(unsuccessMsg != 0); IE_array = 0; - IE_array = (E2N_RICsubscriptionDeleteResponse_IEs_t *)calloc(NUM_SUBSCRIPTION_DELETE_RESPONSE_IES, sizeof(E2N_RICsubscriptionDeleteResponse_IEs_t)); + IE_array = (RICsubscriptionDeleteResponse_IEs_t *)calloc(NUM_SUBSCRIPTION_DELETE_RESPONSE_IES, sizeof(RICsubscriptionDeleteResponse_IEs_t)); assert(IE_array != 0); IE_Failure_array = 0; - IE_Failure_array = (E2N_RICsubscriptionDeleteFailure_IEs_t *)calloc(NUM_SUBSCRIPTION_DELETE_FAILURE_IES, sizeof(E2N_RICsubscriptionDeleteFailure_IEs_t)); + IE_Failure_array = (RICsubscriptionDeleteFailure_IEs_t *)calloc(NUM_SUBSCRIPTION_DELETE_FAILURE_IES, sizeof(RICsubscriptionDeleteFailure_IEs_t)); assert(IE_Failure_array != 0); @@ -53,18 +53,18 @@ subscription_delete_response::subscription_delete_response(void){ -// Clear assigned protocolIE list from E2N_RIC indication IE container +// Clear assigned protocolIE list from RIC indication IE container subscription_delete_response::~subscription_delete_response(void){ mdclog_write(MDCLOG_DEBUG, "Freeing subscription delete response memory"); - E2N_RICsubscriptionDeleteResponse_t * ric_subscription_delete_response = &(successMsg->value.choice.RICsubscriptionDeleteResponse); + RICsubscriptionDeleteResponse_t * ric_subscription_delete_response = &(successMsg->value.choice.RICsubscriptionDeleteResponse); for(unsigned int i = 0; i < ric_subscription_delete_response->protocolIEs.list.size ; i++){ ric_subscription_delete_response->protocolIEs.list.array[i] = 0; } - E2N_RICsubscriptionDeleteFailure_t * ric_subscription_failure = &(unsuccessMsg->value.choice.RICsubscriptionDeleteFailure); + RICsubscriptionDeleteFailure_t * ric_subscription_failure = &(unsuccessMsg->value.choice.RICsubscriptionDeleteFailure); for(unsigned int i = 0; i < ric_subscription_failure->protocolIEs.list.size; i++){ ric_subscription_failure->protocolIEs.list.array[i] = 0; } @@ -72,14 +72,14 @@ subscription_delete_response::~subscription_delete_response(void){ free(IE_array); free(IE_Failure_array); - ASN_STRUCT_FREE(asn_DEF_E2N_SuccessfulOutcome, successMsg); + ASN_STRUCT_FREE(asn_DEF_SuccessfulOutcome, successMsg); - ASN_STRUCT_FREE(asn_DEF_E2N_UnsuccessfulOutcome, unsuccessMsg); + ASN_STRUCT_FREE(asn_DEF_UnsuccessfulOutcome, unsuccessMsg); e2ap_pdu_obj->choice.successfulOutcome = NULL; e2ap_pdu_obj->choice.unsuccessfulOutcome = NULL; - ASN_STRUCT_FREE(asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj); + ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj); mdclog_write(MDCLOG_DEBUG, "Freed subscription delete response memory"); }; @@ -94,7 +94,7 @@ bool subscription_delete_response::encode_e2ap_subscription_delete_response(unsi if (!res){ return false; } - e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_successfulOutcome; + e2ap_pdu_obj->present = E2AP_PDU_PR_successfulOutcome; e2ap_pdu_obj->choice.successfulOutcome = successMsg; } else{ @@ -102,12 +102,12 @@ bool subscription_delete_response::encode_e2ap_subscription_delete_response(unsi if(! res){ return false; } - e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_unsuccessfulOutcome; + e2ap_pdu_obj->present = E2AP_PDU_PR_unsuccessfulOutcome; e2ap_pdu_obj->choice.unsuccessfulOutcome = unsuccessMsg; } - int ret_constr = asn_check_constraints(&asn_DEF_E2N_E2AP_PDU, (void *) e2ap_pdu_obj, errbuf, &errbuf_len); + int ret_constr = asn_check_constraints(&asn_DEF_E2AP_PDU, (void *) e2ap_pdu_obj, errbuf, &errbuf_len); if(ret_constr){ error_string.assign(errbuf, errbuf_len); return false; @@ -115,7 +115,7 @@ bool subscription_delete_response::encode_e2ap_subscription_delete_response(unsi //xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj); - asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj, buf, *size); + asn_enc_rval_t retval = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, e2ap_pdu_obj, buf, *size); if(retval.encoded == -1){ error_string.assign(strerror(errno)); @@ -137,7 +137,7 @@ bool subscription_delete_response::encode_e2ap_subscription_delete_response(unsi } -bool subscription_delete_response::set_fields(E2N_SuccessfulOutcome_t *success, subscription_response_helper &helper){ +bool subscription_delete_response::set_fields(SuccessfulOutcome_t *success, subscription_response_helper &helper){ if (success == 0){ error_string = "Invalid reference to success message in set fields subscription delete response"; @@ -146,31 +146,31 @@ bool subscription_delete_response::set_fields(E2N_SuccessfulOutcome_t *success, unsigned int ie_index; - success->procedureCode = E2N_ProcedureCode_id_ricSubscriptionDelete; - success->criticality = E2N_Criticality_reject; - success->value.present = E2N_SuccessfulOutcome__value_PR_RICsubscriptionDeleteResponse; + success->procedureCode = ProcedureCode_id_RICsubscriptionDelete; + success->criticality = Criticality_reject; + success->value.present = SuccessfulOutcome__value_PR_RICsubscriptionDeleteResponse; - E2N_RICsubscriptionDeleteResponse_t * subscription_delete_response = &(success->value.choice.RICsubscriptionDeleteResponse); + RICsubscriptionDeleteResponse_t * subscription_delete_response = &(success->value.choice.RICsubscriptionDeleteResponse); subscription_delete_response->protocolIEs.list.count = 0; ie_index = 0; - E2N_RICsubscriptionDeleteResponse_IEs_t *ies_ricreq = &IE_array[ie_index]; + RICsubscriptionDeleteResponse_IEs_t *ies_ricreq = &IE_array[ie_index]; - ies_ricreq->criticality = E2N_Criticality_reject; - ies_ricreq->id = E2N_ProtocolIE_ID_id_RICrequestID; - ies_ricreq->value.present = E2N_RICsubscriptionDeleteResponse_IEs__value_PR_RICrequestID; - E2N_RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID; + ies_ricreq->criticality = Criticality_reject; + ies_ricreq->id = ProtocolIE_ID_id_RICrequestID; + ies_ricreq->value.present = RICsubscriptionDeleteResponse_IEs__value_PR_RICrequestID; + RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID; ricrequest_ie->ricRequestorID = helper.get_request_id(); - ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq(); + //ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq(); ASN_SEQUENCE_ADD(&subscription_delete_response->protocolIEs, ies_ricreq); ie_index = 1; - E2N_RICsubscriptionDeleteResponse_IEs_t *ies_ranfunc = &IE_array[ie_index]; - ies_ranfunc->criticality = E2N_Criticality_reject; - ies_ranfunc->id = E2N_ProtocolIE_ID_id_RANfunctionID; - ies_ranfunc->value.present = E2N_RICsubscriptionDeleteResponse_IEs__value_PR_RANfunctionID; - E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID; + RICsubscriptionDeleteResponse_IEs_t *ies_ranfunc = &IE_array[ie_index]; + ies_ranfunc->criticality = Criticality_reject; + ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID; + ies_ranfunc->value.present = RICsubscriptionDeleteResponse_IEs__value_PR_RANfunctionID; + RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID; *ranfunction_ie = helper.get_function_id(); ASN_SEQUENCE_ADD(&subscription_delete_response->protocolIEs, ies_ranfunc); @@ -179,7 +179,7 @@ bool subscription_delete_response::set_fields(E2N_SuccessfulOutcome_t *success, } -bool subscription_delete_response:: get_fields(E2N_SuccessfulOutcome_t * success_msg, subscription_response_helper & dout) +bool subscription_delete_response:: get_fields(SuccessfulOutcome_t * success_msg, subscription_response_helper & dout) { if (success_msg == 0){ @@ -187,20 +187,20 @@ bool subscription_delete_response:: get_fields(E2N_SuccessfulOutcome_t * success return false; } - E2N_RICrequestID_t *requestid; - E2N_RANfunctionID_t * ranfunctionid; + RICrequestID_t *requestid; + RANfunctionID_t * ranfunctionid; for(int edx = 0; edx < success_msg->value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.count; edx++) { - E2N_RICsubscriptionDeleteResponse_IEs_t *memb_ptr = success_msg->value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.array[edx]; + RICsubscriptionDeleteResponse_IEs_t *memb_ptr = success_msg->value.choice.RICsubscriptionDeleteResponse.protocolIEs.list.array[edx]; switch(memb_ptr->id) { - case (E2N_ProtocolIE_ID_id_RICrequestID): + case (ProtocolIE_ID_id_RICrequestID): requestid = &memb_ptr->value.choice.RICrequestID; - dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber); + //dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber); break; - case (E2N_ProtocolIE_ID_id_RANfunctionID): + case (ProtocolIE_ID_id_RANfunctionID): ranfunctionid = &memb_ptr->value.choice.RANfunctionID; dout.set_function_id(*ranfunctionid); break; @@ -213,7 +213,7 @@ bool subscription_delete_response:: get_fields(E2N_SuccessfulOutcome_t * success } -bool subscription_delete_response::set_fields(E2N_UnsuccessfulOutcome_t *unsuccess, subscription_response_helper &helper){ +bool subscription_delete_response::set_fields(UnsuccessfulOutcome_t *unsuccess, subscription_response_helper &helper){ if (unsuccess == 0){ error_string = "Invalid reference to unsuccess message in set fields subscription delete response"; @@ -222,30 +222,30 @@ bool subscription_delete_response::set_fields(E2N_UnsuccessfulOutcome_t *unsucce unsigned int ie_index; - unsuccess->procedureCode = E2N_ProcedureCode_id_ricSubscriptionDelete; - unsuccess->criticality = E2N_Criticality_reject; - unsuccess->value.present = E2N_UnsuccessfulOutcome__value_PR_RICsubscriptionDeleteFailure; + unsuccess->procedureCode = ProcedureCode_id_RICsubscriptionDelete; + unsuccess->criticality = Criticality_reject; + unsuccess->value.present = UnsuccessfulOutcome__value_PR_RICsubscriptionDeleteFailure; - E2N_RICsubscriptionDeleteFailure_t * ric_subscription_failure = &(unsuccess->value.choice.RICsubscriptionDeleteFailure); + RICsubscriptionDeleteFailure_t * ric_subscription_failure = &(unsuccess->value.choice.RICsubscriptionDeleteFailure); ric_subscription_failure->protocolIEs.list.count = 0; ie_index = 0; - E2N_RICsubscriptionDeleteFailure_IEs_t *ies_ricreq = &IE_Failure_array[ie_index]; + RICsubscriptionDeleteFailure_IEs_t *ies_ricreq = &IE_Failure_array[ie_index]; - ies_ricreq->criticality = E2N_Criticality_reject; - ies_ricreq->id = E2N_ProtocolIE_ID_id_RICrequestID; - ies_ricreq->value.present = E2N_RICsubscriptionDeleteFailure_IEs__value_PR_RICrequestID; - E2N_RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID; + ies_ricreq->criticality = Criticality_reject; + ies_ricreq->id = ProtocolIE_ID_id_RICrequestID; + ies_ricreq->value.present = RICsubscriptionDeleteFailure_IEs__value_PR_RICrequestID; + RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID; ricrequest_ie->ricRequestorID = helper.get_request_id(); - ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq(); + //ricrequest_ie->ricRequestSequenceNumber = helper.get_req_seq(); ASN_SEQUENCE_ADD(&ric_subscription_failure->protocolIEs, ies_ricreq); ie_index = 1; - E2N_RICsubscriptionDeleteFailure_IEs_t *ies_ranfunc = &IE_Failure_array[ie_index]; - ies_ranfunc->criticality = E2N_Criticality_reject; - ies_ranfunc->id = E2N_ProtocolIE_ID_id_RANfunctionID; - ies_ranfunc->value.present = E2N_RICsubscriptionDeleteFailure_IEs__value_PR_RANfunctionID; - E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID; + RICsubscriptionDeleteFailure_IEs_t *ies_ranfunc = &IE_Failure_array[ie_index]; + ies_ranfunc->criticality = Criticality_reject; + ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID; + ies_ranfunc->value.present = RICsubscriptionDeleteFailure_IEs__value_PR_RANfunctionID; + RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID; *ranfunction_ie = helper.get_function_id(); ASN_SEQUENCE_ADD(&ric_subscription_failure->protocolIEs, ies_ranfunc); @@ -254,7 +254,7 @@ bool subscription_delete_response::set_fields(E2N_UnsuccessfulOutcome_t *unsucce } -bool subscription_delete_response:: get_fields(E2N_UnsuccessfulOutcome_t * unsuccess_msg, subscription_response_helper & dout) +bool subscription_delete_response:: get_fields(UnsuccessfulOutcome_t * unsuccess_msg, subscription_response_helper & dout) { if (unsuccess_msg == 0){ @@ -262,20 +262,20 @@ bool subscription_delete_response:: get_fields(E2N_UnsuccessfulOutcome_t * unsu return false; } - E2N_RICrequestID_t *requestid; - E2N_RANfunctionID_t * ranfunctionid; + RICrequestID_t *requestid; + RANfunctionID_t * ranfunctionid; for(int edx = 0; edx < unsuccess_msg->value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.count; edx++) { - E2N_RICsubscriptionDeleteFailure_IEs_t *memb_ptr = unsuccess_msg->value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.array[edx]; + RICsubscriptionDeleteFailure_IEs_t *memb_ptr = unsuccess_msg->value.choice.RICsubscriptionDeleteFailure.protocolIEs.list.array[edx]; switch(memb_ptr->id) { - case (E2N_ProtocolIE_ID_id_RICrequestID): + case (ProtocolIE_ID_id_RICrequestID): requestid = &memb_ptr->value.choice.RICrequestID; - dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber); + //dout.set_request(requestid->ricRequestorID, requestid->ricRequestSequenceNumber); break; - case (E2N_ProtocolIE_ID_id_RANfunctionID): + case (ProtocolIE_ID_id_RANfunctionID): ranfunctionid = &memb_ptr->value.choice.RANfunctionID; dout.set_function_id(*ranfunctionid); break;