Fix of compilation issue .[Issue-Id: ODUHIGH- 323]

Signed-off-by: HariomGupta <hariom.g@hcl.com>
Change-Id: Ied8719b0e60980f74c8d894f1c31178a0ce676c0

diff --git a/docs/README b/docs/README
index ccceee8..d527a5e 100644 (file)
--- a/docs/README
+++ b/docs/README
@@ -54,6 +54,7 @@ Install the yang module
 -----------------------
 1. cd l2/build/o1/yang
    sysrepoctl -i o-ran-sc-odu-alarm-v1.yang
+   sysrepoctl -i o-ran-sc-odu-interface-v1.yang
 
 
 D. How to Clean and Build:

diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 8a1f7b6..04f463d 100644 (file)
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -43,6 +43,7 @@ I. Execution - On locally compiling O-DU High Source Code
       |    cat /home/netconf/.ssh/id_dsa.pub > /home/netconf/.ssh/authorized_keys
 
       sysrepoctl -i ./yang/o-ran-sc-odu-alarm-v1.yang
+      sysrepoctl -i ./yang/o-ran-sc-odu-interface-v1.yang
 
    c. Navigate to O1 execution folder
 

diff --git a/src/du_app/du_f1ap_msg_hdl.c b/src/du_app/du_f1ap_msg_hdl.c
index 0357523..a6205a5 100644 (file)
--- a/src/du_app/du_f1ap_msg_hdl.c
+++ b/src/du_app/du_f1ap_msg_hdl.c
@@ -102,6 +102,13 @@
 #include "UPTransportLayerInformation.h"
 #include "GTPTunnel.h"
 
+#ifdef O1_ENABLE
+
+#include "Config.h"
+extern StartupConfig g_cfg;
+
+#endif
+
 DuCfgParams duCfgParam;
 
 /************************************************************************
@@ -7166,7 +7173,11 @@ uint8_t extractUpTnlInfo(uint8_t drbId, uint8_t configType,\
 
    upTnlInfo->drbId = drbId; 
    upTnlInfo->configType = configType;
+#ifdef O1_ENABLE
+   cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
+#else
    cmInetAddr((char *)DU_IP_V4_ADDR, &ipv4_du);
+#endif
 
    for(tnlIdx=0; tnlIdx < tnlInfo->list.count; tnlIdx++)
    {

diff --git a/src/o1/InitConfig.hpp b/src/o1/InitConfig.hpp
index e8c2584..99d61f3 100644 (file)
--- a/src/o1/InitConfig.hpp
+++ b/src/o1/InitConfig.hpp
@@ -43,7 +43,7 @@
 #define DEFAULT_CU_PORT 38472
 
 #define DEFAULT_RIC_IPV4_ADDR "192.168.130.80"
-#define DEFAULT_RIC_PORT 36422
+#define DEFAULT_RIC_PORT 36421
 
 enum class Interface 
 { ODU,