update documentation and configuration files reflecting the rfsimulator changes

ci-scripts/conf_files/enb.band38.25prb.rfsim.conf

@@ -200,9 +200,11 @@ RUs = (
     }
 );  
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/enb.band7.100prb.rfsim.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.50prb.rfsim.conf

@@ -233,9 +233,11 @@ RUs =
   }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT =
 (

ci-scripts/conf_files/enb.band7.tm1.25prb.rfsim.mbms.conf

@@ -362,9 +362,11 @@ RUs = (
     }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 THREAD_STRUCT = (
   {

ci-scripts/conf_files/gnb-du.sa.band78.106prb.rfsim.conf

@@ -197,13 +197,15 @@ RUs = (
     }
 );  
 
-rfsimulator: {
+rfsimulator = (
-serveraddr = "server";
+  {
+    serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs"
+    IQfile = "/tmp/rfsimulator.iqs";
-}
+  }
+);
 
 log_config: {
   global_log_level = "info";

ci-scripts/conf_files/gnb-pnf.band66.rfsim.conf

@@ -27,14 +27,15 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 log_config: {
   global_log_level = "info";

ci-scripts/conf_files/gnb.band66.106prb.rfsim.phytest-dora.conf

@@ -191,10 +191,11 @@ RUs = (
     }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
-
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.band78.106prb.rfsim.phytest-dora.conf

@@ -200,10 +200,11 @@ RUs = (
     }
 );  
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
-
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn-leo.conf

@@ -234,14 +234,15 @@ RUs = (
     }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = ("chanmod"); #("saviq"); or/and "chanmod"
   prop_delay = 20;
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 channelmod = {
   max_chan=10;

ci-scripts/conf_files/gnb.sa.band254.u0.25prb.rfsim.ntn.conf

@@ -242,14 +242,15 @@ RUs = (
     }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   prop_delay = 238.74;
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf

@@ -202,9 +202,11 @@ RUs = ({
   eNB_instances  = [0];
 });
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf

@@ -205,14 +205,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
-{
+  {
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.conf

@@ -208,9 +208,11 @@ RUs = (
 );
 
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.flexric.conf

@@ -197,9 +197,11 @@ RUs = (
     }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf

@@ -204,13 +204,15 @@ RUs = ({
 });
 
 
-rfsimulator: {
+rfsimulator = (
+{
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
 }
+);
 
 security = {
 # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.prs.conf

@@ -155,8 +155,8 @@ gNBs =
         NETWORK_INTERFACES :
         {
 
-           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140";
-           GNB_IPV4_ADDRESS_FOR_NGU                 = "CI_GNB_IP_ADDR";
+           GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140";
            GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
         };
 
@@ -217,14 +217,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options    = (); #("saviq"); or/and "chanmod"
   modelname  = "AWGN";
   IQfile     = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.yaml

@@ -168,7 +168,7 @@ RUs:
     sdr_addrs: serial=XXXXXXX
 
 rfsimulator:
-  serveraddr: server
+  - serveraddr: server
 
 security:
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.24prb.rfsim.conf

@@ -203,10 +203,11 @@ RUs = (
 }
 );
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
-
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/gnb.sa.band78.273prb.rfsim.2x2.conf

@@ -203,14 +203,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/nrue.band78.106prb.prs.conf

@@ -87,3 +87,9 @@ PRSs =
     );
   }
 );
+
+rfsimulator = (
+  {
+    serveraddr = "127.0.0.1";
+  }
+);

ci-scripts/conf_files/nrue.uicc.conf

@@ -14,6 +14,12 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator = (
+  {
+    serveraddr = "127.0.0.1";
+  }
+);
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */
@@ -40,4 +46,4 @@ channelmod = {
       ds_tdl         = 0;
     }
   );
-};
+};

ci-scripts/conf_files/nrue.uicc.ntn-leo.conf

@@ -14,6 +14,13 @@ position0 = {
 
 thread-pool = "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator = (
+    {
+        prop_delay = 20;
+        options = ("chanmod");
+    }
+);
+
 RUs = (
     {
         nb_tx      = 1;

ci-scripts/conf_files/nrue.uicc.yaml

@@ -7,6 +7,9 @@ uicc0:
 
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator:
+  - serveraddr: "127.0.0.1"
+
 #/* configuration for channel modelisation */
 #/* To be included in main config file when */
 #/* channel modelisation is used (rfsimulator with chanmod options enabled) */

ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf

@@ -205,14 +205,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
-{
+  {
     serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -200,14 +200,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml

@@ -208,7 +208,7 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml

@@ -30,7 +30,7 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml

@@ -208,7 +208,7 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 50 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes: 
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml

@@ -208,7 +208,7 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -C 2680000000 -r 100 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml

@@ -28,7 +28,7 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/4g_rfsimulator_mbms/docker-compose.yml

@@ -33,7 +33,7 @@ services:
             TZ: Europe/Paris
             HOSTNAME: oai_ue0
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
+            USE_ADDITIONAL_OPTIONS: -C 2680000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsim --noS1 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time --noS1
         volumes:
             - ../../conf_files/lteue.usim-mbs.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml

@@ -208,7 +208,7 @@ services:
         environment:
             TZ: Europe/Paris
             ASAN_OPTIONS: detect_leaks=0
-            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -T -C 2605000000 -r 25 --ue-rxgain 140 --ue-txgain 120 --rfsimulator.[0].serveraddr 192.168.61.20 --log_config.global_log_options level,nocolor,time
         volumes:
             - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf
         healthcheck:

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

@@ -130,10 +130,10 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
                                     --log_config.global_log_options level,nocolor,time
-                                    --rfsimulator.options chanmod
+                                    --rfsimulator.[0].options chanmod
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
-                                    --rfsimulator.serveraddr 192.168.71.181
+                                    --rfsimulator.[0].serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
@@ -168,7 +168,7 @@ services:
                                     --gNBs.[0].servingCellConfigCommon.[0].dl_absoluteFrequencyPointA 642024
                                     --gNBs.[0].servingCellConfigCommon.[0].ssb_PositionsInBurst_Bitmap 3
                                     --MACRLCs.[0].local_n_address 192.168.71.172
-                                    --rfsimulator.serveraddr 192.168.71.181
+                                    --rfsimulator.[0].serveraddr 192.168.71.181
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cu
@@ -199,8 +199,8 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.options chanmod
+                                    --rfsimulator.[0].options chanmod
-                                    --rfsimulator.serveraddr server
+                                    --rfsimulator.[0].serveraddr server
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.181 --telnetsrv.listenport 8091
                                     --channelmod.modellist_rfsimu_1.[0].model_name rfsimu_channel_ue0
                                     --channelmod.modellist_rfsimu_1.[1].model_name rfsimu_channel_ue1

ci-scripts/yaml_files/5g_rfsimulator/README.md

@@ -256,7 +256,7 @@ Create the entry for the second UE in `docker-compose.yaml` file as follows:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         devices:

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

@@ -123,7 +123,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -150,7 +150,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001101 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -177,7 +177,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001102 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -204,7 +204,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001103 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -231,7 +231,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001104 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -258,7 +258,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001105 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -285,7 +285,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001106 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -312,7 +312,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001107 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -339,7 +339,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001108 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -366,7 +366,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001109 -C 3319680000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator/local-override-ue-gdb.yaml

@@ -3,4 +3,4 @@ services:
     privileged: true
     stdin_open: true
     tty: true
-    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+    command: gdb --args /opt/oai-nr-ue/bin/nr-uesoftmodem -O /opt/oai-nr-ue/etc/nr-ue.conf -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3619200000 --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

@@ -121,7 +121,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:

ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml

@@ -124,7 +124,7 @@ services:
             - NET_RAW    # for ping
             - SYS_NICE
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim -r 273 --numerology 1 --band 78 -C 3450720000 --ssb 1518 --ue-nb-ant-tx 2 --uicc0.imsi 208990100001100 --ue-nb-ant-rx 2 --uecap_file /opt/oai-nr-ue/etc/uecap.xml --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml

@@ -309,7 +309,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001100
-                                    --rfsimulator.serveraddr oai-du
+                                    --rfsimulator.[0].serveraddr oai-du
         depends_on:
             - oai-du
         networks:
@@ -339,7 +339,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001101 --uicc0.nssai_sst 2
-                                    --rfsimulator.serveraddr 192.168.78.3
+                                    --rfsimulator.[0].serveraddr 192.168.78.3
         depends_on:
             - oai-du2
         networks:
@@ -369,7 +369,7 @@ services:
             USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time
                                     -r 106 --numerology 1 -C 3619200000
                                     --uicc0.imsi 208990100001102 --uicc0.nssai_sst 3
-                                    --rfsimulator.serveraddr 192.168.78.4
+                                    --rfsimulator.[0].serveraddr 192.168.78.4
             ASAN_OPTIONS: detect_leaks=0
         depends_on:
             - oai-du3

ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --rfsimulator.[0].wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         devices:
             - /dev/net/tun:/dev/net/tun

ci-scripts/yaml_files/5g_rfsimulator_flexric/docker-compose.yml

@@ -105,7 +105,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000003 --rfsimulator.serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000003 --rfsimulator.[0].serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:
@@ -124,7 +124,7 @@ services:
         privileged: true
         container_name: rfsim5g-oai-nr-ue2
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000004 --rfsimulator.serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 -C 3619200000 --uicc0.imsi 001010000000004 --rfsimulator.[0].serveraddr 192.168.70.151 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml

@@ -121,7 +121,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
-                                    --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
                                     -C 27975360000 -r 66 --numerology 3 --ssb 48 --band 257
             ASAN_OPTIONS: detect_leaks=0
         devices:

ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml

@@ -111,7 +111,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: -E --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 -C 3319680000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time --num-ues 10
+            USE_ADDITIONAL_OPTIONS: -E --rfsim --log_config.global_log_options level,nocolor,time --num-ues 10
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_multiue/nrue.uicc.conf

@@ -69,7 +69,136 @@ uicc9 = {
   nssai_sst=1;
 }
 
-
-
 thread-pool: "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
 
+rfsimulator = (
+  {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }, {
+    serveraddr = "192.168.71.140";
+  }
+);
+
+RUs = (
+  {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }, {
+    nb_tx      = 1;
+    nb_rx      = 1;
+  }
+);
+
+cells = (
+  {
+    ru_id      = 0;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 1;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 2;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 3;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 4;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 5;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 6;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 7;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 8;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }, {
+    ru_id      = 9;
+    band       = 78;
+    rf_freq    = 3319680000L;
+    numerology = 1;
+    N_RB_DL    = 106;
+    ssb_start  = 516;
+  }
+);

ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml

@@ -149,7 +149,7 @@ services:
                                     --gNBs.[0].nr_cellid 0
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.171
                                     --telnetsrv.shrmod ci
-                                    --rfsimulator.serveraddr 192.168.71.190
+                                    --rfsimulator.[0].serveraddr 192.168.71.190
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:
             - oai-cucp-0
@@ -176,7 +176,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.serveraddr server
+            USE_ADDITIONAL_OPTIONS: --rfsim --rfsimulator.[0].serveraddr server
                                     --band 78 -C 3619200000 -r 106 --numerology 1 --ssb 516
                                     --uicc0.imsi 208990100001100
                                     --log_config.global_log_options level,nocolor,time
@@ -259,7 +259,7 @@ services:
             - ALL
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim
-                                    --rfsimulator.serveraddr 192.168.71.190
+                                    --rfsimulator.[0].serveraddr 192.168.71.190
                                     --log_config.global_log_options level,nocolor,time
                                     --gNBs.[0].gNB_DU_ID 1234
                                     --gNBs.[0].gNB_ID 0xb00

ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml

@@ -123,7 +123,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 238.74 --rfsimulator.serveraddr 192.168.71.140 --num-ul-actors 1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.[0].prop_delay 238.74 --rfsimulator.[0].serveraddr 192.168.71.140 --num-ul-actors 1 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml

@@ -121,13 +121,10 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS:
-                --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60
+                --rfsim --rfsimulator.[0].serveraddr 192.168.71.140
-                --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod
-                --rfsimulator.serveraddr 192.168.71.140
                 --time-sync-I 0.1 --ntn-initial-time-drift -46
-                --initial-fo 57340 --cont-fo-comp 2
+                --initial-fo 57340 --cont-fo-comp 3
                 --log_config.global_log_options level,nocolor,time
-                --num-ul-actors 1
         depends_on:
             - oai-gnb
         networks:

ci-scripts/yaml_files/5g_rfsimulator_prs/docker-compose.yaml

@@ -36,7 +36,7 @@ services:
         environment:
             USE_ADDITIONAL_OPTIONS: --phy-test --rfsim -E
                                     --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw
-                                    --rfsimulator.serveraddr 192.168.71.140
+                                    --rfsimulator.[0].serveraddr 192.168.71.140
                                     --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
                                     --telnetsrv.shrmod ciUE

ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN
             - NET_RAW
         environment:
-            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --sync-ref 4 --rfsim --rfsimulator.serveraddr server --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --sync-ref 4 --rfsim --rfsimulator.[0].serveraddr server --log_config.global_log_options level,nocolor,time
         networks:
             public_net:
                 ipv4_address: 192.168.71.140
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --rfsim --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --sl-mode 2 --rfsim --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
         depends_on:
             - oai-nr-ue-1
         networks:

ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml

@@ -8,7 +8,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --rfsimulator.[0].wait_timeout 20 --noS1 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         networks:
             public_net:
@@ -33,7 +33,7 @@ services:
             - NET_ADMIN  # for interface bringup
             - NET_RAW    # for ping
         environment:
-            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --reconfig-file etc/rrc/reconfig.raw --rbconfig-file etc/rrc/rbconfig.raw --rfsimulator.[0].serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
             ASAN_OPTIONS: detect_leaks=0
         devices:
             - /dev/net/tun:/dev/net/tun

ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml

@@ -149,7 +149,7 @@ services:
             - NET_RAW    # for ping
         environment:
             USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48
-                                    --rfsimulator.serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
+                                    --rfsimulator.[0].serveraddr 192.168.71.141 --extra-pdu-id 2 --log_config.global_log_options level,nocolor,time
                                     --telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
             ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
         depends_on:

common/utils/LOG/DOC/lttng_logs.md

@@ -65,7 +65,7 @@ Note: only LTTng 2.3.8 is supported.
 1. **Run gNB:**
 
     ```bash
-    ./$binary_path -O $configuration_file PARALLEL_SINGLE_THREAD --rfsimulator.serveraddr server --rfsim -E
+    ./$binary_path -O $configuration_file PARALLEL_SINGLE_THREAD --rfsimulator.[0].serveraddr server --rfsim -E
     ```
 
 ## Verifying Tracepoints

common/utils/websrv/DOC/websrvuse.md

@@ -275,9 +275,9 @@ The web server back-end is using the [oai configuration module](Config/Rtusage).
 ## running the back-end
 To trigger the back-end use the `--websrv` option, possibly modifying the parameters as explained in the [previous section](./websrvuse.md#web-server-parameters).  The two following commands allow starting the oai gNB and the oai 5G UE on the same computer, starting the telnet server and the web interface on both executables.
 
-`./nr-softmodem -O  /usr/local/oai/conf/gnb.band78.sa.fr1.106PRB.usrpb210.conf --rfsim --rfsimulator.serveraddr server --telnetsrv  --telnetsrv.listenstdin --websrv   --rfsimulator.options chanmod`
+`./nr-softmodem -O  /usr/local/oai/conf/gnb.band78.sa.fr1.106PRB.usrpb210.conf --rfsim --rfsimulator.[0].serveraddr server --telnetsrv --telnetsrv.listenstdin --websrv --rfsimulator.[0].options chanmod`
 
-`./nr-uesoftmodem -O /usr/local/oai/conf/nrue_sim.conf --numerology 1 -r 106 -C 3649440000 --rfsim --rfsimulator.serveraddr 127.0.0.1 --websrv --telnetsrv --websrv.listenport 8092 --telnetsrv.listenport 8091`
+`./nr-uesoftmodem -O /usr/local/oai/conf/nrue_sim.conf --numerology 1 -r 106 -C 3649440000 --rfsim --rfsimulator.[0].serveraddr 127.0.0.1 --websrv --telnetsrv --websrv.listenport 8092 --telnetsrv.listenport 8091`
 
 
 

doc/E1AP/E1-design.md

@@ -162,7 +162,7 @@ You need to use  `--rfsim` if you are running the test with rfsimulator.
 
 OAI UE:
 ```
-sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --rfsimulator.[0].serveraddr 127.0.0.1
 ```
 
 ## 3. Configuration file IP addresses of network functions

doc/LDPC_XDMA_offload_setup.md

@@ -149,13 +149,13 @@ Example command using rfsim:
 
 ```bash
 cd ~/openairinterface5g/cmake_targets/ran_build/build
-sudo ./nr-uesoftmodem --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 1 --ue-nb-ant-rx 1 -O ../../../ci-scripts/conf_files/nrue1.uicc.cluCN.conf --rfsimulator.serveraddr 10.201.1.100 --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
+sudo ./nr-uesoftmodem --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 1 --ue-nb-ant-rx 1 -O ../../../ci-scripts/conf_files/nrue1.uicc.cluCN.conf --rfsimulator.[0].serveraddr 10.201.1.100 --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
 ```
 
 or 
 
 ```bash
-sudo ./nr-uesoftmodem --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 1 --ue-nb-ant-rx 1 -O ../../../ci-scripts/conf_files/nrue1.uicc.cluCN.conf --rfsimulator.serveraddr 10.201.1.100
+sudo ./nr-uesoftmodem --rfsim -r 106 --numerology 1 --band 78 -C 3319680000 --ue-nb-ant-tx 1 --ue-nb-ant-rx 1 -O ../../../ci-scripts/conf_files/nrue1.uicc.cluCN.conf --rfsimulator.[0].serveraddr 10.201.1.100
 ```
 
 if you have added the configuration to the `.conf` file.

doc/NR_SA_Tutorial_OAI_multi_UE.md

@@ -39,7 +39,7 @@ Important notes:
 2. After entering the bash environment, run the following command to deploy your first UE
 
    ```bash
-   sudo ./nr-uesoftmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf -r 106 --numerology 1 --band 78 -C 3619200000    --rfsim --uicc0.imsi 001010000000001 --rfsimulator.options chanmod --rfsimulator.serveraddr 10.201.1.100 --telnetsrv    --telnetsrv.listenport 9095
+   sudo ./nr-uesoftmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 001010000000001 --rfsimulator.[0].options chanmod --rfsimulator.[0].serveraddr 10.201.1.100 --telnetsrv --telnetsrv.listenport 9095
    ```
 
 3. For the second UE, create the namespace ue2 (`-c2`), then execute shell inside (`-o2`, "open"):
@@ -52,7 +52,7 @@ Important notes:
 4. After entering the bash environment, run the following command to deploy your second UE:
 
    ```bash
-   sudo ./nr-uesoftmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf -r 106 --numerology 1 --band 78 -C 3619200000    --rfsim --uicc0.imsi 001010000000002 --rfsimulator.options chanmod --rfsimulator.serveraddr 10.202.1.100 --telnetsrv    --telnetsrv.listenport 9096
+   sudo ./nr-uesoftmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 001010000000002 --rfsimulator.[0].options chanmod --rfsimulator.[0].serveraddr 10.202.1.100 --telnetsrv --telnetsrv.listenport 9096
    ```
 
 in the command above, please note that the IMSI and the telnet port changed.

doc/NR_SA_Tutorial_OAI_nrUE.md

@@ -191,7 +191,7 @@ The UE configuration must match the one of the network's AMF. The nrUE can conne
 When running the `nr-uesoftmodem`, one can specify the nrUE configuration file using the `-O` option. E.g.:
 
 ```bash
-sudo ./nr-uesoftmodem --rfsim --rfsimulator.serveraddr 127.0.0.1 -r 106 --numerology 1 --band 78 -C 3619200000 -O ~/nrue.uicc.conf
+sudo ./nr-uesoftmodem --rfsim --rfsimulator.[0].serveraddr 127.0.0.1 -r 106 --numerology 1 --band 78 -C 3619200000 -O ~/nrue.uicc.conf
 ```
 The CL option `--uicc0.imsi`  can override the IMSI value in the configuration file if necessary (e.g. when running multiple UEs): `--uicc0.imsi  001010000000001`.
 

doc/RUNMODEM.md

@@ -174,7 +174,7 @@ Therefore either SDR boards and a dedicated NTN channel emulator are required, o
 As shown on the [rfsimulator page](../radio/rfsimulator/README.md), RFsimulator provides different possibilities.
 E.g. to perform a simple simulation of a satellite in geostationary orbit (GEO), these parameters should be added to both gNB and UE command lines:
 ```
---rfsimulator.prop_delay 238.74
+--rfsimulator.[0].prop_delay 238.74
 ```
 
 For simulation of a satellite in low earth orbit (LEO), two channel models have been added to rfsimulator:
@@ -210,7 +210,7 @@ This can be done by either providing this line in the conf file in section `rfsi
 ```
 Or by providing this the the command line parameters:
 ```
---rfsimulator.options chanmod
+--rfsimulator.[0].options chanmod
 ```
 
 #### gNB
@@ -338,7 +338,7 @@ position0 = {
 So an example NR UE command for FDD, 5MHz BW, 15 kHz SCS, transparent GEO satellite 5G NR NTN is this:
 ```
 cd cmake_targets
-sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 238.74
+sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.[0].prop_delay 238.74
 ```
 
 For LEO satellite scenarios, the parameter `--ntn-initial-time-drift` must be provided via command line, as the UE needs this value to compensate for the time drift during initial sync, before SIB19 was received.
@@ -356,7 +356,7 @@ For other information on optional NR UE command line options, please refer [here
 So an example NR UE command for FDD, 5MHz BW, 15 kHz SCS, transparent LEO satellite 5G NR NTN is this:
 ```
 cd cmake_targets
-sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.prop_delay 20 --rfsimulator.options chanmod --time-sync-I 0.1 --ntn-initial-time-drift -46 --initial-fo 57340 --cont-fo-comp 2
+sudo ./ran_build/build/nr-uesoftmodem -O ../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --band 254 -C 2488400000 --CO -873500000 -r 25 --numerology 0 --ssb 60 --rfsim --rfsimulator.[0].prop_delay 20 --rfsimulator.[0].options chanmod --time-sync-I 0.1 --ntn-initial-time-drift -46 --initial-fo 57340 --cont-fo-comp 2
 ```
 
 ## Specific OAI modes
@@ -381,7 +381,7 @@ sudo ./nr-uesoftmodem --phy-test [--reconfig-file ../../../ci-scripts/rrc-files/
 In summary:
 - If you are running on the same machine and launched the 2 executables (`nr-softmodem` and `nr-uesoftmodem`) from the same directory, nothing has to be done.
 - If you launched the 2 executables from 2 different folders, just point to the location where you launched the `nr-softmodem`:
-  * `sudo ./nr-uesoftmodem --rfsim --phy-test --reconfig-file /the/path/where/you/launched/nr-softmodem/reconfig-file --rbconfig-file /the/path/where/you/launched/nr-softmodem/rbconfig-file --rfsimulator.serveraddr <TARGET_GNB_INTERFACE_ADDRESS>`
+  * `sudo ./nr-uesoftmodem --rfsim --phy-test --reconfig-file /the/path/where/you/launched/nr-softmodem/reconfig-file --rbconfig-file /the/path/where/you/launched/nr-softmodem/rbconfig-file --rfsimulator.[0].serveraddr <TARGET_GNB_INTERFACE_ADDRESS>`
 - If you are not running on the same machine, you need to **COPY** the two raw files
   * `scp usera@machineA:/the/path/where/you/launched/nr-softmodem/r*config.raw userb@machineB:/the/path/where/you/will/launch/nr-uesoftmodem/`
   * Obviously this operation should be done before launching the `nr-uesoftmodem` executable.
@@ -428,7 +428,7 @@ To run using the RFsimulator:
 
 ```bash
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --do-ra --rfsim
-sudo ./nr-uesoftmodem --do-ra --rfsim --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-uesoftmodem --do-ra --rfsim --rfsimulator.[0].serveraddr 127.0.0.1
 ```
 
 Using USRPs:

doc/RUN_NR_PRS.md

@@ -101,7 +101,7 @@ If **N310 USRPs** are used, then run above command `without -E option` i.e witho
 To run using **rfsimulator** with local ETH IF `127.0.0.1`, execute following command:
 
 ```
-sudo ./nr-uesoftmodem --rfsim --phy-test --noS1 -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-uesoftmodem --rfsim --phy-test --noS1 -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf --rfsimulator.[0].serveraddr 127.0.0.1
 ```
 
 ### FR2 test
@@ -115,7 +115,7 @@ If RF beamforming module is NOT present, nrUE can still be launched with USRP al
 To run using **rfsimulator** with local ETH IF `127.0.0.1`, execute following command:
 
 ```
-sudo ./nr-uesoftmodem --rfsim --phy-test --noS1 -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.64prb.conf --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-uesoftmodem --rfsim --phy-test --noS1 -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.64prb.conf --rfsimulator.[0].serveraddr 127.0.0.1
 ```
 
 ### Multiple gNB scenario

doc/data_recording.md

@@ -239,7 +239,7 @@ sudo ./cmake_targets/ran_build/build/nr-softmodem -O ./targets/PROJECTS/GENERIC-
 ```
 Run NR gNB Softmodem in RF Simulation:
 ```
-sudo ./cmake_targets/ran_build/build/nr-softmodem -O ./targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.1x1.usrpx410_3300MHz.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.serveraddr server --phy-test -d --T_stdout 2 --T_nowait
+sudo ./cmake_targets/ran_build/build/nr-softmodem -O ./targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.sa.fr1.106PRB.1x1.usrpx410_3300MHz.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.[0].serveraddr server --phy-test -d --T_stdout 2 --T_nowait
 ```
 > **Note:** User needs to change the name of gNB config file to your gNB config file.
 
@@ -265,7 +265,7 @@ sudo ./cmake_targets/ran_build/build/nr-uesoftmodem --usrp-args "type=x4xx,addr=
 
 Run OAI Soft UE in RF Simulation, assume the IP address of gNB server is `192.168.100.2`:
 ```
-sudo ./cmake_targets/ran_build/build/nr-uesoftmodem --rfsim --rfsimulator.serveraddr 192.168.100.2 --phy-test -O ./targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --reconfig-file /home/user/workarea/rrc_files/reconfig.raw --rbconfig-file /home/user/workarea/rrc_files/rbconfig.raw --T_stdout 2 --T_nowait --T_port 2023
+sudo ./cmake_targets/ran_build/build/nr-uesoftmodem --rfsim --rfsimulator.[0].serveraddr 192.168.100.2 --phy-test -O ./targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf --reconfig-file /home/user/workarea/rrc_files/reconfig.raw --rbconfig-file /home/user/workarea/rrc_files/rbconfig.raw --T_stdout 2 --T_nowait --T_port 2023
 ```
 
 ### Step3: Run Data Recording Application Services

doc/handover-tutorial.md

@@ -76,7 +76,7 @@ Start the CU including telnet support:
 
 Start DU0:
 
-    sudo ./nr-softmodem --rfsim -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf --rfsimulator.serveraddr 127.0.0.1
+    sudo ./nr-softmodem --rfsim -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf --rfsimulator.[0].serveraddr 127.0.0.1
 
 This will show an error `[HW]   connect() to 127.0.0.1:4043 failed,
 errno(111)`. _This is expected_, because the RFsim server is at the UE (to be
@@ -84,7 +84,7 @@ able to serve two RFsim clients, one DU each; see below for more info). Proceed
 by starting the UE, and let it connect completely (this should make the error
 go away):
 
-    sudo ./nr-uesoftmodem -C 3450720000 -r 106 --numerology 1 --ssb 516 -O <config>  --rfsim --rfsimulator.serveraddr server
+    sudo ./nr-uesoftmodem -C 3450720000 -r 106 --numerology 1 --ssb 516 -O <config>  --rfsim --rfsimulator.[0].serveraddr server
 
 Note how the RFsimulator roles have been switched, and RFsim server is at the
 UE side; _this is important_. Replace `<config>` with the UE configuration
@@ -93,7 +93,7 @@ matching your core. If you followed the CN and oaiUE tutorials, you can remove
 
 Once the UE is connected, start DU1:
 
-    sudo ./nr-softmodem --rfsim -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf --rfsimulator.serveraddr 127.0.0.1
+    sudo ./nr-softmodem --rfsim -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf --rfsimulator.[0].serveraddr 127.0.0.1
 
 Once DU1 is online, you can trigger a handover by issuing this command
 
@@ -461,13 +461,13 @@ Run the 5G Core Network if not already running.
 2. Start the source gNB (gNB-PCI0) e.g.
 
 ```sh
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf --telnetsrv --telnetsrv.shrmod ci --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci0.rfsim.conf --telnetsrv --telnetsrv.shrmod ci --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.[0].serveraddr 127.0.0.1
 ```
 
 3. Start the UE e.g.
 
 ```sh
-sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 001010000000001 -O ../../../ci-scripts/conf_files/nrue.uicc.conf --rfsimulator.serveraddr server
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 001010000000001 -O ../../../ci-scripts/conf_files/nrue.uicc.conf --rfsimulator.[0].serveraddr server
 ```
 
 Ensure the UE successfully registers with the network.
@@ -475,7 +475,7 @@ Ensure the UE successfully registers with the network.
 4. Start the target gNB (gNB-PCI1) e.g.
 
 ```sh
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf --rfsim --telnetsrv --telnetsrv.shrmod ci --gNBs.[0].min_rxtxtime 6 --rfsimulator.serveraddr 127.0.0.1
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.pci1.rfsim.conf --rfsim --telnetsrv --telnetsrv.shrmod ci --gNBs.[0].min_rxtxtime 6 --rfsimulator.[0].serveraddr 127.0.0.1
 ```
 
 **Note for same-machine setup:** When running both gNBs on the same machine,

doc/nfapi.md

@@ -238,7 +238,7 @@ Run cu_stu and ric_stub in separate terminals
 
 Run the OAI PNF first, as it is the WLS memory master
 
-    sudo NFAPI_TRACE_LEVEL=info ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf --nfapi PNF --rfsim --rfsimulator.serveraddr server
+    sudo NFAPI_TRACE_LEVEL=info ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.2x2.conf --nfapi PNF --rfsim --rfsimulator.[0].serveraddr server
 
 Run the O-DU over GDB
 

openair1/PHY/CODING/DOC/LDPCImplementation.md

@@ -41,7 +41,7 @@ At runtime, to successfully use LDPC accelerators (e.g., Xilinx T2/Intel ACCs),
 Please refer to the dedicated documentation at [LDPC_OFFLOAD_SETUP.md](file://../../../../doc/LDPC_OFFLOAD_SETUP.md).
 
 ```
-./nr-softmodem -O  libconfig:gnb.band78.sa.fr1.106PRB.usrpb210.conf:dbgl5 --rfsim --rfsimulator.serveraddr server  --log_config.gtpu_log_level info  --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev 01:00.0 --nrLDPC_coding_aal.dpdk_core_list 0-1
+./nr-softmodem -O  libconfig:gnb.band78.sa.fr1.106PRB.usrpb210.conf:dbgl5 --rfsim --rfsimulator.[0].serveraddr server  --log_config.gtpu_log_level info  --loader.ldpc.shlibversion _aal --nrLDPC_coding_aal.dpdk_dev 01:00.0 --nrLDPC_coding_aal.dpdk_core_list 0-1
 ```
 
 `libldpc_aal.so` has its decoder and its encoder implemented in [nrLDPC_coding_aal.c](file://../nrLDPC_coding/nrLDPC_coding_aal/nrLDPC_coding_aal.c).
@@ -61,7 +61,7 @@ At runtime, to successfully use the xdma, you need to install vendor specific dr
 Please refer to the dedicated documentation at [LDPC_XDMA_OFFLOAD_SETUP.md](file://../../../../doc/LDPC_XDMA_OFFLOAD_SETUP.md).
 
 ```
-./nr-softmodem -O libconfig:gnb.band78.sa.fr1.106PRB.usrpb210.conf:dbgl5 --rfsim --rfsimulator.serveraddr server --log_config.gtpu_log_level info --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
+./nr-softmodem -O libconfig:gnb.band78.sa.fr1.106PRB.usrpb210.conf:dbgl5 --rfsim --rfsimulator.[0].serveraddr server --log_config.gtpu_log_level info --loader.ldpc.shlibversion _xdma --nrLDPC_coding_xdma.num_threads_prepare 2
 ```
 
 `libldpc_xdma.so` has its decoder implemented in [nrLDPC_coding_xdma.c](file://../nrLDPC_coding/nrLDPC_coding_xdma/nrLDPC_coding_xdma.c).\

openair1/SIMULATION/TOOLS/DOC/channel_simulation.md

@@ -123,17 +123,17 @@ Please refer to this documentation [telnetusage.md](../../../../common/utils/tel
 
 When the `chanmod` option is enabled, the RF channel simulator with a channel modeling function is called. Add the following options to the command line to enable the channel model:
 ```bash
---rfsimulator.options chanmod
+--rfsimulator.[0].options chanmod
 ```
 
 Example run of OAI RFSIM on the same machine with activation of the channel model via command line:
 gNB:
 ```bash
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.options chanmod --telnetsrv
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.[0].options chanmod --telnetsrv
 ```
 UE:
 ```bash
-sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --rfsimulator.serveraddr 127.0.0.1 --uicc0.imsi 001010000000001 -O ../../../ci-scripts/conf_files/nrue.uicc.conf --rfsimulator.options chanmod
+sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --rfsimulator.[0].serveraddr 127.0.0.1 --uicc0.imsi 001010000000001 -O ../../../ci-scripts/conf_files/nrue.uicc.conf --rfsimulator.[0].options chanmod
 ```
 where `@include "channelmod_rfsimu.conf"` has been added at the end of `ci-scripts/conf_files/channelmod_rfsimu.conf` which has been copied to `targets/PROJECTS/GENERIC-LTE-EPC/CONF/`.
 
@@ -175,7 +175,7 @@ Example usage, set the offset for the selected model of the selected `modellist`
 
 e.g. with the softmodem:
 ```bash
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.options chanmod --telnetsrv --channelmod.modellist modellist_rfsimu_2 --channelmod.modellist_rfsimu_2.[1].offset 120
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --gNBs.[0].min_rxtxtime 6 --rfsim --rfsimulator.[0].options chanmod --telnetsrv --channelmod.modellist modellist_rfsimu_2 --channelmod.modellist_rfsimu_2.[1].offset 120
 ```
 
 ## Real time control and monitoring with telnet server

openair2/E2AP/README.md

@@ -187,9 +187,9 @@ e2_agent = {
   ```bash
   cd <path-to>/build
   # for gNB-mono
-  sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 001010000000001 --rfsimulator.serveraddr 127.0.0.1
+  sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --uicc0.imsi 001010000000001 --rfsimulator.[0].serveraddr 127.0.0.1
   # for CU/DU and CU-CP/CU-UP/DU split
-  sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3450720000 --rfsim --uicc0.imsi 001010000000001 --rfsimulator.serveraddr 127.0.0.1
+  sudo ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3450720000 --rfsim --uicc0.imsi 001010000000001 --rfsimulator.[0].serveraddr 127.0.0.1
   ```
   Note: [multi-UE rfsim deployment tutorial](../../doc/NR_SA_Tutorial_OAI_multi_UE.md?ref_type=heads#run-multiple-ues-in-rfsimulator)
 

radio/COMMON/common_lib.h

@@ -56,7 +56,7 @@
 #define RAU_REMOTE_THIRDPARTY_RADIO_HEAD 2
 #define MAX_WRITE_THREAD_PACKAGE     10
 #define MAX_WRITE_THREAD_BUFFER_SIZE 8
-#define MAX_CARDS 8
+#define MAX_CARDS 10
 
 typedef int64_t openair0_timestamp_t;
 typedef volatile int64_t openair0_vtimestamp_t;

radio/rfsimulator/README.md

@@ -64,42 +64,44 @@ This is equivalent to using `-w SIMU` when running the `build_oai` script.
 To use the RF simulator add the `--rfsim` option to the command line. By
 default the RF simulator device will try to connect to host 127.0.0.1, port
 4043, which is usually the behavior for the UE.  For the eNB/gNB, you either
-have to pass `--rfsimulator.serveraddr server` on the command line, or specify
+have to pass `--rfsimulator.[0].serveraddr server` on the command line, or specify
 the corresponding section in the configuration file.
 
 The RF simulator is using the configuration module, and its parameters are defined in a specific section called "rfsimulator". Add the following options to the command line in order to enable different RFSim features:
 
-| CL option                        | usage                                                                          | default                |
+| CL option                            | usage                                                                          | default                |
-|:---------------------            |:-------------------------------------------------------------------------------|----:                   |
+|:-------------------------------------|:-------------------------------------------------------------------------------|----:                   |
-|`--rfsimulator.serveraddr <addr>` | IPv4v6 address or DNS name to connect to, or `server` to behave as a IPv4v6 TCP server | 127.0.0.1      |
+|`--rfsimulator.[0].serveraddr <addr>` | IPv4v6 address or DNS name to connect to, or `server` to behave as a IPv4v6 TCP server | 127.0.0.1      |
-|`--rfsimulator.serverport <port>` | port number to connect to or to listen on (eNB, which behaves as a tcp server) | 4043                   |
+|`--rfsimulator.[0].serverport <port>` | port number to connect to or to listen on (eNB, which behaves as a tcp server) | 4043                   |
-|`--rfsimulator.options`           | list of comma separated run-time options, two are supported: `chanmod`, `saviq`| all options disabled   |
+|`--rfsimulator.[0].options`           | list of comma separated run-time options, two are supported: `chanmod`, `saviq`| all options disabled   |
-|`--rfsimulator.options saviq`     | store IQs to a file for future replay                                          | disabled               |
+|`--rfsimulator.[0].options saviq`     | store IQs to a file for future replay                                          | disabled               |
-|`--rfsimulator.options chanmod`   | enable the channel model                                                       | disabled               |
+|`--rfsimulator.[0].options chanmod`   | enable the channel model                                                       | disabled               |
-|`--rfsimulator.IQfile <file>`     | path to a file to store the IQ samples to (only with `saviq`)                  | `/tmp/rfsimulator.iqs` |
+|`--rfsimulator.[0].IQfile <file>`     | path to a file to store the IQ samples to (only with `saviq`)                  | `/tmp/rfsimulator.iqs` |
-|`--rfsimulator.prop_delay`        | simulated receive-path (gNB: UL, UE: DL) propagation delay in ms               | 0                      |
+|`--rfsimulator.[0].prop_delay`        | simulated receive-path (gNB: UL, UE: DL) propagation delay in ms               | 0                      |
-|`--rfsimulator.wait_timeout`      | wait timeout when no UE is connected                                           | 1                      |
+|`--rfsimulator.[0].wait_timeout`      | wait timeout when no UE is connected                                           | 1                      |
 
 Please refer to this document [`SIMULATION/TOOLS/DOC/channel_simulation.md`](../../openair1/SIMULATION/TOOLS/DOC/channel_simulation.md) for information about using the RFSimulator options to run the simulator with a channel model.
 
 ## 4G case
 
-For the eNB, use a valid configuration file setup for the USRP board tests and start the softmodem with the `--rfsim` and `--rfsimulator.serveraddr server` options.
+For the eNB, use a valid configuration file setup for the USRP board tests and start the softmodem with the `--rfsim` and `--rfsimulator.[0].serveraddr server` options.
 ```bash
-sudo ./lte-softmodem -O <config file> --rfsim --rfsimulator.serveraddr server
+sudo ./lte-softmodem -O <config file> --rfsim --rfsimulator.[0].serveraddr server
 ```
 Often, configuration files define the corresponding `rfsimulator` section, in
-which case you might omit `--rfsimulator.serveraddr server`. Example:
+which case you might omit `--rfsimulator.[0].serveraddr server`. Example:
 ```
-rfsimulator : {
+rfsimulator = (
-  serveraddr = "server";
+  {
-};
+    serveraddr = "server";
+  }
+);
 ```
 
 For the UE, it should be set to the IP address of the eNB. For instance, if the
 eNB runs on another host with IP `192.168.2.200`, do
 ```bash
-sudo ./lte-uesoftmodem -C 2685000000 -r 50 --rfsim --rfsimulator.serveraddr 192.168.2.200
+sudo ./lte-uesoftmodem -C 2685000000 -r 50 --rfsim --rfsimulator.[0].serveraddr 192.168.2.200
 ```
 For running on the same host, only `--rfsim` is necessary.
 
@@ -117,7 +119,7 @@ Similarly as for 4G, first launch the gNB, here in an example for the phytest:
 run gNB:
 
   ```bash
-  sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --gNBs.[0].min_rxtxtime 6 --phy-test --rfsim --rfsimulator.serveraddr server
+  sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf --gNBs.[0].min_rxtxtime 6 --phy-test --rfsim --rfsimulator.[0].serveraddr server
   ```
 
 where `--gNBs.[0].min_rxtxtime 6` is due to the UE not being able to handle shorter
@@ -127,19 +129,19 @@ in the config file.
 and run UE:
 
   ```bash
-  sudo ./nr-uesoftmodem --rfsim --phy-test --rfsimulator.serveraddr <TARGET_GNB_IP_ADDRESS>
+  sudo ./nr-uesoftmodem --rfsim --phy-test --rfsimulator.[0].serveraddr <TARGET_GNB_IP_ADDRESS>
   ```
 
 To run OAI RFSimulator for SA mode, gNB:
 
   ```bash
-  sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --rfsim --rfsimulator.serveraddr server
+  sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --rfsim --rfsimulator.[0].serveraddr server
   ```
 
 and UE:
 
   ```bash
-  sudo ./nr-uesoftmodem --rfsim --rfsimulator.serveraddr <TARGET_GNB_IP_ADDRESS>
+  sudo ./nr-uesoftmodem --rfsim --rfsimulator.[0].serveraddr <TARGET_GNB_IP_ADDRESS>
   ```
 
 In the commands for the UE, `TARGET_GNB_IP_ADDRESS` can be 127.0.0.1 if both UE and gNB run on the same machine.
@@ -182,7 +184,7 @@ In case of a transparent GEO satellite, the minumum one-way propagation delay (D
 So, additionally to other parameters, this parameter should be given when executing the gNB and the UE executables:
 
 ```
---rfsimulator.prop_delay 238.74
+--rfsimulator.[0].prop_delay 238.74
 ```
 
 Note:
@@ -218,8 +220,8 @@ RFsimulator supports beam domain simulation.
 
 Several new CLI parameters were added
 
-* `--rfsimulator.enable_beams` : enable beam domain simulation. Should match on server and all clients.
+* `--rfsimulator.[0].enable_beams` : enable beam domain simulation. Should match on server and all clients.
-* `--rfsimulator.beam_gains <comma separated list>` : define a matrix of additional pathloss values (in dB)
+* `--rfsimulator.[0].beam_gains <comma separated list>` : define a matrix of additional pathloss values (in dB)
 to simulate the effect of different beam combinations in the RF simulator. You provide a comma-separated
 list of numbers, which forms the first row of a square matrix. The rest of the matrix is filled by projecting
 these values onto the diagonals, making it symmetric.
@@ -236,10 +238,10 @@ these values onto the diagonals, making it symmetric.
  Using the example above, if gNB is receiving in beam 1 and the UE is transmitting in beam 1, an additional
  2 dB pathloss will be applied on top of the pathloss from the channel model (if present).
 
-* `--rfsimulator.beam_map <beam_map>` : where `<beam_map>` is a `uint64_t` value where each bit is an enabled TX/RX beam.
+* `--rfsimulator.[0].beam_map <beam_map>` : where `<beam_map>` is a `uint64_t` value where each bit is an enabled TX/RX beam.
    For gNB: Initial beam_map, i.e. which beams gNB transmits/receives before calling beam APIs.
    For UE: Beam position in beam space in the simulation. The UE is not expected to use the beam APIs for now.
-* `--rfsimulator.beam_ids <beam_ids>` : where `<beam_ids>` is a comma separated list. Same as above but added for convenience.
+* `--rfsimulator.[0].beam_ids <beam_ids>` : where `<beam_ids>` is a comma separated list. Same as above but added for convenience.
 
 ## Runtime commands
 

targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf

@@ -196,13 +196,15 @@ RUs = (
     }
 );  
 
-rfsimulator: {
+rfsimulator = (
-serveraddr = "server";
+  {
+    serveraddr = "server";
     serverport = 4043;
     options = (); #("saviq"); or/and "chanmod"
     modelname = "AWGN";
     IQfile = "/tmp/rfsimulator.iqs"
-}
+  }
+);
 
      log_config :
      {

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci0.conf

@@ -187,13 +187,13 @@ RUs = ({
     clock_src = "internal";
 });
 
-rfsimulator: {
+rfsimulator = ({
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
-}
+});
 
 log_config: {
   global_log_level = "info";

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band66.25prb.rfsim.pci1.conf

@@ -187,13 +187,13 @@ RUs = ({
     clock_src = "internal";
 });
 
-rfsimulator: {
+rfsimulator = ({
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
-}
+});
 
 log_config: {
   global_log_level = "info";

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci0.conf

@@ -185,13 +185,13 @@ RUs = ({
     clock_src = "internal";
 });
 
-rfsimulator: {
+rfsimulator =({
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
-}
+});
 
 log_config: {
   global_log_level = "info";

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-du.sa.band78.106prb.rfsim.pci1.conf

@@ -185,13 +185,13 @@ RUs = ({
     clock_src = "internal";
 });
 
-rfsimulator: {
+rfsimulator =({
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs"
-}
+});
 
 log_config: {
   global_log_level = "info";

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb-pnf.band78.rfsim.conf

@@ -27,9 +27,9 @@ RUs = ({
   max_rxgain = 125;
 });
 
-rfsimulator: {
+rfsimulator = ({
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
-};
+});

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band254.ntn.mu1.24prb.rfsim.conf

@@ -237,14 +237,15 @@ THREAD_STRUCT = (
   }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band255.ntn.mu0.25prb.rfsim.conf

@@ -236,14 +236,15 @@ THREAD_STRUCT = (
   }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band256.ntn.mu0.25prb.rfsim.conf

@@ -236,14 +236,15 @@ THREAD_STRUCT = (
   }
 );
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.u0.25prb.rfsim.conf

@@ -207,14 +207,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -205,14 +205,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -205,14 +205,15 @@ RUs = (
 );
 
 
-rfsimulator :
+rfsimulator = (
 {
   serveraddr = "server";
   serverport = 4043;
   options = (); #("saviq"); or/and "chanmod"
   modelname = "AWGN";
   IQfile = "/tmp/rfsimulator.iqs";
-};
+}
+);
 
 security = {
   # preferred ciphering algorithms

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

@@ -195,11 +195,12 @@ RUs:
     clock_src: internal
 
 rfsimulator:
-  serveraddr: server
+  -
-  serverport: 4043
+    serveraddr: server
-  options: [] #("saviq"); or/and "chanmod"
+    serverport: 4043
-  modelname: AWGN
+    options: [] #("saviq"); or/and "chanmod"
-  IQfile: /tmp/rfsimulator.iqs
+    modelname: AWGN
+    IQfile: /tmp/rfsimulator.iqs
 
 security:
   # preferred ciphering algorithms

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

@@ -176,11 +176,12 @@ RUs:
     clock_src: internal
 
 rfsimulator:
-  serveraddr: server
+  -
-  serverport: 4043
+    serveraddr: server
-  options: [] #("saviq"); or/and "chanmod"
+    serverport: 4043
-  modelname: AWGN
+    options: [] #("saviq"); or/and "chanmod"
-  IQfile: /tmp/rfsimulator.iqs
+    modelname: AWGN
+    IQfile: /tmp/rfsimulator.iqs
 
 security:
   # preferred ciphering algorithms

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

@@ -208,9 +208,11 @@ RUs = (
 );
 
 
-rfsimulator: {
+rfsimulator = (
+  {
     serveraddr = "server";
-};
+  }
+);
 
 security = {
   # preferred ciphering algorithms