[DOCKER] finalize RRU templates

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/conf_files/enb.band7.tm1.25PRB.usrpb210.conf

@@ -53,7 +53,7 @@ eNBs =
       pucch_nRB_CQI             = 0;
       pucch_nCS_AN              = 0;
       pucch_n1_AN               = 0;
-      pdsch_referenceSignalPower 			      = -25;
+      pdsch_referenceSignalPower= -25;
       pdsch_p_b                 = 0;
       pusch_n_SB                = 1;
       pusch_enable64QAM         = "DISABLE";
@@ -66,10 +66,12 @@ eNBs =
       phich_duration            = "NORMAL";
       phich_resource            = "ONESIXTH";
       srs_enable                = "DISABLE";
-      /*  srs_BandwidthConfig                                =;
+      /*
+      srs_BandwidthConfig       =;
       srs_SubframeConfig        =;
       srs_ackNackST             =;
-      srs_MaxUpPts                                       =;*/
+      srs_MaxUpPts              =;
+      */
 
       pusch_p0_Nominal          = -96;
       pusch_alpha               = "AL1";
@@ -119,7 +121,8 @@ eNBs =
       rxPool_ResourceConfig_subframeBitmap_choice_bs_buf     = "00000000000000000000";
       rxPool_ResourceConfig_subframeBitmap_choice_bs_size    = 5;
       rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
-/*    rxPool_dataHoppingConfig_hoppingParameter                       = 0;
+/*
+      rxPool_dataHoppingConfig_hoppingParameter              = 0;
       rxPool_dataHoppingConfig_numSubbands                   = "ns1";
       rxPool_dataHoppingConfig_rbOffset                      = 0;
       rxPool_commTxResourceUC-ReqAllowed                     = "TRUE";
@@ -136,7 +139,7 @@ eNBs =
       discRxPool_ResourceConfig_offsetIndicator_choice       = 0;
       discRxPool_ResourceConfig_subframeBitmap_present       = "prBs40";
       discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
-      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size         = 5;
+      discRxPool_ResourceConfig_subframeBitmap_choice_bs_size= 5;
       discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused  = 0;
 
       }
@@ -204,7 +207,8 @@ eNBs =
   }
 );
 
-MACRLCs = (
+MACRLCs =
+(
   {
     num_cc          = 1;
     tr_s_preference = "local_L1";
@@ -215,14 +219,16 @@ MACRLCs = (
   }  
 );
 
-L1s = (
+L1s =
+(
   {
     num_cc = 1;
     tr_n_preference = "local_mac";
   }  
 );
 
-RUs = (
+RUs =
+(
   {
     local_rf                      = "yes"
     nb_tx                         = 1
@@ -233,11 +239,11 @@ RUs = (
     max_pdschReferenceSignalPower = -27;
     max_rxgain                    = 125;
     eNB_instances                 = [0];
-
   }
 );  
 
-THREAD_STRUCT = (
+THREAD_STRUCT =
+(
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
     parallel_config    = "PARALLEL_SINGLE_THREAD";
@@ -256,8 +262,8 @@ NETWORK_CONTROLLER :
     FLEXRAN_AWAIT_RECONF   = "no";
 };
 
-     log_config :
-     {
+log_config :
+{
     global_log_level                      ="info";
     global_log_verbosity                  ="medium";
     hw_log_level                          ="info";
@@ -272,5 +278,5 @@ NETWORK_CONTROLLER :
     pdcp_log_verbosity                    ="medium";
     rrc_log_level                         ="info";
     rrc_log_verbosity                     ="medium";
-    };
+};
 

ci-scripts/conf_files/rru.fdd.band7.conf

-RUs = (
+RUs =
+(
   {
     local_if_name                 = "lo";
     remote_address                = "127.0.0.1"
@@ -17,7 +18,8 @@ RUs = (
   }
 );
 
-THREAD_STRUCT = (
+THREAD_STRUCT =
+(
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
     parallel_config    = "PARALLEL_SINGLE_THREAD";
@@ -26,7 +28,8 @@ THREAD_STRUCT = (
   }
 );
 
-log_config = {
+log_config =
+{
   global_log_level      ="error";
   global_log_verbosity  ="medium";
   hw_log_level          ="error";

ci-scripts/conf_files/rru.tdd.band40.conf

-RUs = (
+RUs =
+(
   {
     local_if_name                 = "lo";
     remote_address                = "127.0.0.1"
@@ -17,7 +18,8 @@ RUs = (
   }
 );
 
-THREAD_STRUCT = (
+THREAD_STRUCT =
+(
   {
     #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
     parallel_config    = "PARALLEL_SINGLE_THREAD";
@@ -26,7 +28,8 @@ THREAD_STRUCT = (
   }
 );
 
-log_config = {
+log_config =
+{
   global_log_level      ="error";
   global_log_verbosity  ="medium";
   hw_log_level          ="error";

docker/scripts/enb_parameters.yaml

@@ -103,25 +103,25 @@
     outputfilename: "rru.fdd.conf"
     config:
     - key: local_if_name
-      env: "@@"
+      env: "@RRU_IF4P5_IF_NAME@"
     - key: remote_address
-      env: "@@"
+      env: "@RCC_REMOTE_IP_ADDRESS@"
     - key: local_address
-      env: "@@"
+      env: "@RRU_LOCAL_IP_ADDRESS@"
     - key: bands
-      env: "@@"
+      env: "@UTRA_BAND_ID@"
       
   - filePrefix: rru.tdd
     outputfilename: "rru.tdd.conf"
     config:
     - key: local_if_name
-      env: "@@"
+      env: "@RRU_IF4P5_IF_NAME@"
     - key: remote_address
-      env: "@@"
+      env: "@RCC_REMOTE_IP_ADDRESS@"
     - key: local_address
-      env: "@@"
+      env: "@RRU_LOCAL_IP_ADDRESS@"
     - key: bands
-      env: "@@"
+      env: "@UTRA_BAND_ID@"
       
   - filePrefix: enb.band7.tm1.25PRB.usrpb210
     outputfilename: "enb.fdd.conf"
@@ -150,15 +150,21 @@
     - key: ipv4
       env: "@MME_S1C_IP_ADDRESS@"
     - key: ENB_INTERFACE_NAME_FOR_S1_MME
-      env: "@S1C_IF_NAME@"
+      env: "@ENB_S1C_IF_NAME@"
     - key: ENB_IPV4_ADDRESS_FOR_S1_MME
-      env: "@F1_CU_IP_ADDRESS@"
+      env: "@ENB_S1C_IP_ADDRESS@"
     - key: ENB_INTERFACE_NAME_FOR_S1U
-      env: "@S1U_IF_NAME@"
+      env: "@ENB_S1U_IF_NAME@"
     - key: ENB_IPV4_ADDRESS_FOR_S1U
-      env: "@F1_CU_IP_ADDRESS@"
+      env: "@ENB_S1U_IP_ADDRESS@"
     - key: ENB_IPV4_ADDRESS_FOR_X2C
-      env: "@F1_CU_IP_ADDRESS@"
+      env: "@ENB_X2_IP_ADDRESS@"
+    - key: FLEXRAN_ENABLED
+      env: "@FLEXRAN_ENABLED@"
+    - key: FLEXRAN_INTERFACE_NAME
+      env: "@FLEXRAN_INTERFACE_NAME@"
+    - key: FLEXRAN_IPV4_ADDRESS
+      env: "@FLEXRAN_IPV4_ADDRESS@"
       
   - filePrefix: enb.band40.tm1.25PRB.FairScheduler.usrpb210
     outputfilename: "enb.tdd.conf"