Merge "O1 IP PORT configuration for CM .[Issue-Id: ODUHIGH-196]"

diff --cc build/odu/makefile
Simple merge

diff --cc src/cu_stub/cu_stub.c
index a94f24c,d1c1b1d..ebaade2
--- 1/src/cu_stub/cu_stub.c
--- 2/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@@ -144,11 -164,28 +164,28 @@@ void readCuCfg(
  {
     uint32_t ipv4_du, ipv4_cu;
  
 -   DU_LOG("\nReading CU configurations");
 +   DU_LOG("\nDEBUG  -->  CU_STUB : Reading CU configurations");
  
+ #ifdef O1_ENABLE
+    if( getStartupConfig(&g_cfg) != ROK )
+    {
+       RETVALUE(RFAILED);
+    }
+    DU_LOG("\nReading CU configurations---");
+    DU_LOG("\nReading CU configurations g_cfg.DU_IPV4_Addr=%s", g_cfg.DU_IPV4_Addr);
+    DU_LOG("\nReading CU configurations g_cfg.CU_IPV4_Addr=%s", g_cfg.CU_IPV4_Addr);
+    cmInetAddr((S8*)g_cfg.DU_IPV4_Addr, &ipv4_du);
+    cmInetAddr((S8*)g_cfg.CU_IPV4_Addr, &ipv4_cu);
+ 
+    cuCfgParams.sctpParams.duPort = g_cfg.DU_Port;
+    cuCfgParams.sctpParams.cuPort = g_cfg.CU_Port;
+ #else
     cmInetAddr((S8*)DU_IP_V4_ADDR, &ipv4_du);
     cmInetAddr((S8*)CU_IP_V4_ADDR, &ipv4_cu);
-  
+    cuCfgParams.sctpParams.duPort = DU_PORT;
+    cuCfgParams.sctpParams.cuPort = CU_PORT;
+ #endif
+     
     cuCfgParams.cuId = CU_ID;
     strcpy(cuCfgParams.cuName, CU_NAME);
   

diff --cc src/du_app/du_cfg.c
Simple merge

diff --cc src/du_app/du_cfg.h
Simple merge

diff --cc src/ric_stub/ric_stub.c
index 9cf9644,3f8947a..7bfad92
--- 1/src/ric_stub/ric_stub.c
--- 2/src/ric_stub/ric_stub.c
+++ b/src/ric_stub/ric_stub.c
@@@ -117,11 -134,26 +134,26 @@@ void readRicCfg(
  {
     uint32_t ipv4_du, ipv4_ric;
  
 -   DU_LOG("\nReading RIC configurations");
 +   DU_LOG("\nINFO  --> RIC : Reading RIC configurations");
  
+ #ifdef O1_ENABLE
+    if( getStartupConfig(&g_cfg) != ROK )
+    {
+       RETVALUE(RFAILED);
+    }
+    cmInetAddr((S8*)g_cfg.DU_IPV4_Addr,  &ipv4_du);
+    cmInetAddr((S8*)g_cfg.RIC_IPV4_Addr, &ipv4_ric);
+ 
+    ricCfgParams.sctpParams.duPort = g_cfg.RIC_Port;
+    ricCfgParams.sctpParams.ricPort = g_cfg.RIC_Port;
+ #else
     cmInetAddr((S8*)DU_IP_V4_ADDR, &ipv4_du);
     cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric);
-  
+ 
+    ricCfgParams.sctpParams.duPort = DU_PORT;
+    ricCfgParams.sctpParams.ricPort = RIC_PORT;
+ #endif
+     
     ricCfgParams.ricId = RIC_ID;
     strcpy(ricCfgParams.ricName, RIC_NAME);