diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index 67dc5c5e4d..850961c00b 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -301,7 +301,6 @@ class OaiCiTest():
self.iperf_profile = ''
self.iperf_tcp_rate_target = ''
self.finalStatus = False
- self.air_interface=''
self.ue_ids = []
self.svr_node = None
self.svr_id = None
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 4628b1fcba..75f92bba3b 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -103,13 +103,6 @@ def ExecuteActionWithParam(action, ctx, node):
elif action == 'Initialize_eNB':
RAN.Initialize_eNB_args=test.findtext('Initialize_eNB_args')
- #local variable air_interface
- air_interface = test.findtext('air_interface')
- if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
- RAN.air_interface = 'lte-softmodem'
- else:
- RAN.air_interface = air_interface.lower() +'-softmodem'
-
cmd_prefix = test.findtext('cmd_prefix')
if cmd_prefix is not None: RAN.cmd_prefix = cmd_prefix
success = RAN.InitializeeNB(ctx, node, HTML)
@@ -122,13 +115,6 @@ def ExecuteActionWithParam(action, ctx, node):
string_field=test.findtext('u_retx_th')
if (string_field is not None):
RAN.ran_checkers['u_retx_th'] = [float(x) for x in string_field.split(',')]
-
- #local variable air_interface
- air_interface = test.findtext('air_interface')
- if (air_interface is None) or (air_interface.lower() not in ['nr','lte']):
- RAN.air_interface = 'lte-softmodem'
- else:
- RAN.air_interface = air_interface.lower() +'-softmodem'
success = RAN.TerminateeNB(ctx, node, HTML)
elif action == 'Initialize_UE' or action == 'Attach_UE' or action == 'Detach_UE' or action == 'Terminate_UE' or action == 'CheckStatusUE' or action == 'DataEnable_UE' or action == 'DataDisable_UE':
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index ef790b45c8..020ec5949f 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -64,7 +64,6 @@ class RANManagement():
self.eNBSourceCodePath = ''
self.Initialize_eNB_args = ''
self.imageKind = ''
- self.air_interface = ''
self.eNBOptions = ['', '', '']
self.eNBstatuses = [-1, -1, -1]
self.runtime_stats= ''
@@ -99,7 +98,7 @@ class RANManagement():
logfile = f'{lSourcePath}/cmake_targets/enb.log'
cmd.cd(f"{lSourcePath}/cmake_targets/") # important: set wd so nrL1_stats.log etc are logged here
- cmd.run(f'sudo -E stdbuf -o0 {self.cmd_prefix} {lSourcePath}/cmake_targets/ran_build/build/{self.air_interface} -O {lSourcePath}/{full_config_file} {extra_options} > {logfile} 2>&1 &')
+ cmd.run(f'sudo -E stdbuf -o0 {self.cmd_prefix} {lSourcePath}/cmake_targets/ran_build/build/nr-softmodem -O {lSourcePath}/{full_config_file} {extra_options} > {logfile} 2>&1 &')
if extra_options != '':
self.eNBOptions = extra_options
@@ -113,12 +112,12 @@ class RANManagement():
enbDidSync = True
break
if not enbDidSync:
- cmd.run(f'sudo killall -9 {self.air_interface}') # in case it did not stop automatically
+ cmd.run(f'sudo killall -9 nr-softmodem') # in case it did not stop automatically
archiveArtifact(cmd, ctx, logfile)
cmd.close()
- msg = f'{self.cmd_prefix} {self.air_interface} -O {config_file} {extra_options}'
+ msg = f'{self.cmd_prefix} nr-softmodem -O {config_file} {extra_options}'
if enbDidSync:
logging.debug('\u001B[1m Initialize eNB/gNB Completed\u001B[0m')
HTML.CreateHtmlTestRowQueue(msg, 'OK', [])
diff --git a/ci-scripts/xml_files/gnb_phytest_rfemulator_run_100_2x2.xml b/ci-scripts/xml_files/gnb_phytest_rfemulator_run_100_2x2.xml
index 620d275d37..c91b9c8fc5 100644
--- a/ci-scripts/xml_files/gnb_phytest_rfemulator_run_100_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_rfemulator_run_100_2x2.xml
@@ -59,7 +59,6 @@
caracal
true
Terminate gNB
- NR
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
index f2c140faac..f2ad827d29 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run.xml
@@ -37,7 +37,6 @@
Initialize gNB USRP
caracal
-O ci-scripts/conf_files/gnb.band79.106prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 106 -t 23 -D 127 -m 28 -M 106 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time
- NR
numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0
@@ -59,7 +58,6 @@
true
Terminate gNB
caracal
- NR
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
index 5204653223..d298873582 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_100_2x2.xml
@@ -37,7 +37,6 @@
Initialize gNB USRP
caracal
-O ci-scripts/conf_files/gnb.band79.273prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 273 -t 23 -D 127 -m 23 -M 273 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time
- NR
numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0
@@ -59,7 +58,6 @@
true
Terminate gNB
caracal
- NR
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
index e939cb1e07..7354fa3596 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60.xml
@@ -37,7 +37,6 @@
Initialize gNB USRP
caracal
-O ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf --phy-test -q -U 768 -T 162 -t 23 -D 127 -m 23 -M 162 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time
- NR
numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0
@@ -59,7 +58,6 @@
true
Terminate gNB
caracal
- NR
diff --git a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
index 1adcd042ac..7dd50ca83f 100644
--- a/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
+++ b/ci-scripts/xml_files/gnb_phytest_usrp_run_60_2x2.xml
@@ -37,7 +37,6 @@
Initialize gNB USRP
caracal
-O ci-scripts/conf_files/gnb.band79.162prb.usrpn300.phytest-dora.conf --phy-test --gNBs.[0].pdsch_AntennaPorts_XP 2 --RUs.[0].nb_tx 2 --RUs.[0].nb_rx 2 -q -U 768 -T 162 -t 23 -D 127 -m 23 -M 162 -l 2 --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time
- NR
numactl --cpunodebind=netdev:enp94s0f0np0 --membind=netdev:enp94s0f0np0
@@ -59,7 +58,6 @@
true
Terminate gNB
caracal
- NR