X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fric_stub%2Fric_stub.c;h=90f481c133b7fc8e01b0045b09c04483e14517e8;hb=fdf994581c1b672158c911a9a5f7a4191832c695;hp=dd07ec48b5c4bd4b75c90f185a73955b32a38e3e;hpb=8660dd47a5ef27b62300fabf6b027852f1d5d026;p=o-du%2Fl2.git

diff --git a/src/ric_stub/ric_stub.c b/src/ric_stub/ric_stub.c
index dd07ec48b..90f481c13 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 36421
+#define RIC_PORT 36421
+
+#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 
@@ -60,18 +78,18 @@ void sctpNtfyInd(CmInetSctpNotification *ntfy)
 
 void init_log()
 {
-	openlog("CU_STUB",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
+	openlog("RIC_STUB",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
 }
 /*******************************************************************
  *
- * @brief Main function of CU APP
+ * @brief Main function of E2 APP
  *
  * @details
  *
  *    Function : main
  *
  *    Functionality:
- *         - Reads CU related configurations
+ *         - Reads RIC related configurations
  *         - Initialize SCTP Parameters
  *         - Start SCTP receiver thread
  *
@@ -81,22 +99,19 @@ void init_log()
  *
  * ****************************************************************/
 
-S16 tst()
+uint8_t tst()
 {
    init_log();   
  
-   DU_LOG("\nStarting RIC_STUB");
-   /* Read CU configurations */
+   DU_LOG("\nINFO  --> RIC : Starting RIC_STUB");
+   /* Read RIC configurations */
    readRicCfg();
 
-   /* Initializing SCTP global parameters */
-   sctpActvInit();
- 
-   /* Start CU-SCTP to listen on incoming connection */
+   /* Start RIC-SCTP to listen on incoming connection */
    sctpCfgReq();
    sctpStartReq();
 
-   RETVALUE(ROK);
+   return ROK;
 }
 /*******************************************************************
  *
@@ -117,37 +132,46 @@ S16 tst()
 
 void readRicCfg()
 {
-   U32 ipv4_du, ipv4_ric;
+   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);
- 
-   cuCfgParams.cuId = RIC_ID;
-   strcpy(cuCfgParams.cuName, RIC_NAME);
+
+   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*/
-   cuCfgParams.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
-   cuCfgParams.sctpParams.duIpAddr.ipV6Pres = false;
-   cuCfgParams.sctpParams.duPort = DU_PORT;
+   ricCfgParams.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
+   ricCfgParams.sctpParams.duIpAddr.ipV6Pres = false;
 
    /* RIC IP Address and Port*/
-   cuCfgParams.sctpParams.ricIpAddr.ipV4Addr = ipv4_ric;
-   cuCfgParams.sctpParams.ricIpAddr.ipV6Pres = false;
-   cuCfgParams.sctpParams.ricPort = RIC_PORT;
+   ricCfgParams.sctpParams.ricIpAddr.ipV4Addr = ipv4_ric;
+   ricCfgParams.sctpParams.ricIpAddr.ipV6Pres = false;
 
    /*PLMN*/
-   cuCfgParams.plmn.mcc[0] = PLMN_MCC0;
-   cuCfgParams.plmn.mcc[1] = PLMN_MCC1;
-   cuCfgParams.plmn.mcc[2] = PLMN_MCC2;
-   cuCfgParams.plmn.mnc[0] = PLMN_MNC0;
-   cuCfgParams.plmn.mnc[1] = PLMN_MNC1;
-   cuCfgParams.plmn.mnc[2] = PLMN_MNC2;
-
-   /*RRC Version*/
-   cuCfgParams.rrcVersion.rrcVer = RRC_VER;
-   cuCfgParams.rrcVersion.extRrcVer = EXT_RRC_VER;
+   ricCfgParams.plmn.mcc[0] = PLMN_MCC0;
+   ricCfgParams.plmn.mcc[1] = PLMN_MCC1;
+   ricCfgParams.plmn.mcc[2] = PLMN_MCC2;
+   ricCfgParams.plmn.mnc[0] = PLMN_MNC0;
+   ricCfgParams.plmn.mnc[1] = PLMN_MNC1;
+   ricCfgParams.plmn.mnc[2] = PLMN_MNC2;
   
 } /* End of readCuCfg */
 /**********************************************************************