Control Message Encode/Decode
[ric-app/hw.git] / src / xapp-asn / e2ap / subscription_response.cc
index 5308e81..5ed72fa 100644 (file)
@@ -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,32 +28,32 @@ not generate a response. Generating response however is included to support test
 subscription_response::subscription_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_RICsubscriptionResponse_IEs_t *)calloc(NUM_SUBSCRIPTION_RESPONSE_IES, sizeof(E2N_RICsubscriptionResponse_IEs_t));
+  IE_array = (RICsubscriptionResponse_IEs_t *)calloc(NUM_SUBSCRIPTION_RESPONSE_IES, sizeof(RICsubscriptionResponse_IEs_t));
   assert(IE_array != 0);
 
   IE_Failure_array = 0;
-  IE_Failure_array = (E2N_RICsubscriptionFailure_IEs_t *)calloc(NUM_SUBSCRIPTION_FAILURE_IES, sizeof(E2N_RICsubscriptionFailure_IEs_t));
+  IE_Failure_array = (RICsubscriptionFailure_IEs_t *)calloc(NUM_SUBSCRIPTION_FAILURE_IES, sizeof(RICsubscriptionFailure_IEs_t));
   assert(IE_Failure_array != 0);
 
   ie_admitted_list = 0;
-  ie_admitted_list = (E2N_RICaction_Admitted_ItemIEs_t *)calloc(INITIAL_RESPONSE_LIST_SIZE, sizeof(E2N_RICaction_Admitted_ItemIEs_t));
+  ie_admitted_list = (RICaction_Admitted_ItemIEs_t *)calloc(INITIAL_RESPONSE_LIST_SIZE, sizeof(RICaction_Admitted_ItemIEs_t));
   assert(ie_admitted_list != 0);
   ie_admitted_list_size = INITIAL_RESPONSE_LIST_SIZE;
   
   ie_not_admitted_list = 0;
-  ie_not_admitted_list = (E2N_RICaction_NotAdmitted_ItemIEs_t *)calloc(INITIAL_RESPONSE_LIST_SIZE, sizeof(E2N_RICaction_NotAdmitted_ItemIEs_t));
+  ie_not_admitted_list = (RICaction_NotAdmitted_ItemIEs_t *)calloc(INITIAL_RESPONSE_LIST_SIZE, sizeof(RICaction_NotAdmitted_ItemIEs_t));
   assert(ie_not_admitted_list != 0);
   ie_not_admitted_list_size = INITIAL_RESPONSE_LIST_SIZE;
 
