From: subhash kumar singh <subh.singh@samsung.com>
Date: Wed, 6 Apr 2022 19:05:26 +0000 (+0000)
Subject: Fix invocation to generate setup message
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fe2-interface.git;a=commitdiff_plain;h=eef7c499d4674e016842c0691b46c6c6d15f48de

Fix invocation to generate setup message

Fix invocation to generate setup message.

Signed-off-by: subhash kumar singh <subh.singh@samsung.com>
Change-Id: Iebc38981b69410b981e830bc113cfe00e2f83ee5
---

diff --git a/e2sim/src/base/e2sim.cpp b/e2sim/src/base/e2sim.cpp
index a0dc723..3e17b76 100755
--- a/e2sim/src/base/e2sim.cpp
+++ b/e2sim/src/base/e2sim.cpp
@@ -160,8 +160,7 @@ int E2Sim::run_loop(int argc, char* argv[]){
   }
     
   printf("about to call setup request encode\n");
-  encoding::generate_e2apv2_config_update(pdu_setup);
-  // generate_e2apv1_setup_request_parameterized(pdu_setup, all_funcs);
+  generate_e2apv1_setup_request_parameterized(pdu_setup, all_funcs);
 
   printf("After generating e2setup req\n");
 
diff --git a/e2sim/src/encoding/encode_e2apv1.cpp b/e2sim/src/encoding/encode_e2apv1.cpp
index 47da01a..fa39dd5 100755
--- a/e2sim/src/encoding/encode_e2apv1.cpp
+++ b/e2sim/src/encoding/encode_e2apv1.cpp
@@ -159,9 +159,6 @@ void encoding::generate_e2apv1_service_update(E2AP_PDU_t *e2ap_pdu, std::vector<
 }
 
 void encoding::generate_e2apv1_setup_request_parameterized(E2AP_PDU_t *e2ap_pdu, std::vector<ran_func_info> all_funcs) {
-  //						 long ranFunctionId, uint8_t *ranFuncDescEncoded, int ranFuncLength) {
-
-  //  uint8_t *buf = (uint8_t *)"gnb1"
 
   BIT_STRING_t *gnb_bstring = (BIT_STRING_t*)calloc(1, sizeof(BIT_STRING_t));;
   gnb_bstring->buf = (uint8_t*)calloc(1,4);
@@ -211,15 +208,13 @@ void encoding::generate_e2apv1_setup_request_parameterized(E2AP_PDU_t *e2ap_pdu,
   if(globale2nodeid) free(globale2nodeid);
 
 
-  printf("seting up the tx id");
+  //seting tx id
   auto *e2txid = (E2setupRequestIEs_t *)calloc(1, sizeof(E2setupRequestIEs_t));
   e2txid->id = ProtocolIE_ID_id_TransactionID;
   e2txid-> criticality = 0;
   e2txid->value.present = E2setupRequestIEs__value_PR_TransactionID;
   e2txid->value.choice.TransactionID = 1;
 
-  printf("seting done the tx id");
-
   auto *ranFlistIEs = (E2setupRequestIEs_t *)calloc(1, sizeof(E2setupRequestIEs_t));
   ASN_STRUCT_RESET(asn_DEF_E2setupRequestIEs, ranFlistIEs);
   ranFlistIEs->criticality = 0;
@@ -263,7 +258,6 @@ e2configAdditionItem->value.present = E2nodeComponentConfigAddition_ItemIEs__val
 e2configAdditionItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentInterfaceType = E2nodeComponentInterfaceType_ng;
 e2configAdditionItem->value.choice.E2nodeComponentConfigAddition_Item.e2nodeComponentID.present = E2nodeComponentID_PR_e2nodeComponentInterfaceTypeNG;
 
-// E2nodeComponentInterfaceNG_t intfNG;
 auto *intfNG = (E2nodeComponentInterfaceNG_t *) calloc(1, sizeof(E2nodeComponentInterfaceNG_t));
   
 OCTET_STRING_t nginterf;