Merge "Renaming GET_UE_IDX to GET_UE_ID in 5gnrmac [Issue-ID: ODUHIGH-401]"

diff --git a/container-tag.yaml b/container-tag.yaml
index 3188b04..923922c 100644 (file)
--- a/container-tag.yaml
+++ b/container-tag.yaml
@@ -1,4 +1,4 @@
 # The Jenkins job requires a tag to build the Docker image.
 # Global-JJB script assumes this file is in the repo root.
 ---
-tag: 5.0.1
+tag: 5.0.2

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 990ab0b..60bdf1c 100644 (file)
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -66,17 +66,17 @@ II. Execution - Using Docker Images
 The call flow between O-DU High and CU Stub can be achieved by executing docker containers.
 
 - Pull the last built docker images:
-    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2:3.0.1
-    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:3.0.1
+    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2:5.0.2
+    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:5.0.2
 
 - Run CU Stub docker:
     - docker run -it --privileged --net=host --entrypoint bash
-      nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:3.0.1   
+      nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:5.0.2   
     - ./cu_stub
 
 - Run ODU docker:
     - docker run -it --privileged --net=host --entrypoint bash
-      nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2:3.0.1   
+      nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2:5.0.2   
     - ./odu
 
 

diff --git a/releases/container-release-o-du-l2 b/releases/container-release-o-du-l2
index 8595a98..fba5498 100644 (file)
--- a/releases/container-release-o-du-l2
+++ b/releases/container-release-o-du-l2
@@ -1,11 +1,11 @@
 ---
 
 distribution_type: container
-container_release_tag: 5.0.1
+container_release_tag: 5.0.2
 container_pull_registry: nexus.o-ran-sc.org:10004
 container_push_registry: nexus.o-ran-sc.org:10002
 project: o-du-l2 
-ref: ec08d32ee77d73819a994c72870a8358b8a1d2c0
+ref: ce3e8c4b7bbfbcdf99c15f4d7932b5cdded77c44
 containers:
 - name: o-du-l2
-version: 5.0.1
+version: 5.0.2

diff --git a/releases/container-release-o-du-l2-cu-stub b/releases/container-release-o-du-l2-cu-stub
index 73d9c71..b3ecf6c 100644 (file)
--- a/releases/container-release-o-du-l2-cu-stub
+++ b/releases/container-release-o-du-l2-cu-stub
@@ -1,11 +1,11 @@
 ---
 
 distribution_type: container
-container_release_tag: 5.0.1
+container_release_tag: 5.0.2
 container_pull_registry: nexus.o-ran-sc.org:10004
 container_push_registry: nexus.o-ran-sc.org:10002
 project: o-du-l2 
-ref: ec08d32ee77d73819a994c72870a8358b8a1d2c0
+ref: ce3e8c4b7bbfbcdf99c15f4d7932b5cdded77c44
 containers:
 - name: o-du-l2-cu-stub
-version: 5.0.1
+version: 5.0.2

diff --git a/src/cu_stub/cu_stub_egtp.c b/src/cu_stub/cu_stub_egtp.c
index 65f19a2..cb3c5c8 100644 (file)
--- a/src/cu_stub/cu_stub_egtp.c
+++ b/src/cu_stub/cu_stub_egtp.c
@@ -616,6 +616,8 @@ S16 cuEgtpDecodeHdr(Buffer *mBuf)
    DU_LOG("\nDEBUG  -->  EGTP : Message Buffer after decoding header [TEID:%d]",egtpMsg.msgHdr.teId);
    ODU_PRINT_MSG(mBuf, 0, 0);
 
+   SPutMsg(mBuf);
+
    return ROK;
      
 } /* End of cuEgtpDecodeHdr */

diff --git a/src/cu_stub/cu_stub_sctp.c b/src/cu_stub/cu_stub_sctp.c
index 39874f6..fc0fe3b 100644 (file)
--- a/src/cu_stub/cu_stub_sctp.c
+++ b/src/cu_stub/cu_stub_sctp.c
@@ -404,6 +404,7 @@ S16 sctpSockPoll()
    CmInetAddr    egtpFromAddr;
    CmInetMemInfo memInfo;
    sctpSockPollParams f1PollParams;
+   uint64_t      numMsgRcvd = 0;
 
    memset(&f1PollParams, 0, sizeof(sctpSockPollParams));
     
@@ -438,8 +439,9 @@ S16 sctpSockPoll()
       ret = cmInetRecvMsg(&(egtpCb.recvTptSrvr.sockFd), &egtpFromAddr, &memInfo, &egtpBuf, &egtpBufLen, CM_INET_NO_FLAG);
       if(ret == ROK && egtpBuf != NULLP)
       {
-         DU_LOG("\nINFO  -->  EGTP : Received message \n");
-         ODU_PRINT_MSG(egtpBuf, 0 ,0);
+         DU_LOG("\nINFO  -->  EGTP : Received UL Message [%ld]\n", numMsgRcvd+1);
+         numMsgRcvd++;
+         //ODU_PRINT_MSG(egtpBuf, 0 ,0);
          cuEgtpHdlRecvMsg(egtpBuf);
 
       }

diff --git a/src/du_app/du_egtp.c b/src/du_app/du_egtp.c
index 075cd7c..76ec0cf 100644 (file)
--- a/src/du_app/du_egtp.c
+++ b/src/du_app/du_egtp.c
@@ -29,8 +29,6 @@
 #include "du_egtp.h"
 #include "du_utils.h"
 
-/* Global variable declaration */
-EgtpGlobalCb egtpCb;
 
 /**************************************************************************
  * @brief Task Initiation callback function. 
@@ -874,6 +872,7 @@ uint8_t egtpSendMsg(Buffer *mBuf)
    uint16_t       txLen;
    CmInetMemInfo  info;
    CmInetAddr     dstAddr;
+   static uint64_t numDataSent = 0;
 
    info.region = DU_APP_MEM_REGION;
    info.pool = DU_POOL;
@@ -888,6 +887,11 @@ uint8_t egtpSendMsg(Buffer *mBuf)
       DU_LOG("\nERROR  -->  EGTP : Failed sending the message");
       return RFAILED;
    }
+   else
+   {
+      DU_LOG("\nDEBUG -->  EGTP : Sent UL Message [%ld]", numDataSent+1);
+      numDataSent++;
+   }
 
    return ROK;
 }

diff --git a/src/du_app/du_egtp.h b/src/du_app/du_egtp.h
index 5fb3d65..2f158e2 100644 (file)
--- a/src/du_app/du_egtp.h
+++ b/src/du_app/du_egtp.h
@@ -72,6 +72,7 @@ typedef struct egtpGlobalCb
    EgtpTptSrvr  recvTptSrvr;     /* Transport server for receiving UDP msg */
    EgtpDstCb    dstCb;           /* Destination endpoint */
 }EgtpGlobalCb;
+
 EgtpGlobalCb egtpCb;   /* EGTP global control block */
 
 uint8_t duHdlEgtpDlData(EgtpMsg  *egtpMsg);

diff --git a/src/phy_stub/phy_stub.h b/src/phy_stub/phy_stub.h
index 6ee1a8f..ffa77bc 100644 (file)
--- a/src/phy_stub/phy_stub.h
+++ b/src/phy_stub/phy_stub.h
@@ -26,7 +26,7 @@
 #define NR_PCI            1
 #define SLOT_DELAY       3
 #define NUM_DRB_TO_PUMP_DATA  3
-#define NUM_UL_PACKETS   4
+#define NUM_UL_PACKETS   1
 /*UE Ids for RACH IND*/
 #define UE_IDX_0     0
 #define UE_IDX_1     1