Update conf files to match master-nsa and made new SA mode gNB.

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -205,7 +205,7 @@ gNBs =
 
 
     ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.61.195";
+    amf_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -215,10 +215,10 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+        GNB_INTERFACE_NAME_FOR_NGU               = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
         GNB_PORT_FOR_NGU                         = 2152; # Spec 2152
     };
 
@@ -226,18 +226,13 @@ gNBs =
 );
 
 MACRLCs = (
-        {
-        num_cc = 1;
-        local_s_if_name  = "lo:";
-        remote_s_address = "127.0.0.1"; // pnf addr [!]
-        local_s_address  = "127.0.0.2"; // vnf addr
-        local_s_portc    = 50601; // vnf p5 port
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
+    {
+        num_cc                      = 1;
+        tr_s_preference             = "local_L1";
+        tr_n_preference             = "local_RRC";
+        pusch_TargetSNRx10          = 200;
+        pucch_TargetSNRx10          = 150;
+    }
 );
 
 L1s = (

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf

@@ -205,7 +205,7 @@ gNBs =
 
 
     ////////// MME parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.16.195";
+    amf_ip_address      = ( { ipv4       = "192.168.70.132";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -215,10 +215,10 @@ gNBs =
 
     NETWORK_INTERFACES :
     {
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "127.0.0.2";
-        GNB_INTERFACE_NAME_FOR_NGU               = "lo:";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "127.0.0.2";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
 
@@ -226,20 +226,6 @@ gNBs =
 );
 
 MACRLCs = (
-<<<<<<< HEAD
-        {
-        num_cc = 1;
-        local_s_if_name  = "lo:";
-        remote_s_address = "127.0.0.1"; // pnf addr [!]
-        local_s_address  = "127.0.0.2"; // vnf addr
-        local_s_portc    = 50601; // vnf p5 port
-        remote_s_portc   = 50600; // pnf p5 port [!]
-        local_s_portd    = 50611; // vnf p7 port [!]
-        remote_s_portd   = 50610; // pnf p7 port [!]
-        tr_s_preference = "nfapi";
-        tr_n_preference = "local_RRC";
-        }
-=======
     {
         num_cc                      = 1;
         tr_s_preference             = "local_L1";
@@ -247,9 +233,18 @@ MACRLCs = (
         pusch_TargetSNRx10          = 150;
         pucch_TargetSNRx10          = 200;
     }
->>>>>>> eurecom-develop
 );
 
+L1s = (
+    {
+	num_cc = 1;
+	tr_n_preference = "local_mac";
+	pusch_proc_threads = 8;
+	prach_dtx_threshold = 120;
+    pucch0_dtx_threshold = 150;
+    ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+    }
+);
 
 RUs = (
     {
@@ -277,6 +272,14 @@ THREAD_STRUCT = (
   }
 );
 
+rfsimulator :
+{
+    serveraddr = "server";
+    serverport = "4043";
+    options = (); #("saviq"); or/and "chanmod"
+    modelname = "AWGN";
+    IQfile = "/tmp/rfsimulator.iqs";
+};
 
 security = {
   # preferred ciphering algorithms