diff --git a/ci-scripts/conf_files/lteue.usim.conf b/ci-scripts/conf_files/lteue.usim.conf
deleted file mode 100644
index e9b02e9b1fbbf289501e92ff8cd8196d593cce34..0000000000000000000000000000000000000000
--- a/ci-scripts/conf_files/lteue.usim.conf
+++ /dev/null
@@ -1,153 +0,0 @@
-# List of known PLMNS
-PLMN: {
- PLMN0: {
- FULLNAME="OpenAirInterface";
- SHORTNAME="OAICN";
- MNC="96";
- MCC="208";
- };
-};
-
-UE0:
-{
- USER: {
- IMEI="356113022094149";
- MANUFACTURER="OAI";
- MODEL="LTE SoftModem";
- PIN="0000";
- };
-
- SIM: {
- MSIN="0100001111";
- USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
- OPC="e734f8734007d6c5ce7a0508809e7e9c";
- MSISDN="33611123456";
- };
-
- # Home PLMN Selector with Access Technology
- HPLMN= "20896";
-
- # User controlled PLMN Selector with Access Technology
- UCPLMN_LIST = ();
-
- # Operator PLMN List
- OPLMN_LIST = ("20896");
-
- # Operator controlled PLMN Selector with Access Technology
- OCPLMN_LIST = ();
-
- # Forbidden plmns
- FPLMN_LIST = ();
-
- # Equivalent home plmns
- EHPLMN_LIST = ();
-
-};
-
-UE1:
-{
- USER: {
- IMEI="356113022094149";
- MANUFACTURER="OAI";
- MODEL="LTE SoftModem";
- PIN="0000";
- };
-
- SIM: {
- MSIN="0100001111";
- USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
- OPC="e734f8734007d6c5ce7a0508809e7e9c";
- MSISDN="33611123456";
- };
-
- # Home PLMN Selector with Access Technology
- HPLMN= "20896";
-
- # User controlled PLMN Selector with Access Technology
- UCPLMN_LIST = ();
-
- # Operator PLMN List
- OPLMN_LIST = ("20896");
-
- # Operator controlled PLMN Selector with Access Technology
- OCPLMN_LIST = ();
-
- # Forbidden plmns
- FPLMN_LIST = ();
-
- # Equivalent home plmns
- EHPLMN_LIST = ();
-
-};
-
-UE2:
-{
- USER: {
- IMEI="356113022094149";
- MANUFACTURER="OAI";
- MODEL="LTE SoftModem";
- PIN="0000";
- };
-
- SIM: {
- MSIN="0100001111";
- USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
- OPC="e734f8734007d6c5ce7a0508809e7e9c";
- MSISDN="33611123456";
- };
-
- # Home PLMN Selector with Access Technology
- HPLMN= "20896";
-
- # User controlled PLMN Selector with Access Technology
- UCPLMN_LIST = ();
-
- # Operator PLMN List
- OPLMN_LIST = ("20896");
-
- # Operator controlled PLMN Selector with Access Technology
- OCPLMN_LIST = ();
-
- # Forbidden plmns
- FPLMN_LIST = ();
-
- # Equivalent home plmns
- EHPLMN_LIST = ();
-
-};
-
-UE3:
-{
- USER: {
- IMEI="356113022094149";
- MANUFACTURER="OAI";
- MODEL="LTE SoftModem";
- PIN="0000";
- };
-
- SIM: {
- MSIN="0100001111";
- USIM_API_K="8baf473f2f8fd09487cccbd7097c6862";
- OPC="e734f8734007d6c5ce7a0508809e7e9c";
- MSISDN="33611123456";
- };
-
- # Home PLMN Selector with Access Technology
- HPLMN= "20896";
-
- # User controlled PLMN Selector with Access Technology
- UCPLMN_LIST = ();
-
- # Operator PLMN List
- OPLMN_LIST = ("20896");
-
- # Operator controlled PLMN Selector with Access Technology
- OCPLMN_LIST = ();
-
- # Forbidden plmns
- FPLMN_LIST = ();
-
- # Equivalent home plmns
- EHPLMN_LIST = ();
-
-};
diff --git a/ci-scripts/conf_files/nr-ue-sim.conf b/ci-scripts/conf_files/nr-ue-sim.conf
deleted file mode 100644
index 884430bf3919b9eb4065eabdfe8363c26c62b76f..0000000000000000000000000000000000000000
--- a/ci-scripts/conf_files/nr-ue-sim.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-uicc0 = {
- imsi = "@FULL_IMSI@";
- key = "@FULL_KEY@";
- opc= "@OPC@";
- dnn= "@DNN@";
- nssai_sst=@NSSAI_SST@;
-}
diff --git a/ci-scripts/conf_files/nr-ue.nfapi.conf b/ci-scripts/conf_files/nr-ue.nfapi.conf
deleted file mode 100644
index 90798702cf93ff59974da55ce0300712931da2a4..0000000000000000000000000000000000000000
--- a/ci-scripts/conf_files/nr-ue.nfapi.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-log_config = {
- global_log_level ="info";
- hw_log_level ="info";
- phy_log_level ="info";
- mac_log_level ="info";
- rlc_log_level ="info";
- pdcp_log_level ="info";
- rrc_log_level ="info";
-};
-
-
-L1s = (
- {
- num_cc = 1;
- tr_n_preference = "nfapi";
- local_n_if_name = "ens3";
- remote_n_address = "127.0.0.1"; //Proxy IP
- local_n_address = "127.0.0.1";
- local_n_portc = 50600;
- remote_n_portc = 50601;
- local_n_portd = 50610;
- remote_n_portd = 50611;
- }
-);
-
-RUs = (
- {
- local_rf = "yes"
- nb_tx = 1
- nb_rx = 1
- att_tx = 90
- att_rx = 0;
- bands = [7,38,42,43];
- max_pdschReferenceSignalPower = -27;
- max_rxgain = 125;
- }
-);
diff --git a/ci-scripts/conf_files/ue.nfapi.conf b/ci-scripts/conf_files/ue.nfapi.conf
deleted file mode 100644
index 09ad7529b1541190859ab923c2f6a91d103aba14..0000000000000000000000000000000000000000
--- a/ci-scripts/conf_files/ue.nfapi.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-log_config = {
- global_log_level ="info";
- hw_log_level ="info";
- phy_log_level ="info";
- mac_log_level ="info";
- rlc_log_level ="info";
- pdcp_log_level ="info";
- rrc_log_level ="info";
-};
-
-
-L1s = (
- {
- num_cc = 1;
- tr_n_preference = "nfapi";
- local_n_if_name = "ens3";
- remote_n_address = "CI_ENB_IP_ADDR";
- local_n_address = "CI_UE_IP_ADDR";
- local_n_portc = 50000;
- remote_n_portc = 50001;
- local_n_portd = 50010;
- remote_n_portd = 50011;
- }
-);
-
-RUs = (
- {
- local_rf = "yes"
- nb_tx = 1
- nb_rx = 1
- att_tx = 90
- att_rx = 0;
- bands = [7,38,42,43];
- max_pdschReferenceSignalPower = -27;
- max_rxgain = 125;
- }
-);
diff --git a/doc/L2NFAPI.md b/doc/L2NFAPI.md
index e87f9f270cd3e79dba15ec569d5833d0849e1172..d7bba0bfeb4822dbe9c431cd477b4c7563a22185 100644
--- a/doc/L2NFAPI.md
+++ b/doc/L2NFAPI.md
@@ -64,7 +64,7 @@ $ sudo -E ./nr-softmodem -O ../ci-scripts/conf_files/episci/proxy_rcc.band78.tm1
```
### Start UE
```bash
-$ sudo -E ./nr-uesoftmodem -O ../ci-scripts/conf_files/episci/proxy_nr-ue.nfapi.conf --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1
+$ sudo -E ./nr-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --nfapi STANDALONE_PNF --node-number 2 --sa --emulate-l1
```
### EpiSci's Documentation
A more detailed tutorial is available on the [EpiSci GitHub Repository](https://github.com/EpiSci/oai-lte-5g-multi-ue-proxy#readme).
diff --git a/doc/L2NFAPI_NOS1.md b/doc/L2NFAPI_NOS1.md
index 10d0c2a5774cfe32efa68cd556843c33bc86ccb3..b65aaef3ba23aacc9be2436b8a53c01b9024c5e0 100644
--- a/doc/L2NFAPI_NOS1.md
+++ b/doc/L2NFAPI_NOS1.md
@@ -191,7 +191,7 @@ Last, the S1 interface shall be properly set.
```bash
$ ssh sudousername@machineB
cd ue_folder
-# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor
+# Edit ci-scripts/conf_files/nrue.uicc.conf with your preferred editor
```
Verify the nFAPI interface setup on the loopback interface.
@@ -246,9 +246,9 @@ In the second terminal (the one you used to build the UE):
$ ssh sudousername@machineC
cd ue_folder/cmake_targets
# Test 64 UEs, 1 thread in FDD mode
-sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
# Test 64 UEs, 1 thread in TDD mode
-sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1
# The "-T 1" option means TDD config
```
@@ -262,7 +262,7 @@ For example, running with 4 UEs:
```bash
$ ssh sudousername@machineC
cd ue_folder/cmake_targets
-sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --noS1 --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
sleep 10
ifconfig
ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX
diff --git a/doc/L2NFAPI_S1.md b/doc/L2NFAPI_S1.md
index e7faec106f51b99660407f9c8438feeeb3e4bd47..a8b287ddf3ffc0f08e2d6cb9587b0d01867b6711 100644
--- a/doc/L2NFAPI_S1.md
+++ b/doc/L2NFAPI_S1.md
@@ -196,7 +196,7 @@ Last, the S1 interface shall be properly set.
```bash
$ ssh sudousername@machineB
cd ue_folder
-# Edit ci-scripts/conf_files/ue.nfapi.conf with your preferred editor
+# Edit ci-scripts/conf_files/nrue.uicc.conf with your preferred editor
```
Verify the nFAPI interface setup on the loopback interface.
@@ -252,9 +252,9 @@ In the second terminal (the one you used to build the UE):
$ ssh sudousername@machineC
cd ue_folder/cmake_targets
# Test 64 UEs, 1 thread in FDD mode
-sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
# Test 64 UEs, 1 thread in TDD mode
-sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 -T 1 > ue.log 2>&1
# The "-T 1" option means TDD config
```
@@ -268,7 +268,7 @@ For example, running with 4 UEs:
```bash
$ ssh sudousername@machineC
cd ue_folder/cmake_targets
-sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
+sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/nrue.uicc.conf --L2-emul 3 --num-ues 64 --nums_ue_thread 1 > ue.log 2>&1
sleep 10
ifconfig
ens3 Link encap:Ethernet HWaddr XX:XX:XX:XX:XX:XX
diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9
index 53b179a93569ce16374d6c23db90ffeb4759ec76..b142847c8e51d4da202299c7f564bfcd20abcb05 100644
--- a/docker/Dockerfile.nrUE.rhel9
+++ b/docker/Dockerfile.nrUE.rhel9
@@ -59,9 +59,6 @@ COPY --from=nr-ue-build \
./
COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh
WORKDIR /opt/oai-nr-ue/etc
-COPY --from=nr-ue-build \
- /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \
- ./
COPY --from=nr-ue-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
diff --git a/docker/Dockerfile.nrUE.rocky b/docker/Dockerfile.nrUE.rocky
index f0cc4b5788d38c3a2573a0607137ce89ce973040..cb07b2eb6a7375dfd0718d5f44cf146e24a94839 100644
--- a/docker/Dockerfile.nrUE.rocky
+++ b/docker/Dockerfile.nrUE.rocky
@@ -63,10 +63,6 @@ COPY --from=nr-ue-build \
./
WORKDIR /opt/oai-nr-ue/etc
-COPY --from=nr-ue-build \
- /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \
- /oai-ran/docker/etc/nr-ue.nfapi.conf \
- ./
COPY --from=nr-ue-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
diff --git a/docker/Dockerfile.nrUE.ubuntu20 b/docker/Dockerfile.nrUE.ubuntu20
index c298394abd7f7e86b44d0f34cbbcd53fbaa40dac..a4b63d3cef5b8368211e770f97fb4c92e981feaa 100644
--- a/docker/Dockerfile.nrUE.ubuntu20
+++ b/docker/Dockerfile.nrUE.ubuntu20
@@ -65,9 +65,6 @@ COPY --from=nr-ue-build \
COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh
WORKDIR /opt/oai-nr-ue/etc
-COPY --from=nr-ue-build \
- /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \
- ./
COPY --from=nr-ue-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \