Skip to content

O
OpenXG UE
Commit c50101f3 authored by wujing's avatar wujing
Browse files
Options

oaienv -> ranenv| build_oai -> build_ran

parent 6befa8ad
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 51 deletions
src/MAC/NR_SCD_UE/nr_ue_procedures.c
View file @ c50101f3
...@@ -3820,7 +3820,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t ...@@ -3820,7 +3820,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
NR_MAC_RAR *rar = (NR_MAC_RAR *) (dlsch_buffer + 1); // RAR subPDU pointer NR_MAC_RAR *rar = (NR_MAC_RAR *) (dlsch_buffer + 1); // RAR subPDU pointer
uint8_t preamble_index = ra->ra_PreambleIndex; uint8_t preamble_index = ra->ra_PreambleIndex;
LOG_E(NR_MAC, "In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)\n", __FUNCTION__, frame, slot, mod_id, preamble_index); LOG_D(NR_MAC, "In %s:[%d.%d]: [UE %d][RAPROC] invoking MAC for received RAR (current preamble %d)\n", __FUNCTION__, frame, slot, mod_id, preamble_index);
while (1) { while (1) {
n_subheaders++; n_subheaders++;
...@@ -3839,7 +3839,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t ...@@ -3839,7 +3839,7 @@ int nr_ue_process_rar(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_t
} }
} }
if (rarh->RAPID == preamble_index) { if (rarh->RAPID == preamble_index) {
LOG_E(NR_MAC, "[UE %d][RAPROC][%d.%d] Found RAR with the intended RAPID %d\n", mod_id, frame, slot, rarh->RAPID); LOG_D(NR_MAC, "[UE %d][RAPROC][%d.%d] Found RAR with the intended RAPID %d\n", mod_id, frame, slot, rarh->RAPID);
rar = (NR_MAC_RAR *) (dlsch_buffer + n_subheaders + (n_subPDUs - 1) * sizeof(NR_MAC_RAR)); rar = (NR_MAC_RAR *) (dlsch_buffer + n_subheaders + (n_subPDUs - 1) * sizeof(NR_MAC_RAR));
ra->RA_RAPID_found = 1; ra->RA_RAPID_found = 1;
if (get_softmodem_params()->emulate_l1) { if (get_softmodem_params()->emulate_l1) {
......
src/PHY/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @ c50101f3
...@@ -1857,7 +1857,7 @@ void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t ...@@ -1857,7 +1857,7 @@ void nr_ue_prach_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, uint8_t
int16_t ra_preamble_rx_power = (int16_t)(prach_resources->ra_PREAMBLE_RECEIVED_TARGET_POWER - pathloss + 30); int16_t ra_preamble_rx_power = (int16_t)(prach_resources->ra_PREAMBLE_RECEIVED_TARGET_POWER - pathloss + 30);
ue->tx_power_dBm[nr_slot_tx] = min(nr_get_Pcmax(mod_id), ra_preamble_rx_power); ue->tx_power_dBm[nr_slot_tx] = min(nr_get_Pcmax(mod_id), ra_preamble_rx_power);
LOG_E(PHY, "In %s: [UE %d][RAPROC][%d.%d]: Generating PRACH Msg1 (preamble %d, PL %d dB, P0_PRACH %d, TARGET_RECEIVED_POWER %d dBm, RA-RNTI %x)\n", LOG_D(PHY, "In %s: [UE %d][RAPROC][%d.%d]: Generating PRACH Msg1 (preamble %d, PL %d dB, P0_PRACH %d, TARGET_RECEIVED_POWER %d dBm, RA-RNTI %x)\n",
__FUNCTION__, __FUNCTION__,
mod_id, mod_id,
frame_tx, frame_tx,
......
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/build/run_tests.sh
View file @ c50101f3
...@@ -147,8 +147,8 @@ then ...@@ -147,8 +147,8 @@ then
then then
echo "cd $OAIENV_DIR" echo "cd $OAIENV_DIR"
cd $OAIENV_DIR cd $OAIENV_DIR
echo "source oaienv" echo "source ranenv"
source oaienv source ranenv
echo "cd $WORK_DIR" echo "cd $WORK_DIR"
cd $WORK_DIR cd $WORK_DIR
echo "cmake CMakeLists.txt" echo "cmake CMakeLists.txt"
......
src/PHY/SIMULATION/NR_UE_PHY/unit_tests/readme.txt
View file @ c50101f3
...@@ -26,7 +26,7 @@ This directory contains testbenchs for 5G NR physical layers. ...@@ -26,7 +26,7 @@ This directory contains testbenchs for 5G NR physical layers.
Before building unit tests, full UE build should be done before (maily for asn1 dependencies): Before building unit tests, full UE build should be done before (maily for asn1 dependencies):
Initialise environment: Initialise environment:
- under openairinterface5g enter >source oaienv - under openairinterface5g enter >source ranenv
Install tools: Install tools:
- under openairinterface5g/cmake_targets/build -I - under openairinterface5g/cmake_targets/build -I
Build NR UE: Build NR UE:
...@@ -49,7 +49,7 @@ input_buffer_test.h: it allows providing samples for pss test. ...@@ -49,7 +49,7 @@ input_buffer_test.h: it allows providing samples for pss test.
How to build & run tests How to build & run tests
======================== ========================
Before building, oai environment should be set by entering under directory openairinterface5g "source oaienv". Before building, oai environment should be set by entering under directory openairinterface5g "source ranenv".
A script "run_tests.sh" allows to build, to run and to check all tests. A script "run_tests.sh" allows to build, to run and to check all tests.
To run a complete non regression of unit tests, go under directory NR_UE_PHY/unit_tests/build and execute: To run a complete non regression of unit tests, go under directory NR_UE_PHY/unit_tests/build and execute:
......
src/cmake_targets/autotests/run_exec_lte-softmodem_tests.py
View file @ c50101f3
...@@ -370,7 +370,7 @@ def cleanOldPrograms(oai, programList, CleanUpAluLteBox, ExmimoRfStop, logdir, l ...@@ -370,7 +370,7 @@ def cleanOldPrograms(oai, programList, CleanUpAluLteBox, ExmimoRfStop, logdir, l
result = oai.send_recv(cmd) result = oai.send_recv(cmd)
# print "\t\t > "+cmd # print "\t\t > "+cmd
# print "\t\t < "+result # print "\t\t < "+result
cmd = "( " + "cd " + logdirOAI5GRepo + " ; source oaienv ; " + ExmimoRfStop + " ) >> " + logdir + "/oai_test_setup_cleanup.log.`hostname` 2>&1 ; sync " cmd = "( " + "cd " + logdirOAI5GRepo + " ; source ranenv ; " + ExmimoRfStop + " ) >> " + logdir + "/oai_test_setup_cleanup.log.`hostname` 2>&1 ; sync "
# print "cleanoldprograms cmd = " + cmd # print "cleanoldprograms cmd = " + cmd
res=oai.send_recv(cmd, False, timeout=600) res=oai.send_recv(cmd, False, timeout=600)
# print "\t\t > "+cmd # print "\t\t > "+cmd
...@@ -478,7 +478,7 @@ class testCaseThread_generic (threading.Thread): ...@@ -478,7 +478,7 @@ class testCaseThread_generic (threading.Thread):
#print "res = " + res #print "res = " + res
cmd = "( cd " + self.logdirOAI5GRepo + " \n " cmd = "( cd " + self.logdirOAI5GRepo + " \n "
cmd = cmd + "source oaienv \n" cmd = cmd + "source ranenv \n"
cmd = cmd + "$OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash --run-group \"" + self.testcasename + "\" -p \'\'" cmd = cmd + "$OPENAIR_DIR/cmake_targets/autotests/run_exec_autotests.bash --run-group \"" + self.testcasename + "\" -p \'\'"
cmd = cmd + " ) >& " + logfile_task_testcasename_out + " ; " + "mkdir -p " + logdir_remote_testcase + "; mv " + logfile_task_testcasename_out + " " +logdir_remote_testcase cmd = cmd + " ) >& " + logfile_task_testcasename_out + " ; " + "mkdir -p " + logdir_remote_testcase + "; mv " + logfile_task_testcasename_out + " " +logdir_remote_testcase
...@@ -699,7 +699,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -699,7 +699,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
index_eNBMachine = MachineList.index(eNBMachine) index_eNBMachine = MachineList.index(eNBMachine)
index_UEMachine = MachineList.index(UEMachine) index_UEMachine = MachineList.index(UEMachine)
index_EPCMachine = MachineList.index(EPCMachine) index_EPCMachine = MachineList.index(EPCMachine)
cmd = 'cd ' + logdirOAI5GRepo + '; source oaienv ; env|grep OPENAIR' cmd = 'cd ' + logdirOAI5GRepo + '; source ranenv ; env|grep OPENAIR'
oai_eNB = openair('localdomain', eNBMachine) oai_eNB = openair('localdomain', eNBMachine)
oai_eNB.connect(user, password) oai_eNB.connect(user, password)
res= oai_eNB.send_recv(cmd) res= oai_eNB.send_recv(cmd)
...@@ -710,7 +710,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -710,7 +710,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
oai_EPC.connect(user, password) oai_EPC.connect(user, password)
res = oai_eNB.send_recv(cmd) res = oai_eNB.send_recv(cmd)
if RRHMachine != '': if RRHMachine != '':
cmd = 'cd ' + logdirOAI5GRepo + '; source oaienv ; env|grep OPENAIR' cmd = 'cd ' + logdirOAI5GRepo + '; source ranenv ; env|grep OPENAIR'
index_RRHMachine = MachineList.index(RRHMachine) index_RRHMachine = MachineList.index(RRHMachine)
oai_RRH = openair('localdomain', RRHMachine) oai_RRH = openair('localdomain', RRHMachine)
oai_RRH.connect(user, password) oai_RRH.connect(user, password)
...@@ -769,7 +769,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -769,7 +769,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
logfile_task_RRH_out = logdir_RRH + '/RRH_task_out' + '_' + str(run) + '_.log' logfile_task_RRH_out = logdir_RRH + '/RRH_task_out' + '_' + str(run) + '_.log'
logfile_task_RRH = logdir_local_testcase + '/RRH_task' + '_' + str(run) + '_.log' logfile_task_RRH = logdir_local_testcase + '/RRH_task' + '_' + str(run) + '_.log'
task_RRH_compile = ' ( uname -a ; date \n' task_RRH_compile = ' ( uname -a ; date \n'
task_RRH_compile = task_RRH_compile + 'cd ' + logdirOAI5GRepo + '; git reset --hard HEAD ; git checkout ' + RRH_branch + ' ; source oaienv \n' task_RRH_compile = task_RRH_compile + 'cd ' + logdirOAI5GRepo + '; git reset --hard HEAD ; git checkout ' + RRH_branch + ' ; source ranenv \n'
task_RRH_compile = task_RRH_compile + ' source cmake_targets/tools/build_helper \n' task_RRH_compile = task_RRH_compile + ' source cmake_targets/tools/build_helper \n'
task_RRH_compile = task_RRH_compile + 'env |grep OPENAIR \n' task_RRH_compile = task_RRH_compile + 'env |grep OPENAIR \n'
task_RRH_compile = task_RRH_compile + update_config_file(oai_RRH, RRH_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n' task_RRH_compile = task_RRH_compile + update_config_file(oai_RRH, RRH_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n'
...@@ -780,7 +780,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -780,7 +780,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
task_RRH = ' ( uname -a ; date \n' task_RRH = ' ( uname -a ; date \n'
task_RRH = task_RRH + ' export OPENAIR_TESTDIR=' + logdir_RRH + '\n' task_RRH = task_RRH + ' export OPENAIR_TESTDIR=' + logdir_RRH + '\n'
task_RRH = task_RRH + 'cd ' + logdirOAI5GRepo + ' ; source oaienv ; source cmake_targets/tools/build_helper \n' task_RRH = task_RRH + 'cd ' + logdirOAI5GRepo + ' ; source ranenv ; source cmake_targets/tools/build_helper \n'
task_RRH = task_RRH + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n' task_RRH = task_RRH + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n'
if RRH_pre_exec != "": if RRH_pre_exec != "":
...@@ -810,7 +810,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -810,7 +810,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
logfile_pcap_tmp_eNB = '/tmp/' + '/eNB_tshark' + '_' + str(run) + '_.pcap' logfile_pcap_tmp_eNB = '/tmp/' + '/eNB_tshark' + '_' + str(run) + '_.pcap'
task_eNB_compile = ' ( uname -a ; date \n' task_eNB_compile = ' ( uname -a ; date \n'
task_eNB_compile = task_eNB_compile + 'cd ' + logdirOAI5GRepo + '; git reset --hard HEAD ; git checkout ' + eNB_branch + ' ; source oaienv \n' task_eNB_compile = task_eNB_compile + 'cd ' + logdirOAI5GRepo + '; git reset --hard HEAD ; git checkout ' + eNB_branch + ' ; source ranenv \n'
task_eNB_compile = task_eNB_compile + ' source cmake_targets/tools/build_helper \n' task_eNB_compile = task_eNB_compile + ' source cmake_targets/tools/build_helper \n'
task_eNB_compile = task_eNB_compile + 'env |grep OPENAIR \n' task_eNB_compile = task_eNB_compile + 'env |grep OPENAIR \n'
task_eNB_compile = task_eNB_compile + update_config_file(oai_eNB, eNB_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n' task_eNB_compile = task_eNB_compile + update_config_file(oai_eNB, eNB_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n'
...@@ -821,7 +821,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -821,7 +821,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
task_eNB = ' ( uname -a ; date \n' task_eNB = ' ( uname -a ; date \n'
task_eNB = task_eNB + ' export OPENAIR_TESTDIR=' + logdir_eNB + '\n' task_eNB = task_eNB + ' export OPENAIR_TESTDIR=' + logdir_eNB + '\n'
task_eNB = task_eNB + 'cd ' + logdirOAI5GRepo + ' ; source oaienv ; source cmake_targets/tools/build_helper \n' task_eNB = task_eNB + 'cd ' + logdirOAI5GRepo + ' ; source ranenv ; source cmake_targets/tools/build_helper \n'
task_eNB = task_eNB + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n' task_eNB = task_eNB + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n'
if eNB_pre_exec != "": if eNB_pre_exec != "":
...@@ -861,7 +861,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -861,7 +861,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
task_UE_compile = ' ( uname -a ; date \n' task_UE_compile = ' ( uname -a ; date \n'
task_UE_compile = task_UE_compile + 'array_exec_pid=()' + '\n' task_UE_compile = task_UE_compile + 'array_exec_pid=()' + '\n'
task_UE_compile = task_UE_compile + 'cd ' + logdirOAI5GRepo + '; git reset --hard HEAD ; git checkout ' + UE_branch + ' ; source oaienv \n' task_UE_compile = task_UE_compile + 'cd ' + logdirOAI5GRepo + '; git reset --hard HEAD ; git checkout ' + UE_branch + ' ; source ranenv \n'
task_UE_compile = task_UE_compile + 'source cmake_targets/tools/build_helper \n' task_UE_compile = task_UE_compile + 'source cmake_targets/tools/build_helper \n'
task_UE_compile = task_UE_compile + 'env |grep OPENAIR \n' task_UE_compile = task_UE_compile + 'env |grep OPENAIR \n'
task_UE_compile = task_UE_compile + update_config_file(oai_UE, UE_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n' task_UE_compile = task_UE_compile + update_config_file(oai_UE, UE_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n'
...@@ -873,7 +873,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -873,7 +873,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
task_UE = ' ( uname -a ; date \n' task_UE = ' ( uname -a ; date \n'
task_UE = task_UE + 'array_exec_pid=()' + '\n' task_UE = task_UE + 'array_exec_pid=()' + '\n'
task_UE = task_UE + 'cd ' + logdirOAI5GRepo + '\n' task_UE = task_UE + 'cd ' + logdirOAI5GRepo + '\n'
task_UE = task_UE + 'source oaienv \n' task_UE = task_UE + 'source ranenv \n'
task_UE = task_UE + 'source cmake_targets/tools/build_helper \n' task_UE = task_UE + 'source cmake_targets/tools/build_helper \n'
task_UE = task_UE + 'env |grep OPENAIR \n' task_UE = task_UE + 'env |grep OPENAIR \n'
if UE_pre_exec != "": if UE_pre_exec != "":
...@@ -911,7 +911,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -911,7 +911,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
task_EPC_compile = ' ( uname -a ; date \n' task_EPC_compile = ' ( uname -a ; date \n'
task_EPC_compile = task_EPC_compile + 'array_exec_pid=()' + '\n' task_EPC_compile = task_EPC_compile + 'array_exec_pid=()' + '\n'
task_EPC_compile = task_EPC_compile + 'cd ' + logdirOpenaircnRepo + '; git reset --hard HEAD ; git checkout ' + EPC_branch + ' ; source oaienv \n' task_EPC_compile = task_EPC_compile + 'cd ' + logdirOpenaircnRepo + '; git reset --hard HEAD ; git checkout ' + EPC_branch + ' ; source ranenv \n'
task_EPC_compile = task_EPC_compile + update_config_file(oai_EPC, EPC_config_file, logdirOpenaircnRepo, logdirOpenaircnRepo+'/TEST/autotests/tools/search_repl.py') + '\n' task_EPC_compile = task_EPC_compile + update_config_file(oai_EPC, EPC_config_file, logdirOpenaircnRepo, logdirOpenaircnRepo+'/TEST/autotests/tools/search_repl.py') + '\n'
task_EPC_compile = task_EPC_compile + 'source BUILD/TOOLS/build_helper \n' task_EPC_compile = task_EPC_compile + 'source BUILD/TOOLS/build_helper \n'
if EPC_compile_prog != "": if EPC_compile_prog != "":
...@@ -924,7 +924,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -924,7 +924,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
task_EPC = ' ( uname -a ; date \n' task_EPC = ' ( uname -a ; date \n'
task_EPC = task_EPC + ' export OPENAIRCN_TESTDIR=' + logdir_EPC + '\n' task_EPC = task_EPC + ' export OPENAIRCN_TESTDIR=' + logdir_EPC + '\n'
task_EPC = task_EPC + 'array_exec_pid=()' + '\n' task_EPC = task_EPC + 'array_exec_pid=()' + '\n'
task_EPC = task_EPC + 'cd ' + logdirOpenaircnRepo + '; source oaienv\n' task_EPC = task_EPC + 'cd ' + logdirOpenaircnRepo + '; source ranenv\n'
task_EPC = task_EPC + 'source BUILD/TOOLS/build_helper \n' task_EPC = task_EPC + 'source BUILD/TOOLS/build_helper \n'
if EPC_pre_exec != "": if EPC_pre_exec != "":
task_EPC = task_EPC + ' ( date; ' + EPC_pre_exec + ' '+ EPC_pre_exec_args + ' ) > ' + logfile_pre_exec_EPC + ' 2>&1 \n' task_EPC = task_EPC + ' ( date; ' + EPC_pre_exec + ' '+ EPC_pre_exec_args + ' ) > ' + logfile_pre_exec_EPC + ' 2>&1 \n'
...@@ -1005,7 +1005,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo , ...@@ -1005,7 +1005,7 @@ def handle_testcaseclass_softmodem (testcase, oldprogramList, logdirOAI5GRepo ,
if UE_stop_script != "": if UE_stop_script != "":
cmd = ' ( uname -a ; date \n' cmd = ' ( uname -a ; date \n'
cmd = cmd + 'cd ' + logdirOAI5GRepo + ' ; source oaienv ; source cmake_targets/tools/build_helper \n' cmd = cmd + 'cd ' + logdirOAI5GRepo + ' ; source ranenv ; source cmake_targets/tools/build_helper \n'
cmd = cmd + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n' cmd = cmd + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n'
cmd = cmd + UE_stop_script + '\n' cmd = cmd + UE_stop_script + '\n'
cmd = cmd + ') > ' + logfile_UE_stop_script_out + ' 2>&1 ' cmd = cmd + ') > ' + logfile_UE_stop_script_out + ' 2>&1 '
...@@ -1200,7 +1200,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe ...@@ -1200,7 +1200,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe
# check that openairinterface is installed on machine # check that openairinterface is installed on machine
oai_eNB = openair('localdomain', eNBMachine) oai_eNB = openair('localdomain', eNBMachine)
oai_eNB.connect(user, password) oai_eNB.connect(user, password)
cmd = 'cd ' + logdirOAI5GRepo + '; source oaienv ; env|grep --color=never OPENAIR' cmd = 'cd ' + logdirOAI5GRepo + '; source ranenv ; env|grep --color=never OPENAIR'
res= oai_eNB.send_recv(cmd) res= oai_eNB.send_recv(cmd)
m = re.search('OPENAIR_HOME', res, re.DOTALL) m = re.search('OPENAIR_HOME', res, re.DOTALL)
if m: if m:
...@@ -1217,7 +1217,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe ...@@ -1217,7 +1217,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe
print( Fore.WHITE + indent + "> eNB machine compilation : triggered -> "+eNB_compile_cmd ) print( Fore.WHITE + indent + "> eNB machine compilation : triggered -> "+eNB_compile_cmd )
eNBMachineDesc['last_compile_prog'] = eNB_compile_prog + ' '+ eNB_compile_prog_args # if last compilation is the same do not compile again eNBMachineDesc['last_compile_prog'] = eNB_compile_prog + ' '+ eNB_compile_prog_args # if last compilation is the same do not compile again
task_eNB_compile = ' ( uname -a ; date \n' task_eNB_compile = ' ( uname -a ; date \n'
task_eNB_compile = task_eNB_compile + 'cd ' + logdirOAI5GRepo + ' ; source oaienv ; source cmake_targets/tools/build_helper \n' task_eNB_compile = task_eNB_compile + 'cd ' + logdirOAI5GRepo + ' ; source ranenv ; source cmake_targets/tools/build_helper \n'
task_eNB_compile = task_eNB_compile + 'env |grep OPENAIR \n' task_eNB_compile = task_eNB_compile + 'env |grep OPENAIR \n'
task_eNB_compile = task_eNB_compile + update_config_file(oai_eNB, eNB_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n' task_eNB_compile = task_eNB_compile + update_config_file(oai_eNB, eNB_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n'
if eNB_compile_cmd != "": if eNB_compile_cmd != "":
...@@ -1257,7 +1257,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe ...@@ -1257,7 +1257,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe
# check that openairinterface is installed on machine # check that openairinterface is installed on machine
oai_UE = openair('localdomain', UEMachine) oai_UE = openair('localdomain', UEMachine)
oai_UE.connect(user, password) oai_UE.connect(user, password)
cmd = 'cd ' + logdirOAI5GRepo + '; source oaienv ; env|grep --color=never OPENAIR' cmd = 'cd ' + logdirOAI5GRepo + '; source ranenv ; env|grep --color=never OPENAIR'
res= oai_UE.send_recv(cmd) res= oai_UE.send_recv(cmd)
m = re.search('OPENAIR_HOME', res, re.DOTALL) m = re.search('OPENAIR_HOME', res, re.DOTALL)
if m: if m:
...@@ -1274,7 +1274,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe ...@@ -1274,7 +1274,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe
print( Fore.WHITE + indent + "> UE machine compilation : triggered -> "+UE_compile_cmd ) print( Fore.WHITE + indent + "> UE machine compilation : triggered -> "+UE_compile_cmd )
UEMachineDesc['last_compile_prog'] = UE_compile_prog + ' '+ UE_compile_prog_args UEMachineDesc['last_compile_prog'] = UE_compile_prog + ' '+ UE_compile_prog_args
task_UE_compile = ' ( uname -a ; date \n' task_UE_compile = ' ( uname -a ; date \n'
task_UE_compile = task_UE_compile + 'cd ' + logdirOAI5GRepo + ' ; source oaienv ; source cmake_targets/tools/build_helper \n' task_UE_compile = task_UE_compile + 'cd ' + logdirOAI5GRepo + ' ; source ranenv ; source cmake_targets/tools/build_helper \n'
task_UE_compile = task_UE_compile + 'env |grep OPENAIR \n' task_UE_compile = task_UE_compile + 'env |grep OPENAIR \n'
task_UE_compile = task_UE_compile + update_config_file(oai_UE, UE_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n' task_UE_compile = task_UE_compile + update_config_file(oai_UE, UE_config_file, logdirOAI5GRepo, '$OPENAIR_DIR/cmake_targets/autotests/tools/search_repl.py') + '\n'
if UE_compile_cmd != "": if UE_compile_cmd != "":
...@@ -1384,7 +1384,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe ...@@ -1384,7 +1384,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe
logfile_task_eNB = logdir_local_run + '/eNB_task' + '_' + str(run) + '_.log' logfile_task_eNB = logdir_local_run + '/eNB_task' + '_' + str(run) + '_.log'
task_eNB = ' ( uname -a ; date \n' task_eNB = ' ( uname -a ; date \n'
task_eNB = task_eNB + 'cd ' + logdirOAI5GRepo + ' ; source oaienv ; source cmake_targets/tools/build_helper \n' task_eNB = task_eNB + 'cd ' + logdirOAI5GRepo + ' ; source ranenv ; source cmake_targets/tools/build_helper \n'
task_eNB = task_eNB + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n' task_eNB = task_eNB + 'env |grep OPENAIR \n' + 'array_exec_pid=() \n'
if eNB_pre_exec != "": if eNB_pre_exec != "":
task_eNB = task_eNB + ' ( date; ' + eNB_pre_exec + ' '+ eNB_pre_exec_args + ' ) > ' + logfile_pre_exec_eNB + ' 2>&1 \n' task_eNB = task_eNB + ' ( date; ' + eNB_pre_exec + ' '+ eNB_pre_exec_args + ' ) > ' + logfile_pre_exec_eNB + ' 2>&1 \n'
...@@ -1426,7 +1426,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe ...@@ -1426,7 +1426,7 @@ def handle_testcaseclass_softmodem_noS1 (testcase, oldprogramList, logdirOAI5GRe
task_UE = ' ( uname -a ; date \n' task_UE = ' ( uname -a ; date \n'
task_UE = task_UE + 'array_exec_pid=()' + '\n' task_UE = task_UE + 'array_exec_pid=()' + '\n'
task_UE = task_UE + 'cd ' + logdirOAI5GRepo + '\n' task_UE = task_UE + 'cd ' + logdirOAI5GRepo + '\n'
task_UE = task_UE + 'source oaienv \n' task_UE = task_UE + 'source ranenv \n'
task_UE = task_UE + 'source cmake_targets/tools/build_helper \n' task_UE = task_UE + 'source cmake_targets/tools/build_helper \n'
task_UE = task_UE + 'env |grep OPENAIR \n' task_UE = task_UE + 'env |grep OPENAIR \n'
if UE_pre_exec != "": if UE_pre_exec != "":
...@@ -2115,7 +2115,7 @@ try: ...@@ -2115,7 +2115,7 @@ try:
os.environ["PHY_DIR"] os.environ["PHY_DIR"]
except KeyError: except KeyError:
print (Fore.RED + 'FAILED') print (Fore.RED + 'FAILED')
print "Please set the environment variable PHY_DIR in the .bashrc or run 'source oaienv' " print "Please set the environment variable PHY_DIR in the .bashrc or run 'source ranenv' "
exit_prog(1) exit_prog(1)
print (Fore.GREEN + 'OK') print (Fore.GREEN + 'OK')
...@@ -2124,14 +2124,14 @@ try: ...@@ -2124,14 +2124,14 @@ try:
os.environ["MAC_DIR"] os.environ["MAC_DIR"]
except KeyError: except KeyError:
print (Fore.RED + 'FAILED') print (Fore.RED + 'FAILED')
print "Please set the environment variable MAC_DIR in the .bashrc or run 'source oaienv' " print "Please set the environment variable MAC_DIR in the .bashrc or run 'source ranenv' "
exit_prog(1) exit_prog(1)
print (Fore.GREEN + 'OK') print (Fore.GREEN + 'OK')
try: try:
os.environ["OPENAIR_TARGETS"] os.environ["OPENAIR_TARGETS"]
except KeyError: except KeyError:
print "Please set the environment variable OPENAIR_TARGETS in the .bashrc or run 'source oaienv' " print "Please set the environment variable OPENAIR_TARGETS in the .bashrc or run 'source ranenv' "
sexit_prog(1) sexit_prog(1)
print (Fore.WHITE + ' - kill zombie ssh sessions from earlier sessions... '), print (Fore.WHITE + ' - kill zombie ssh sessions from earlier sessions... '),
...@@ -2278,7 +2278,7 @@ if not flag_skip_machine_preparation: ...@@ -2278,7 +2278,7 @@ if not flag_skip_machine_preparation:
cmd = cmd + 'echo \"skipping GitHead check...\" \n ' cmd = cmd + 'echo \"skipping GitHead check...\" \n '
else: else:
cmd = cmd + 'if [ \"$git_head\" != \"'+ GitOAI5GHeadVersion + '\" ]; then echo \"error: Git openairinterface5g head version does not match\" ; fi \n' cmd = cmd + 'if [ \"$git_head\" != \"'+ GitOAI5GHeadVersion + '\" ]; then echo \"error: Git openairinterface5g head version does not match\" ; fi \n'
cmd = cmd + 'source oaienv' + '\n' cmd = cmd + 'source ranenv' + '\n'
if flag_skip_oai_install == False: if flag_skip_oai_install == False:
cmd = cmd + 'source $OPENAIR_DIR/cmake_targets/tools/build_helper \n' cmd = cmd + 'source $OPENAIR_DIR/cmake_targets/tools/build_helper \n'
cmd = cmd + 'echo \"Installing core OAI dependencies...Start\" \n' cmd = cmd + 'echo \"Installing core OAI dependencies...Start\" \n'
...@@ -2354,7 +2354,7 @@ if not flag_skip_machine_preparation: ...@@ -2354,7 +2354,7 @@ if not flag_skip_machine_preparation:
sftp_module (user, pw, MachineList[index], port, paramList, sftp_log) sftp_module (user, pw, MachineList[index], port, paramList, sftp_log)
cmd = ' cd ' + logdirOAI5GRepo + ' ; source oaienv ; env|grep OPENAIR \n' cmd = ' cd ' + logdirOAI5GRepo + ' ; source ranenv ; env|grep OPENAIR \n'
res = oai_list[index].send_recv(cmd) res = oai_list[index].send_recv(cmd)
index = index +1 index = index +1
if os.path.exists(localfile) == 0: if os.path.exists(localfile) == 0:
......
src/cmake_targets/autotests/v2/actions/compilation.bash
View file @ c50101f3
cd /tmp/oai_test_setup/oai cd /tmp/oai_test_setup/oai
source oaienv source ranenv
cd cmake_targets cd cmake_targets
rm -rf log rm -rf log
mkdir -p log mkdir -p log
......
src/cmake_targets/autotests/v2/actions/execution.bash
View file @ c50101f3
cd /tmp/oai_test_setup/oai cd /tmp/oai_test_setup/oai
source oaienv source ranenv
echo $EXEC $EXEC_ARGS echo $EXEC $EXEC_ARGS
$EXEC $EXEC_ARGS $EXEC $EXEC_ARGS
src/cmake_targets/autotests/v2/actions/execution_compile.bash
View file @ c50101f3
cd /tmp/oai_test_setup/oai cd /tmp/oai_test_setup/oai
source oaienv source ranenv
sudo rmmod nasmesh || true sudo rmmod nasmesh || true
sudo rmmod ue_ip || true sudo rmmod ue_ip || true
cd cmake_targets cd cmake_targets
......
src/cmake_targets/autotests/v2/actions/run_enb.bash
View file @ c50101f3
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
stty isig intr ^C stty isig intr ^C
cd /tmp/oai_test_setup/oai cd /tmp/oai_test_setup/oai
source oaienv source ranenv
sudo rmmod nasmesh || true sudo rmmod nasmesh || true
sudo rmmod ue_ip || true sudo rmmod ue_ip || true
cd cmake_targets/ran_build/build cd cmake_targets/ran_build/build
ulimit -c unlimited ulimit -c unlimited
sudo rm -f core sudo rm -f core
#sudo -E ./lte-softmodem -O $OPENAIR_DIR/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.conf #sudo -E ./lte-softmodem -O $OPENAIR_DIR/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.conf
sudo -E ./lte-softmodem -O /tmp/enb.conf sudo -E ./lte-softmodem -O /tmp/enb.conf
\ No newline at end of file
src/cmake_targets/autotests/v2/actions/start_3276.bash
View file @ c50101f3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
stty isig intr ^C stty isig intr ^C
cd /tmp/oai_test_setup/oai cd /tmp/oai_test_setup/oai
source oaienv source ranenv
sudo rmmod nasmesh || true sudo rmmod nasmesh || true
sudo rmmod ue_ip || true sudo rmmod ue_ip || true
cd cmake_targets/autotests/v2/actions cd cmake_targets/autotests/v2/actions
......
src/cmake_targets/autotests/v2/actions/start_bandrich.bash
View file @ c50101f3
...@@ -15,7 +15,7 @@ stty isig intr ^C ...@@ -15,7 +15,7 @@ stty isig intr ^C
#while [ ! -e /dev/bandrich ]; do sleep 1; done #while [ ! -e /dev/bandrich ]; do sleep 1; done
cd /tmp/oai_test_setup/oai cd /tmp/oai_test_setup/oai
source oaienv source ranenv
sudo rmmod nasmesh || true sudo rmmod nasmesh || true
sudo rmmod ue_ip || true sudo rmmod ue_ip || true
cd cmake_targets/autotests/v2/actions cd cmake_targets/autotests/v2/actions
......
src/cmake_targets/build_oai → src/cmake_targets/build_ran
View file @ c50101f3
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# * contact@openairinterface.org # * contact@openairinterface.org
# */ # */
# file build_oai # file build_ran
# brief OAI automated build tool that can be used to install, compile, run OAI. # brief OAI automated build tool that can be used to install, compile, run OAI.
# author Navid Nikaein, Lionel GAUTHIER, Laurent Thomas # author Navid Nikaein, Lionel GAUTHIER, Laurent Thomas
...@@ -171,10 +171,10 @@ Options ...@@ -171,10 +171,10 @@ Options
Print this help Print this help
Usage (first build): Usage (first build):
NI/ETTUS B201 + COTS UE : ./build_oai -I -i --eNB -w USRP NI/ETTUS B201 + COTS UE : ./build_ran -I -i --eNB -w USRP
Usage (regular): Usage (regular):
Eurecom EXMIMO + OAI ENB : ./build_oai --eNB Eurecom EXMIMO + RAN ENB : ./build_ran --eNB
NI/ETTUS B201 + OAI ENB : ./build_oai --eNB -w USRP" NI/ETTUS B201 + RAN ENB : ./build_ran --eNB -w USRP"
} }
......
src/common/utils/telnetsrv/DOC/telnetusage.md
View file @ c50101f3
...@@ -3,7 +3,7 @@ By default the embedded telnet server, which is implemented in a shared library, ...@@ -3,7 +3,7 @@ By default the embedded telnet server, which is implemented in a shared library,
```bash ```bash
cd \<oai repository\>/openairinterface5g cd \<oai repository\>/openairinterface5g
source oaienv source ranenv
cd cmake_targets cd cmake_targets
./build_oai --build-lib telnetsrv ./build_oai --build-lib telnetsrv
``` ```
......
src/oaienv → src/ranenv
View file @ c50101f3
...@@ -7,14 +7,14 @@ export OPENAIR_TARGETS=$OPENAIR_HOME/targets ...@@ -7,14 +7,14 @@ export OPENAIR_TARGETS=$OPENAIR_HOME/targets
export PATH=$PATH:$OPENAIR_TARGETS/bin export PATH=$PATH:$OPENAIR_TARGETS/bin
alias oai='cd $OPENAIR_HOME' alias ran='cd $OPENAIR_HOME'
alias oai0='cd $OPENAIR0_DIR' alias ran0='cd $OPENAIR0_DIR'
alias oai1='cd $PHY_DIR' alias ran1='cd $PHY_DIR'
alias oai2='cd $MAC_DIR' alias ran2='cd $MAC_DIR'
alias oait='cd $OPENAIR_TARGETS' alias rant='cd $OPENAIR_TARGETS'
alias oailte='cd $OPENAIR_TARGETS/RT/USER' alias ranlte='cd $OPENAIR_TARGETS/RT/USER'
alias oais='cd $OPENAIR_TARGETS/SIMU/USER' alias rans='cd $OPENAIR_TARGETS/SIMU/USER'
alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES' alias ranex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
export IIOD_REMOTE=192.168.1.2 export IIOD_REMOTE=192.168.1.2
#export IIOD_REMOTE=192.168.1.11 #export IIOD_REMOTE=192.168.1.11
......
src/targets/ARCH/ADRV9371_ZC706/SYRTEM_IQ_QuickStart.readme
View file @ c50101f3
...@@ -58,7 +58,7 @@ sudo gedit /usr/local/etc/syriq/cpu-irq.sh ...@@ -58,7 +58,7 @@ sudo gedit /usr/local/etc/syriq/cpu-irq.sh
echo '1' > /proc/irq/49/smp_affinity_list echo '1' > /proc/irq/49/smp_affinity_list
echo '5' > /proc/irq/48/smp_affinity_list echo '5' > /proc/irq/48/smp_affinity_list
gedit oaienv gedit ranenv
export IIOD_REMOTE=192.168.1.11 export IIOD_REMOTE=192.168.1.11
...@@ -67,7 +67,7 @@ compilation: ...@@ -67,7 +67,7 @@ compilation:
------------ ------------
sudo cset shield --reset sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/ cd eur_oai_develop-nr/openairinterface5g/
source oaienv source ranenv
sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 -I sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 -I
sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706
...@@ -76,7 +76,7 @@ sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706 ...@@ -76,7 +76,7 @@ sudo -E ./cmake_targets/build_oai -c --nrUE -w ADRV9371_ZC706
run: run:
---- ----
source oaienv source ranenv
sudo -E /usr/local/etc/syriq/cpu-irq.sh sudo -E /usr/local/etc/syriq/cpu-irq.sh
sudo -E cset shield -e ./targets/bin/nr-uesoftmodem.Rel15 -- --numerology 1 -r 106 -C 3510000000 --loop-memory --rf-config-file /usr/local/etc/syriq/ue.band22.tm1.PRB100.NR40.dat sudo -E cset shield -e ./targets/bin/nr-uesoftmodem.Rel15 -- --numerology 1 -r 106 -C 3510000000 --loop-memory --rf-config-file /usr/local/etc/syriq/ue.band22.tm1.PRB100.NR40.dat
...@@ -104,7 +104,7 @@ sudo lspci -vv -s 02:00.0 | grep Interr ...@@ -104,7 +104,7 @@ sudo lspci -vv -s 02:00.0 | grep Interr
sudo gedit /usr/local/etc/syriq/cpu-irq.sh sudo gedit /usr/local/etc/syriq/cpu-irq.sh
echo '1' > /proc/irq/46/smp_affinity_list echo '1' > /proc/irq/46/smp_affinity_list
gedit oaienv gedit ranenv
export IIOD_REMOTE=192.168.1.21 export IIOD_REMOTE=192.168.1.21
...@@ -113,7 +113,7 @@ compilation: ...@@ -113,7 +113,7 @@ compilation:
------------ ------------
sudo cset shield --reset sudo cset shield --reset
cd eur_oai_develop-nr/openairinterface5g/ cd eur_oai_develop-nr/openairinterface5g/
source oaienv source ranenv
sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 -I --enable-cpu-affinity sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 -I --enable-cpu-affinity
...@@ -130,7 +130,7 @@ sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 --enable-cpu-affini ...@@ -130,7 +130,7 @@ sudo -E ./cmake_targets/build_oai -c --gNB -w ADRV9371_ZC706 --enable-cpu-affini
run: run:
---- ----
source oaienv source ranenv
sudo -E /usr/local/etc/syriq/cpu-irq.sh sudo -E /usr/local/etc/syriq/cpu-irq.sh
sudo -E cset shield -e ./targets/bin/nr-softmodem.Rel15 -- -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf --rf-config-file /usr/local/etc/syriq/gnb.band22.tm1.PRB100.NR40_hwgain15.dat sudo -E cset shield -e ./targets/bin/nr-softmodem.Rel15 -- -O $OPENAIR_DIR/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf --rf-config-file /usr/local/etc/syriq/gnb.band22.tm1.PRB100.NR40_hwgain15.dat
src/targets/ARCH/tcp_bridge/README.tcp_bridge_oai
View file @ c50101f3
...@@ -2,7 +2,7 @@ The driver tcp_bridge_oai.c is to be used with the basic simulator. ...@@ -2,7 +2,7 @@ The driver tcp_bridge_oai.c is to be used with the basic simulator.
To build the basic simulator: To build the basic simulator:
cd [openair top directory] cd [openair top directory]
. oaienv . ranenv
cd cmake_targets cd cmake_targets
./build_oai -I -w USRP ./build_oai -I -w USRP
./build_oai --basic-simulator ./build_oai --basic-simulator
......
src/targets/DOCS/nfapi-L2-emulator-setup.txt
View file @ c50101f3
#Build instructions #Build instructions
source oaienv source ranenv
cd cmake_targets cd cmake_targets
#Create lte-uesoftmodem-nos1 (UE) and lte-softmodem-nos1 (eNB) executables #Create lte-uesoftmodem-nos1 (UE) and lte-softmodem-nos1 (eNB) executables
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment