X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fcu_stub%2Fcu_stub.c;h=ff9da8e9021f25db022aa449d9edec598593ebeb;hb=287632f09119435e0bf1ea16e4e11fc6447c1eee;hp=f3ca64a1f5d309dc3020f68bc2621b9b9cccfa40;hpb=79b8d410dc34e5624583b9ad935e65350dd3f62a;p=o-du%2Fl2.git

diff --git a/src/cu_stub/cu_stub.c b/src/cu_stub/cu_stub.c
index f3ca64a1f..ff9da8e90 100644
--- a/src/cu_stub/cu_stub.c
+++ b/src/cu_stub/cu_stub.c
@@ -23,14 +23,25 @@
 #include "cu_stub_egtp.h"
 #include "du_log.h"
 
+#ifdef O1_ENABLE
+#include "ConfigInterface.h"
+#endif
+
 #define CU_ID 1
 #define CU_NAME "ORAN_OAM_CU"
-#define DU_IP_V4_ADDR "192.168.130.81"
-#define CU_IP_V4_ADDR "192.168.130.82"
+
 #define DU_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0001"
 #define CU_IP_V6_ADDR "0000:0000:0000:0000:0000:0000:0000:0011"
+
+#ifndef O1_ENABLE
+
+#define DU_IP_V4_ADDR "192.168.130.81"
+#define CU_IP_V4_ADDR "192.168.130.82"
 #define DU_PORT 38472
 #define CU_PORT 38472 
+
+#endif
+
 #define DU_EGTP_PORT 39001
 #define CU_EGTP_PORT 39002
 #define RRC_VER 0
@@ -42,6 +53,13 @@
 #define PLMN_MNC1 8
 #define PLMN_MNC2 0
 
+#ifdef O1_ENABLE
+
+extern StartupConfig g_cfg;
+
+#endif
+
+
 /*******************************************************************
  *
  * @brief Handles SCTP notification 
@@ -64,7 +82,7 @@ void sctpNtfyInd(CmInetSctpNotification *ntfy)
 
 void init_log()
 {
-	openlog("CU_STUB",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
+    openlog("CU_STUB",LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL1);
 }
 /*******************************************************************
  *
@@ -92,7 +110,7 @@ uint8_t tst()
    pthread_attr_t attr;
 
    init_log();   
-   DU_LOG("\nStarting CU_STUB\n");
+   DU_LOG("\nINFO   -->  CU_STUB : Starting CU_STUB\n");
 
    /* Start thread to receive console input */
    pthread_attr_init(&attr);
@@ -102,7 +120,7 @@ uint8_t tst()
    retVal = pthread_create(&conThrdId, &attr, cuConsoleHandler, NULLP);
    if(retVal != 0)
    {
-      DU_LOG("\nCU_STUB: Thread creation failed. Cause %d", retVal);
+      DU_LOG("\nERROR  -->  CU_STUB :  Thread creation failed. Cause %d", retVal);
    }
    pthread_attr_destroy(&attr);
 
@@ -144,23 +162,38 @@ 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( getStartupConfigForStub(&g_cfg) != ROK )
+   {
+      DU_LOG("\nError  -->  CU_STUB : Could not fetch startup "\
+             "configurations from Netconf interface\n");
+      exit(1);
+   }
+   
+   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);
  
    /* DU IP Address and Port*/
    cuCfgParams.sctpParams.duIpAddr.ipV4Addr = ipv4_du;
    cuCfgParams.sctpParams.duIpAddr.ipV6Pres = false;
-   cuCfgParams.sctpParams.duPort = DU_PORT;
 
    /* CU IP Address and Port*/
    cuCfgParams.sctpParams.cuIpAddr.ipV4Addr = ipv4_cu;
    cuCfgParams.sctpParams.cuIpAddr.ipV6Pres = false;
-   cuCfgParams.sctpParams.cuPort = CU_PORT;
 
    /*PLMN*/
    cuCfgParams.plmn.mcc[0] = PLMN_MCC0;
@@ -183,6 +216,7 @@ void readCuCfg()
    cuCfgParams.egtpParams.destIp.ipV4Addr = ipv4_du;
    cuCfgParams.egtpParams.destPort = DU_EGTP_PORT;
    cuCfgParams.egtpParams.minTunnelId = 0;
+   cuCfgParams.egtpParams.currTunnelId = cuCfgParams.egtpParams.minTunnelId;
    cuCfgParams.egtpParams.maxTunnelId = 10;
 
 } /* End of readCuCfg */
@@ -211,7 +245,7 @@ void *cuConsoleHandler(void *args)
       if((ch = getchar()) == 'd')
       {
          /* Start Pumping data from CU to DU */
-         DU_LOG("\nEGTP: Sending DL User Data");
+         DU_LOG("\nDEBUG  -->  EGTP: Sending DL User Data");
          cuEgtpDatReq();      
       } 
    }