Update F1 CU/DU configuration (tested, formatted)

targets/PROJECTS/GENERIC-LTE-EPC/CONF/du.lte.band7.10MHz.if4p5.conf

@@ -4,43 +4,46 @@ Asn1_verbosity = "none";
 
 eNBs =
 (
- {
+  {
     ////////// Identification parameters:
-    eNB_CU_ID    =  0xe00;
+    eNB_CU_ID = 0xe00;
 
-    eNB_name  =  "eNB-Eurecom-DU";
+    eNB_name  = "eNB-Eurecom-DU";
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
-    tracking_area_code  =  "1";
+    tracking_area_code = 1;
+    plmn_list = ( { mcc = 208; mnc = 95; mnc_length = 2; } )
 
-    mobile_country_code =  "208";
+    nr_cellid = 12345678L
 
-    mobile_network_code =  "93";
-
-    nr_cellid           = 12345678L
- 
     ////////// Physical parameters:
 
     component_carriers = (
       {
-      node_function             = "3GPP_eNODEB";
-      node_timing               = "synch_to_ext_device";
-      node_synch_ref            = 0;
-      frame_type					      = "FDD";
-      tdd_config 					      = 3;
-      tdd_config_s            			      = 0;
-      prefix_type             			      = "NORMAL";
-      eutra_band              			      = 7;
-      downlink_frequency      			      = 2685000000L;
-      uplink_frequency_offset 			      = -120000000;
-      Nid_cell					      = 0;
-      N_RB_DL                 			      = 50;
-      Nid_cell_mbsfn          			      = 0;
-      nb_antenna_ports                                = 1;
-      nb_antennas_tx          			      = 1;
-      nb_antennas_rx          			      = 1;
-      tx_gain                                            = 90;
-      rx_gain                                            = 125;
+        node_function           = "3GPP_eNODEB";
+        node_timing             = "synch_to_ext_device";
+        node_synch_ref          = 0;
+        frame_type              = "FDD";
+        tdd_config              = 3;
+        tdd_config_s            = 0;
+        prefix_type             = "NORMAL";
+        eutra_band              = 7;
+        downlink_frequency      = 2665000000L;
+        uplink_frequency_offset = -120000000;
+        Nid_cell                = 0;
+        N_RB_DL                 = 50;
+        Nid_cell_mbsfn          = 0;
+        nb_antenna_ports        = 1;
+        nb_antennas_tx          = 1;
+        nb_antennas_rx          = 1;
+        tx_gain                 = 90;
+        rx_gain                 = 125;
+
+        pucch_deltaF_Format1    = "deltaF2";
+        pucch_deltaF_Format1b   = "deltaF3";
+        pucch_deltaF_Format2    = "deltaF0";
+        pucch_deltaF_Format2a   = "deltaF0";
+        pucch_deltaF_Format2b   = "deltaF0";
       }
     );
 
@@ -48,63 +51,69 @@ eNBs =
     # ------- SCTP definitions
     SCTP :
     {
-        # Number of streams to use in input/output
-        SCTP_INSTREAMS  = 2;
-        SCTP_OUTSTREAMS = 2;
+      # Number of streams to use in input/output
+      SCTP_INSTREAMS  = 2;
+      SCTP_OUTSTREAMS = 2;
     };
   }
 );
 
 MACRLCs = (
-	{
-	num_cc = 1;
-	tr_s_preference = "local_L1";
-	tr_n_preference = "f1";
-    	local_n_if_name  = "lo";
-      	remote_n_address = "127.0.0.4";
-    	local_n_address  = "127.0.0.3";
-    	local_n_portc    = 500;
-    	remote_n_portc   = 501;
-    	local_n_portd    = 600;
-    	remote_n_portd   = 601;
-        }  
+  {
+    num_cc           = 1;
+    tr_s_preference  = "local_L1";
+    tr_n_preference  = "f1";
+    local_n_if_name  = "lo";
+    remote_n_address = "127.0.0.4";
+    local_n_address  = "127.0.0.3";
+    local_n_portc    = 500;
+    remote_n_portc   = 501;
+    local_n_portd    = 600;
+    remote_n_portd   = 601;
+  }
 );
 
 L1s = (
-    	{
-	num_cc = 1;
-	tr_n_preference = "local_mac";
-        }  
+  {
+    num_cc = 1;
+    tr_n_preference = "local_mac";
+  }
 );
 
 RUs = (
-    {		  
-        local_if_name  = "enp4s0f1";
-        local_address  = "127.0.0.1";
-        remote_address = "127.0.0.2";
-        local_portc    = 50000;
-        remote_portc   = 50000;
-        local_portd    = 50001;
-        remote_portd   = 50001;
-	local_rf       = "no"
-    	tr_preference  = "udp_if4p5"
-	nb_tx          = 1
-	nb_rx          = 1
-	att_tx         = 0
-	att_rx         = 0;
-	eNB_instances  = [0];
-    }
-);  
+  {
+    local_rf                      = "yes";
+    nb_tx                         = 1;
+    nb_rx                         = 1;
+    att_tx                        = 10;
+    att_rx                        = 10;
+    bands                         = [7];
+    max_pdschReferenceSignalPower = -27;
+    max_rxgain                    = 125;
+    eNB_instances                 = [0];
+  }
+);
+
+log_config = {
+  global_log_level            = "info";
+  global_log_verbosity        = "medium";
+  hw_log_level                = "info";
+  hw_log_verbosity            = "medium";
+  phy_log_level               = "info";
+  phy_log_verbosity           = "medium";
+  mac_log_level               = "info";
+  mac_log_verbosity           = "high";
+  rlc_log_level               = "info";
+  rlc_log_verbosity           = "medium";
+  flexran_agent_log_level     = "info";
+  flexran_agent_log_verbosity = "medium";
+};
 
-log_config = { 
-      global_log_level                      ="info";
-      global_log_verbosity                  ="medium";
-      hw_log_level                          ="info";
-      hw_log_verbosity                      ="medium";
-      phy_log_level                         ="info";
-      phy_log_verbosity                     ="medium";
-      mac_log_level                         ="info";
-      mac_log_verbosity                     ="high";
-      rlc_log_level                         ="info";
-      rlc_log_verbosity                     ="medium";
+NETWORK_CONTROLLER : {
+  FLEXRAN_ENABLED        = "yes";
+  FLEXRAN_INTERFACE_NAME = "lo";
+  FLEXRAN_IPV4_ADDRESS   = "127.0.0.1";
+  FLEXRAN_PORT           = 2210;
+  FLEXRAN_CACHE          = "/mnt/oai_agent_cache";
+  FLEXRAN_AWAIT_RECONF   = "no";
 };