Merge "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-469] Chnages in Drx-config asn structu...

diff --git a/container-tag.yaml b/container-tag.yaml
index 9506801..fe0dfef 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: 6.0.3
+tag: 6.0.4

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 2e40e20..015ecd4 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -181,8 +181,8 @@ F release
 |                                      |                                      |   
 +--------------------------------------+--------------------------------------+
 | **Repo/commit-ID**                   |o-du/l2/                              |
-|                                      |I5166fb1b6f04ed7e7d40344b21b0633259a  |
-|                                      |26660                                 |
+|                                      |Ice63cef7030a5c08820bcced7ea06467e2c88|
+|                                      |20b                                   |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 | **Release designation**              | F release                            |

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index a73501c..18dac0e 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:6.0.3
-    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:6.0.3
+    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2:6.0.4
+    -  docker pull nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:6.0.4
 
 - 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:6.0.3
+      nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2-cu-stub:6.0.4
     - ./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:6.0.3
+      nexus3.o-ran-sc.org:10004/o-ran-sc/o-du-l2:6.0.4
     - ./odu
 
 

diff --git a/releases/container-release-o-du-l2 b/releases/container-release-o-du-l2
index a7e43b0..6a3e81e 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: 6.0.3
+container_release_tag: 6.0.4
 container_pull_registry: nexus.o-ran-sc.org:10004
 container_push_registry: nexus.o-ran-sc.org:10002
 project: o-du-l2 
-ref: c15c9bf54ea369c1281d4f75967b5cd71c2c3bb8
+ref: 7411f9b1a209bfc448ee27daacd5fa7fd51de301 
 containers:
 - name: o-du-l2
-version: 6.0.3
+version: 6.0.4

diff --git a/releases/container-release-o-du-l2-cu-stub b/releases/container-release-o-du-l2-cu-stub
index 23971eb..0a27a7c 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: 6.0.3
+container_release_tag: 6.0.4
 container_pull_registry: nexus.o-ran-sc.org:10004
 container_push_registry: nexus.o-ran-sc.org:10002
 project: o-du-l2 
-ref: c15c9bf54ea369c1281d4f75967b5cd71c2c3bb8
+ref: 7411f9b1a209bfc448ee27daacd5fa7fd51de301 
 containers:
 - name: o-du-l2-cu-stub
-version: 6.0.3
+version: 6.0.4

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c
index 4e02054..bc765bc 100644 (file)
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@ -11517,13 +11517,11 @@ void procF1SetupReq(uint32_t *destDuId, F1AP_PDU_t *f1apMsg)
               if(duDb == NULLP)
               {
                  duDb = &cuCb.duInfo[cuCb.numDu];
-                 memset(duDb, 0, sizeof(DuDb));
-                 duDb->duId = duId;
                  cuCb.numDu++;
-                 *destDuId = duId;
               }
-              else
-                 return;
+              memset(duDb, 0, sizeof(DuDb));
+              duDb->duId = duId;
+              *destDuId = duId;
               break;
            }
          case ProtocolIE_ID_id_gNB_DU_Name:

diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c
index 2be3a45..d46ae04 100644 (file)
--- a/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@ -160,6 +160,18 @@ void readCuCfg()
    cuCb.cuCfgParams.sctpParams.sctpAssoc[0].duPort = g_cfg.DU_Port;
    cuCb.cuCfgParams.sctpParams.sctpAssoc[0].cuPort = g_cfg.CU_Port; 
    cuCb.cuCfgParams.sctpParams.numDu = 1;
+   
+   cuCb.cuCfgParams.egtpParams.egtpAssoc[0].localIp.ipV4Pres = TRUE;
+   cuCb.cuCfgParams.egtpParams.egtpAssoc[0].localIp.ipV4Addr = ipv4_cu;
+   cuCb.cuCfgParams.egtpParams.egtpAssoc[0].localPort = CU_EGTP_PORT[0];
+   cuCb.cuCfgParams.egtpParams.egtpAssoc[0].destIp.ipV4Pres = TRUE;
+   cuCb.cuCfgParams.egtpParams.egtpAssoc[0].destIp.ipV4Addr = ipv4_du;
+   cuCb.cuCfgParams.egtpParams.egtpAssoc[0].destPort = DU_EGTP_PORT[0];
+   cuCb.cuCfgParams.egtpParams.minTunnelId = MIN_TEID;
+   cuCb.cuCfgParams.egtpParams.currTunnelId = cuCb.cuCfgParams.egtpParams.minTunnelId;
+   cuCb.cuCfgParams.egtpParams.maxTunnelId = MAX_TEID;
+   cuCb.cuCfgParams.egtpParams.numDu = 1;
+
 #else
    cuCb.cuCfgParams.sctpParams.numDu = 0;
    cuCb.cuCfgParams.egtpParams.numDu = 0;