@@ -69,7 +69,7 @@ subscription_response::subscription_response(void){
 subscription_response::~subscription_response(void){
 
   mdclog_write(MDCLOG_DEBUG, "Freeing subscription response memory");
-  E2N_RICaction_Admitted_List_t * response_admitted_list = (E2N_RICaction_Admitted_List_t *) &(IE_array[2].value.choice.RICaction_Admitted_List);
+  RICaction_Admitted_List_t * response_admitted_list = (RICaction_Admitted_List_t *) &(IE_array[2].value.choice.RICaction_Admitted_List);
   
   for(int i = 0; i < response_admitted_list->list.size; i++){
     response_admitted_list->list.array[i] = 0;
@@ -84,7 +84,7 @@ subscription_response::~subscription_response(void){
   }
 
   
-  E2N_RICaction_NotAdmitted_List_t * response_not_admitted_list = &(IE_array[3].value.choice.RICaction_NotAdmitted_List);
+  RICaction_NotAdmitted_List_t * response_not_admitted_list = &(IE_array[3].value.choice.RICaction_NotAdmitted_List);
   for(int i = 0; i < response_not_admitted_list->list.size; i++){
     response_not_admitted_list->list.array[i] = 0;
   }
@@ -96,7 +96,7 @@ subscription_response::~subscription_response(void){
     response_not_admitted_list->list.count = 0;
   }
      
-  E2N_RICsubscriptionResponse_t * ric_subscription_response = &(successMsg->value.choice.RICsubscriptionResponse);
+  RICsubscriptionResponse_t * ric_subscription_response = &(successMsg->value.choice.RICsubscriptionResponse);
   for(int i = 0; i < ric_subscription_response->protocolIEs.list.size ; i++){
     ric_subscription_response->protocolIEs.list.array[i] = 0;
   }
@@ -109,7 +109,7 @@ subscription_response::~subscription_response(void){
   }
   
   
-  E2N_RICaction_NotAdmitted_List_t * failure_not_admitted_list = &(IE_Failure_array[2].value.choice.RICaction_NotAdmitted_List);
+  RICaction_NotAdmitted_List_t * failure_not_admitted_list = &(IE_Failure_array[2].value.choice.RICaction_NotAdmitted_List);
   for(int i = 0; i < failure_not_admitted_list->list.size; i++){
     failure_not_admitted_list->list.array[i] = 0;
   }
@@ -122,7 +122,7 @@ subscription_response::~subscription_response(void){
   }
   
      
-  E2N_RICsubscriptionFailure_t * ric_subscription_failure = &(unsuccessMsg->value.choice.RICsubscriptionFailure);
+  RICsubscriptionFailure_t * ric_subscription_failure = &(unsuccessMsg->value.choice.RICsubscriptionFailure);
   for(int i = 0; i < ric_subscription_failure->protocolIEs.list.size; i++){
     ric_subscription_failure->protocolIEs.list.array[i] = 0;
   }
@@ -141,13 +141,13 @@ subscription_response::~subscription_response(void){
   free(IE_array);
 
   
-  ASN_STRUCT_FREE(asn_DEF_E2N_SuccessfulOutcome, successMsg);
-  ASN_STRUCT_FREE(asn_DEF_E2N_UnsuccessfulOutcome, unsuccessMsg);
+  ASN_STRUCT_FREE(asn_DEF_SuccessfulOutcome, successMsg);
+  ASN_STRUCT_FREE(asn_DEF_UnsuccessfulOutcome, unsuccessMsg);
 
   
   e2ap_pdu_obj->choice.initiatingMessage = NULL;
-  e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_NOTHING;
-  ASN_STRUCT_FREE(asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj);
+  e2ap_pdu_obj->present = E2AP_PDU_PR_NOTHING;
+  ASN_STRUCT_FREE(asn_DEF_E2AP_PDU, e2ap_pdu_obj);
 
   mdclog_write(MDCLOG_DEBUG, "Freed subscription response memory ");
 
@@ -160,35 +160,35 @@ bool subscription_response::encode_e2ap_subscription_response(unsigned char *buf
 
   if(is_success){
     set_fields_success(dinput);
-    e2ap_pdu_obj->present =  E2N_E2AP_PDU_PR_successfulOutcome;
+    e2ap_pdu_obj->present =  E2AP_PDU_PR_successfulOutcome;
     e2ap_pdu_obj->choice.successfulOutcome = successMsg;
 
-    successMsg->procedureCode = E2N_ProcedureCode_id_ricSubscription;
-    successMsg->criticality = E2N_Criticality_reject;
-    successMsg->value.present = E2N_SuccessfulOutcome__value_PR_RICsubscriptionResponse;   
+    successMsg->procedureCode = ProcedureCode_id_RICsubscription;
+    successMsg->criticality = Criticality_reject;
+    successMsg->value.present = SuccessfulOutcome__value_PR_RICsubscriptionResponse;
  
   }
   else{
     set_fields_unsuccess(dinput);
-    e2ap_pdu_obj->present = E2N_E2AP_PDU_PR_unsuccessfulOutcome;
+    e2ap_pdu_obj->present = E2AP_PDU_PR_unsuccessfulOutcome;
     e2ap_pdu_obj->choice.unsuccessfulOutcome = unsuccessMsg;
 
-    unsuccessMsg->procedureCode = E2N_ProcedureCode_id_ricSubscription;
-    unsuccessMsg->criticality = E2N_Criticality_reject;
-    unsuccessMsg->value.present = E2N_UnsuccessfulOutcome__value_PR_RICsubscriptionFailure;
+    unsuccessMsg->procedureCode = ProcedureCode_id_RICsubscription;
+    unsuccessMsg->criticality = Criticality_reject;
+    unsuccessMsg->value.present = UnsuccessfulOutcome__value_PR_RICsubscriptionFailure;
 
   }
     
   //xer_fprint(stdout, &asn_DEF_E2AP_PDU, e2ap_pdu_obj);
 
-  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);
     error_string = "Constraints failed for encoding subscription response. Reason = " + error_string;
     return false;
   }
     
-  asn_enc_rval_t res = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2N_E2AP_PDU, e2ap_pdu_obj, buf, *size);
+  asn_enc_rval_t res = asn_encode_to_buffer(0, ATS_ALIGNED_BASIC_PER, &asn_DEF_E2AP_PDU, e2ap_pdu_obj, buf, *size);
     
   if(res.encoded == -1){
     std::cout <<"Error encoding PDU. Reason =" << strerror(errno) << std::endl;
@@ -196,7 +196,7 @@ bool subscription_response::encode_e2ap_subscription_response(unsigned char *buf
   }
   else {
     if(*size < res.encoded){
-      fprintf(stderr,  "Buffer assigned too small to encode: %s",(char *)(asn_DEF_E2N_E2AP_PDU.name));
+      fprintf(stderr,  "Buffer assigned too small to encode: %s",(char *)(asn_DEF_E2AP_PDU.name));
       res.encoded = -1;
       return false;
     }
@@ -211,59 +211,59 @@ void subscription_response::set_fields_success(subscription_response_helper &hel
 
   int ie_index;
 
-  E2N_RICsubscriptionResponse_t * subscription_response = &(successMsg->value.choice.RICsubscriptionResponse);
+  RICsubscriptionResponse_t * subscription_response = &(successMsg->value.choice.RICsubscriptionResponse);
   //reset list count ..
   subscription_response->protocolIEs.list.count = 0;
     
   ie_index = 0;
-  E2N_RICsubscriptionResponse_IEs_t *ies_ricreq = &IE_array[ie_index];
+  RICsubscriptionResponse_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_RICsubscriptionResponse_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 = RICsubscriptionResponse_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_response->protocolIEs, &(IE_array[ie_index]));  
 
   
   ie_index = 1;
-  E2N_RICsubscriptionResponse_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_RICsubscriptionResponse_IEs__value_PR_RANfunctionID;
-  E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  RICsubscriptionResponse_IEs_t *ies_ranfunc = &IE_array[ie_index];
+  ies_ranfunc->criticality = Criticality_reject;
+  ies_ranfunc->id = ProtocolIE_ID_id_RANfunctionID;
+  ies_ranfunc->value.present = RICsubscriptionResponse_IEs__value_PR_RANfunctionID;
+  RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
   *ranfunction_ie = helper.get_function_id();
   ASN_SEQUENCE_ADD(&subscription_response->protocolIEs, &(IE_array[ie_index]));
 
   
   ie_index = 2;
-  E2N_RICsubscriptionResponse_IEs_t *ies_admitted_actid = &IE_array[ie_index];
-  ies_admitted_actid->criticality = E2N_Criticality_reject;
-  ies_admitted_actid->id = E2N_ProtocolIE_ID_id_RICactions_Admitted;
-  E2N_RICaction_Admitted_List_t *ric_admitted_actions_ie = &ies_admitted_actid->value.choice.RICaction_Admitted_List;
+  RICsubscriptionResponse_IEs_t *ies_admitted_actid = &IE_array[ie_index];
+  ies_admitted_actid->criticality = Criticality_reject;
+  ies_admitted_actid->id = ProtocolIE_ID_id_RICactions_Admitted;
+  RICaction_Admitted_List_t *ric_admitted_actions_ie = &ies_admitted_actid->value.choice.RICaction_Admitted_List;
   ric_admitted_actions_ie->list.count = 0;
   std::vector<ActionResponse> * ref_admitted_action_array = helper.get_admitted_list();  
 
   if(ref_admitted_action_array->size() ==  0){
-    ies_admitted_actid->value.present =  E2N_RICsubscriptionResponse_IEs__value_PR_NOTHING;
+    ies_admitted_actid->value.present =  RICsubscriptionResponse_IEs__value_PR_NOTHING;
   }
   else{  
-    ies_admitted_actid->value.present =  E2N_RICsubscriptionResponse_IEs__value_PR_RICaction_Admitted_List;
+    ies_admitted_actid->value.present =  RICsubscriptionResponse_IEs__value_PR_RICaction_Admitted_List;
 
     // resize memory ?
     if (ref_admitted_action_array->size() >= ie_admitted_list_size){
       ie_admitted_list_size = 2 * ref_admitted_action_array->size();
       free(ie_admitted_list);
-      ie_admitted_list = (E2N_RICaction_Admitted_ItemIEs_t *)calloc(ie_admitted_list_size, sizeof(E2N_RICaction_Admitted_ItemIEs_t));
+      ie_admitted_list = (RICaction_Admitted_ItemIEs_t *)calloc(ie_admitted_list_size, sizeof(RICaction_Admitted_ItemIEs_t));
       assert(ie_admitted_list != 0);
     };
   
 
     for(unsigned int i = 0; i < ref_admitted_action_array->size(); i ++){
-      ie_admitted_list[i].criticality = E2N_Criticality_ignore;
-      ie_admitted_list[i].id = E2N_ProtocolIE_ID_id_RICaction_Admitted_Item ;
-      ie_admitted_list[i].value.present = E2N_RICaction_Admitted_ItemIEs__value_PR_RICaction_Admitted_Item;
+      ie_admitted_list[i].criticality = Criticality_ignore;
+      ie_admitted_list[i].id = ProtocolIE_ID_id_RICaction_Admitted_Item ;
+      ie_admitted_list[i].value.present = RICaction_Admitted_ItemIEs__value_PR_RICaction_Admitted_Item;
       ie_admitted_list[i].value.choice.RICaction_Admitted_Item.ricActionID = (*ref_admitted_action_array)[i].get_id();
       ASN_SEQUENCE_ADD(ric_admitted_actions_ie, &(ie_admitted_list[i]));
     }
@@ -275,55 +275,55 @@ void subscription_response::set_fields_success(subscription_response_helper &hel
   std::vector<ActionResponse> * ref_notadmitted_action_array = helper.get_not_admitted_list();
   if (ref_notadmitted_action_array->size() > 0){
     
-    E2N_RICsubscriptionResponse_IEs_t *ies_notadmitted_actid = &IE_array[ie_index];
-    ies_notadmitted_actid->criticality = E2N_Criticality_reject;
-    ies_notadmitted_actid->id = E2N_ProtocolIE_ID_id_RICactions_NotAdmitted;
+    RICsubscriptionResponse_IEs_t *ies_notadmitted_actid = &IE_array[ie_index];
+    ies_notadmitted_actid->criticality = Criticality_reject;
+    ies_notadmitted_actid->id = ProtocolIE_ID_id_RICactions_NotAdmitted;
 
-    E2N_RICaction_NotAdmitted_List_t *ric_not_admitted_actions_ie = &ies_notadmitted_actid->value.choice.RICaction_NotAdmitted_List;
+    RICaction_NotAdmitted_List_t *ric_not_admitted_actions_ie = &ies_notadmitted_actid->value.choice.RICaction_NotAdmitted_List;
     ric_not_admitted_actions_ie->list.count = 0;
   
   
-    ies_notadmitted_actid->value.present =  E2N_RICsubscriptionResponse_IEs__value_PR_RICaction_NotAdmitted_List;
+    ies_notadmitted_actid->value.present =  RICsubscriptionResponse_IEs__value_PR_RICaction_NotAdmitted_List;
   
     // resize memory ?
     if (ref_notadmitted_action_array->size() >= ie_not_admitted_list_size){
       ie_not_admitted_list_size = 2 * ref_notadmitted_action_array->size();
       free(ie_not_admitted_list);
-      ie_not_admitted_list = (E2N_RICaction_NotAdmitted_ItemIEs_t *)calloc(ie_not_admitted_list_size, sizeof(E2N_RICaction_NotAdmitted_ItemIEs_t));
+      ie_not_admitted_list = (RICaction_NotAdmitted_ItemIEs_t *)calloc(ie_not_admitted_list_size, sizeof(RICaction_NotAdmitted_ItemIEs_t));
       assert(ie_not_admitted_list != 0);
     
     };
   
   
     for(unsigned int i = 0; i < ref_notadmitted_action_array->size(); i ++){
-      ie_not_admitted_list[i].criticality = E2N_Criticality_ignore;
-      ie_not_admitted_list[i].id = E2N_ProtocolIE_ID_id_RICaction_NotAdmitted_Item ;
-      ie_not_admitted_list[i].value.present = E2N_RICaction_NotAdmitted_ItemIEs__value_PR_RICaction_NotAdmitted_Item;;
+      ie_not_admitted_list[i].criticality = Criticality_ignore;
+      ie_not_admitted_list[i].id = ProtocolIE_ID_id_RICaction_NotAdmitted_Item ;
+      ie_not_admitted_list[i].value.present = RICaction_NotAdmitted_ItemIEs__value_PR_RICaction_NotAdmitted_Item;;
       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricActionID = (*ref_notadmitted_action_array)[i].get_id();
 
       int cause = (*ref_notadmitted_action_array)[i].get_cause();
       switch(cause){
-      case E2N_RICcause_PR_radioNetwork:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.radioNetwork = (*ref_notadmitted_action_array)[i].get_sub_cause();
+      case Cause_PR_ricService:
+       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.ricService = (*ref_notadmitted_action_array)[i].get_sub_cause();
        break;
-      case E2N_RICcause_PR_transport:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.transport = (*ref_notadmitted_action_array)[i].get_sub_cause();
+      case Cause_PR_transport:
+       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.transport = (*ref_notadmitted_action_array)[i].get_sub_cause();
        break;
-      case E2N_RICcause_PR_protocol:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.protocol= (*ref_notadmitted_action_array)[i].get_sub_cause();
+      case Cause_PR_protocol:
+       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.protocol= (*ref_notadmitted_action_array)[i].get_sub_cause();
        break;
-      case E2N_RICcause_PR_misc:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.misc = (*ref_notadmitted_action_array)[i].get_sub_cause();
+      case Cause_PR_misc:
+       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.misc = (*ref_notadmitted_action_array)[i].get_sub_cause();
        break;
-      case E2N_RICcause_PR_ric:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.ric = (*ref_notadmitted_action_array)[i].get_sub_cause();
+      case Cause_PR_ricRequest:
+       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.ricRequest = (*ref_notadmitted_action_array)[i].get_sub_cause();
        break;
       default:
        mdclog_write(MDCLOG_ERR, "Error :: %s, %d : Unknown RIC cause %d\n", __FILE__, __LINE__, cause);
        return;
       }
 
-      ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.present = (E2N_RICcause_PR)cause;      
+      ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.present = (Cause_PR)cause;
       ASN_SEQUENCE_ADD(ric_not_admitted_actions_ie, &(ie_not_admitted_list[i]));
     }
 
@@ -332,71 +332,71 @@ void subscription_response::set_fields_success(subscription_response_helper &hel
   
 }
 
-void subscription_response:: get_fields(E2N_SuccessfulOutcome_t * success_msg,  subscription_response_helper & dout)
+void subscription_response:: get_fields(SuccessfulOutcome_t * success_msg,  subscription_response_helper & dout)
 {
 
   assert(success_msg != NULL);
   
-  E2N_RICrequestID_t *requestid;
-  E2N_RANfunctionID_t * ranfunctionid;
-  E2N_RICaction_Admitted_List_t  * ric_admitted_action_list;
-  E2N_RICaction_NotAdmitted_List_t * ric_not_admitted_action_list;
+  RICrequestID_t *requestid;
+  RANfunctionID_t * ranfunctionid;
+  RICaction_Admitted_List_t  * ric_admitted_action_list;
+  RICaction_NotAdmitted_List_t * ric_not_admitted_action_list;
     
   for(int edx = 0; edx < success_msg->value.choice.RICsubscriptionResponse.protocolIEs.list.count; edx++) {
-    E2N_RICsubscriptionResponse_IEs_t *memb_ptr = success_msg->value.choice.RICsubscriptionResponse.protocolIEs.list.array[edx];
+    RICsubscriptionResponse_IEs_t *memb_ptr = success_msg->value.choice.RICsubscriptionResponse.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;
          
-      case (E2N_ProtocolIE_ID_id_RICactions_Admitted):
+      case (ProtocolIE_ID_id_RICactions_Admitted):
        ric_admitted_action_list = &memb_ptr->value.choice.RICaction_Admitted_List;
          
        // admitted actions
        for(int index = 0; index < ric_admitted_action_list->list.count; index ++){
-         E2N_RICaction_Admitted_ItemIEs_t * item = (E2N_RICaction_Admitted_ItemIEs_t *)ric_admitted_action_list->list.array[index];
+         RICaction_Admitted_ItemIEs_t * item = (RICaction_Admitted_ItemIEs_t *)ric_admitted_action_list->list.array[index];
          long int id = item->value.choice.RICaction_Admitted_Item.ricActionID;
          dout.get_admitted_list()->push_back(ActionResponse(id));
        };
 
        break;
 
-      case (E2N_ProtocolIE_ID_id_RICactions_NotAdmitted):
+      case (ProtocolIE_ID_id_RICactions_NotAdmitted):
        ric_not_admitted_action_list = &memb_ptr->value.choice.RICaction_NotAdmitted_List;
          
        for(int index = 0; index < ric_not_admitted_action_list->list.count; index ++){
-         E2N_RICaction_NotAdmitted_ItemIEs_t * item = (E2N_RICaction_NotAdmitted_ItemIEs_t *)ric_not_admitted_action_list->list.array[index];
+         RICaction_NotAdmitted_ItemIEs_t * item = (RICaction_NotAdmitted_ItemIEs_t *)ric_not_admitted_action_list->list.array[index];
          long int id = item->value.choice.RICaction_NotAdmitted_Item.ricActionID;
-         int cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.present;
+         int cause = item->value.choice.RICaction_NotAdmitted_Item.cause.present;
          int sub_cause;
          switch(cause){
              
-         case  E2N_RICcause_PR_radioNetwork :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.radioNetwork;
+         case  Cause_PR_ricService :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.ricService;
            break;
              
-         case E2N_RICcause_PR_transport :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.transport;
+         case Cause_PR_transport :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.transport;
            break;
              
-         case  E2N_RICcause_PR_protocol :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.protocol;
+         case  Cause_PR_protocol :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.protocol;
            break;
              
-         case E2N_RICcause_PR_misc :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.misc;
+         case Cause_PR_misc :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.misc;
            break;
              
-         case E2N_RICcause_PR_ric :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.ric;
+         case Cause_PR_ricRequest :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.ricRequest;
            break;
              
          default:
@@ -417,81 +417,81 @@ void subscription_response:: get_fields(E2N_SuccessfulOutcome_t * success_msg,
 void subscription_response::set_fields_unsuccess( subscription_response_helper &helper){
 
   int ie_index;
-  E2N_RICsubscriptionFailure_t * ric_subscription_failure = &(unsuccessMsg->value.choice.RICsubscriptionFailure);
+  RICsubscriptionFailure_t * ric_subscription_failure = &(unsuccessMsg->value.choice.RICsubscriptionFailure);
   // reset list count
   ric_subscription_failure->protocolIEs.list.count = 0;
   
   ie_index = 0;
-  E2N_RICsubscriptionFailure_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_RICsubscriptionFailure_IEs__value_PR_RICrequestID;
-  E2N_RICrequestID_t *ricrequest_ie = &ies_ricreq->value.choice.RICrequestID;
+  RICsubscriptionFailure_IEs_t *ies_ricreq = &IE_Failure_array[ie_index];
+  ies_ricreq->criticality = Criticality_reject;
+  ies_ricreq->id = ProtocolIE_ID_id_RICrequestID;
+  ies_ricreq->value.present = RICsubscriptionFailure_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, &(IE_Failure_array[ie_index]));  
   
   ie_index = 1;
-  E2N_RICsubscriptionFailure_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_RICsubscriptionFailure_IEs__value_PR_RANfunctionID;
-  E2N_RANfunctionID_t *ranfunction_ie = &ies_ranfunc->value.choice.RANfunctionID;
+  RICsubscriptionFailure_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 = RICsubscriptionFailure_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, &(IE_Failure_array[ie_index]));  
 
   ie_index = 2;
-  E2N_RICsubscriptionFailure_IEs_t *ies_notadmitted_actid = &IE_Failure_array[ie_index];
-  ies_notadmitted_actid->criticality = E2N_Criticality_reject;
-  ies_notadmitted_actid->id = E2N_ProtocolIE_ID_id_RICactions_NotAdmitted;
-  E2N_RICaction_NotAdmitted_List_t *ric_not_admitted_actions_ie = &ies_notadmitted_actid->value.choice.RICaction_NotAdmitted_List;
+  RICsubscriptionFailure_IEs_t *ies_notadmitted_actid = &IE_Failure_array[ie_index];
+  ies_notadmitted_actid->criticality = Criticality_reject;
+  ies_notadmitted_actid->id = ProtocolIE_ID_id_RICactions_NotAdmitted;
+  RICaction_NotAdmitted_List_t *ric_not_admitted_actions_ie = &ies_notadmitted_actid->value.choice.RICaction_NotAdmitted_List;
   ric_not_admitted_actions_ie->list.count = 0;   
   std::vector<ActionResponse> * ref_notadmitted_action_array = helper.get_not_admitted_list();  
   if(ref_notadmitted_action_array->size() == 0){
-    ies_notadmitted_actid->value.present =  E2N_RICsubscriptionFailure_IEs__value_PR_NOTHING;
+    ies_notadmitted_actid->value.present =  RICsubscriptionFailure_IEs__value_PR_NOTHING;
   }
   else{
-    ies_notadmitted_actid->value.present =  E2N_RICsubscriptionFailure_IEs__value_PR_RICaction_NotAdmitted_List;
+    ies_notadmitted_actid->value.present =  RICsubscriptionFailure_IEs__value_PR_RICaction_NotAdmitted_List;
 
     // resize memory  ?
     if (ref_notadmitted_action_array->size() >= ie_not_admitted_list_size){
       ie_not_admitted_list_size = 2 * ref_notadmitted_action_array->size();
       free(ie_not_admitted_list);
-      ie_not_admitted_list = (E2N_RICaction_NotAdmitted_ItemIEs_t *)calloc(ie_not_admitted_list_size, sizeof(E2N_RICaction_NotAdmitted_ItemIEs_t));
+      ie_not_admitted_list = (RICaction_NotAdmitted_ItemIEs_t *)calloc(ie_not_admitted_list_size, sizeof(RICaction_NotAdmitted_ItemIEs_t));
       assert(ie_not_admitted_list != 0);
     };
       
   
     // reset the list count on ricAction_ToBeSetup_List;
     for(unsigned int i = 0; i < ref_notadmitted_action_array->size(); i ++){
-      ie_not_admitted_list[i].criticality = E2N_Criticality_ignore;
-      ie_not_admitted_list[i].id = E2N_ProtocolIE_ID_id_RICaction_NotAdmitted_Item ;
-      ie_not_admitted_list[i].value.present = E2N_RICaction_NotAdmitted_ItemIEs__value_PR_RICaction_NotAdmitted_Item;;
+      ie_not_admitted_list[i].criticality = Criticality_ignore;
+      ie_not_admitted_list[i].id = ProtocolIE_ID_id_RICaction_NotAdmitted_Item ;
+      ie_not_admitted_list[i].value.present = RICaction_NotAdmitted_ItemIEs__value_PR_RICaction_NotAdmitted_Item;;
       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricActionID = (*ref_notadmitted_action_array)[i].get_id();
 
       int cause = (*ref_notadmitted_action_array)[i].get_cause();
       switch(cause){
-      case E2N_RICcause_PR_radioNetwork:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.radioNetwork = (*ref_notadmitted_action_array)[i].get_sub_cause();
-       break;
-      case E2N_RICcause_PR_transport:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.transport = (*ref_notadmitted_action_array)[i].get_sub_cause();
-       break;
-      case E2N_RICcause_PR_protocol:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.protocol= (*ref_notadmitted_action_array)[i].get_sub_cause();
-       break;
-      case E2N_RICcause_PR_misc:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.misc = (*ref_notadmitted_action_array)[i].get_sub_cause();
-       break;
-      case E2N_RICcause_PR_ric:
-       ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.choice.ric = (*ref_notadmitted_action_array)[i].get_sub_cause();
-       break;
+      case Cause_PR_ricService:
+         ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.ricService = (*ref_notadmitted_action_array)[i].get_sub_cause();
+         break;
+      case Cause_PR_transport:
+         ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.transport = (*ref_notadmitted_action_array)[i].get_sub_cause();
+         break;
+      case Cause_PR_protocol:
+         ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.protocol= (*ref_notadmitted_action_array)[i].get_sub_cause();
+         break;
+      case Cause_PR_misc:
+         ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.misc = (*ref_notadmitted_action_array)[i].get_sub_cause();
+         break;
+      case Cause_PR_ricRequest:
+         ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.choice.ricRequest = (*ref_notadmitted_action_array)[i].get_sub_cause();
+         break;
       default:
        mdclog_write(MDCLOG_ERR, "Error :: %s, %d : Unknown RIC cause %d\n", __FILE__, __LINE__, cause);
        return ;
       }
 
-      ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.ricCause.present = (E2N_RICcause_PR)cause;
+      ie_not_admitted_list[i].value.choice.RICaction_NotAdmitted_Item.cause.present = (Cause_PR)cause;
       
       ASN_SEQUENCE_ADD(ric_not_admitted_actions_ie, &(ie_not_admitted_list[i]));
     }
@@ -502,67 +502,67 @@ void subscription_response::set_fields_unsuccess( subscription_response_helper &
 
   // // criticality diagnostics is not generated/parsed currently since optional
   // i = 3;
-  // E2N_RICsubscriptionFailure_IEs_t *ies_criticality_diagnostics= &IE_Failure_array[i];
-  // ies_criticality_diagnostics->criticality = E2N_Criticality_ignore;
-  // ies_criticality_diagnostics->id = E2N_ProtocolIE_ID_id_CriticalityDiagnostics ;
-  // ies_criticality_diagnostics->value.present = E2N_RICsubscriptionFailure_IEs__value_PR_NOTHING;
+  // RICsubscriptionFailure_IEs_t *ies_criticality_diagnostics= &IE_Failure_array[i];
+  // ies_criticality_diagnostics->criticality = Criticality_ignore;
+  // ies_criticality_diagnostics->id = ProtocolIE_ID_id_CriticalityDiagnostics ;
+  // ies_criticality_diagnostics->value.present = RICsubscriptionFailure_IEs__value_PR_NOTHING;
 
     
 }
 
-void subscription_response:: get_fields(E2N_UnsuccessfulOutcome_t * unsuccess_msg,  subscription_response_helper & dout)
+void subscription_response:: get_fields(UnsuccessfulOutcome_t * unsuccess_msg,  subscription_response_helper & dout)
 {
 
   assert(unsuccess_msg != NULL);
   
-  E2N_RICrequestID_t *requestid;
-  E2N_RANfunctionID_t * ranfunctionid;
-  E2N_RICaction_NotAdmitted_List_t * ric_not_admitted_action_list;
+  RICrequestID_t *requestid;
+  RANfunctionID_t * ranfunctionid;
+  RICaction_NotAdmitted_List_t * ric_not_admitted_action_list;
     
   for(int edx = 0; edx < unsuccess_msg->value.choice.RICsubscriptionFailure.protocolIEs.list.count; edx++) {
-    E2N_RICsubscriptionFailure_IEs_t *memb_ptr = unsuccess_msg->value.choice.RICsubscriptionFailure.protocolIEs.list.array[edx];
+    RICsubscriptionFailure_IEs_t *memb_ptr = unsuccess_msg->value.choice.RICsubscriptionFailure.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;
          
 
-      case (E2N_ProtocolIE_ID_id_RICactions_NotAdmitted):
+      case (ProtocolIE_ID_id_RICactions_NotAdmitted):
        ric_not_admitted_action_list = &memb_ptr->value.choice.RICaction_NotAdmitted_List;
          
        for(int index = 0; index < ric_not_admitted_action_list->list.count; index ++){
-         E2N_RICaction_NotAdmitted_ItemIEs_t * item = (E2N_RICaction_NotAdmitted_ItemIEs_t *)ric_not_admitted_action_list->list.array[index];
+         RICaction_NotAdmitted_ItemIEs_t * item = (RICaction_NotAdmitted_ItemIEs_t *)ric_not_admitted_action_list->list.array[index];
          long int id = item->value.choice.RICaction_NotAdmitted_Item.ricActionID;
-         int cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.present;
+         int cause = item->value.choice.RICaction_NotAdmitted_Item.cause.present;
          int sub_cause;
          switch(cause){
              
-         case  E2N_RICcause_PR_radioNetwork :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.radioNetwork;
+         case  Cause_PR_ricService :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.ricService;
            break;
              
-         case E2N_RICcause_PR_transport :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.transport;
+         case Cause_PR_transport :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.transport;
            break;
              
-         case  E2N_RICcause_PR_protocol :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.protocol;
+         case  Cause_PR_protocol :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.protocol;
            break;
              
-         case E2N_RICcause_PR_misc :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.misc;
+         case Cause_PR_misc :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.misc;
            break;
              
-         case E2N_RICcause_PR_ric :
-           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.ricCause.choice.ric;
+         case Cause_PR_ricRequest :
+           sub_cause = item->value.choice.RICaction_NotAdmitted_Item.cause.choice.ricRequest;
            break;
              
          default: