X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fric_stub%2Fric_stub.c;h=7bfad9275a829844c549e1f1ad30da91d7c1ed3d;hb=834004e09017b5b86cb738be98a7a1be79c0a9b0;hp=e31443914c5fd6dd4e585ae749843fddadd91802;hpb=bb8df345963bb5ef2e035ead7731c1171e4cbbe0;p=o-du%2Fl2.git

diff --git a/src/ric_stub/ric_stub.c b/src/ric_stub/ric_stub.c
index e31443914..7bfad9275 100644
--- a/src/ric_stub/ric_stub.c
+++ b/src/ric_stub/ric_stub.c
@@ -17,18 +17,30 @@
 *******************************************************************************/
 
 /* This functions contains main() for ric_app */
-
+#include "common_def.h"
 #include "ric_stub.h"
 #include "ric_stub_sctp.h"
+#include "du_log.h"
+
+#ifdef O1_ENABLE
+#include "Config.h"
+#endif
 
 #define RIC_ID 1
 #define RIC_NAME "ORAN_OAM_RIC"
-#define DU_IP_V4_ADDR "10.0.2.20"
-#define RIC_IP_V4_ADDR "10.0.2.30"
+
 #define DU_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0001"
 #define RIC_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0011"
-#define DU_PORT 38482
-#define RIC_PORT 38482 
+
+#ifndef O1_ENABLE
+
+#define DU_IP_V4_ADDR "192.168.130.81"
+#define RIC_IP_V4_ADDR "192.168.130.80"
+#define DU_PORT 36422
+#define RIC_PORT 36422
+
+#endif
+
 #define RRC_VER 0
 #define EXT_RRC_VER 5
 #define PLMN_MCC0 3
@@ -38,6 +50,12 @@
 #define PLMN_MNC1 8
 #define PLMN_MNC2 0
 
+#ifdef O1_ENABLE
+
+extern StartupConfig g_cfg;
+
+#endif
+
 /*******************************************************************
  *
  * @brief Handles SCTP notification 
@@ -81,11 +99,11 @@ void init_log()
  *
  * ****************************************************************/
 
-S16 tst()
+uint8_t tst()
 {
    init_log();   
  
-   DU_LOG("\nStarting RIC_STUB");
+   DU_LOG("\nINFO  --> RIC : Starting RIC_STUB");
    /* Read RIC configurations */
    readRicCfg();
 
@@ -114,25 +132,38 @@ S16 tst()
 
 void readRicCfg()
 {
-   U32 ipv4_du, ipv4_ric;
+   uint32_t ipv4_du, ipv4_ric;
+
+   DU_LOG("\nINFO  --> RIC : Reading RIC configurations");
 
-   DU_LOG("\nReading 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);
  
    /* DU IP Address and Port*/
    ricCfgParams.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
    ricCfgParams.sctpParams.duIpAddr.ipV6Pres = false;
-   ricCfgParams.sctpParams.duPort = DU_PORT;
 
    /* RIC IP Address and Port*/
    ricCfgParams.sctpParams.ricIpAddr.ipV4Addr = ipv4_ric;
    ricCfgParams.sctpParams.ricIpAddr.ipV6Pres = false;
-   ricCfgParams.sctpParams.ricPort = RIC_PORT;
 
    /*PLMN*/
    ricCfgParams.plmn.mcc[0] = PLMN_MCC0;