Skip to content

O
OpenXG-RAN
Commit 15df3054 authored by yilmazt's avatar yilmazt
Browse files
Options

converting 'lte_build_oai' to 'ran_buld'

parent 90be2df3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 211 additions and 217 deletions
ci-scripts/main.py
View file @ 15df3054
...@@ -890,7 +890,7 @@ class SSHConnection(): ...@@ -890,7 +890,7 @@ class SSHConnection():
self.command('cd ' + self.UESourceCodePath + '/cmake_targets/ran_build/build', '\$', 5) self.command('cd ' + self.UESourceCodePath + '/cmake_targets/ran_build/build', '\$', 5)
self.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5) self.command('echo ' + self.UEPassword + ' | sudo -S rm -Rf ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log', '\$', 5)
#use nohup instead of daemon #use nohup instead of daemon
#self.command('echo ' + self.UEPassword + ' | sudo -S -E daemon --inherit --unsafe --name=ue' + str(self.UE_instance) + '_daemon --chdir=' + self.UESourceCodePath + '/cmake_targets/lte_build_oai/build -o ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5) #self.command('echo ' + self.UEPassword + ' | sudo -S -E daemon --inherit --unsafe --name=ue' + str(self.UE_instance) + '_daemon --chdir=' + self.UESourceCodePath + '/cmake_targets/ran_build/build -o ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh', '\$', 5)
self.command('echo $USER; nohup sudo ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh' + ' > ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ' + ' 2>&1 &', self.UEUserName, 5) self.command('echo $USER; nohup sudo ./my-lte-uesoftmodem-run' + str(self.UE_instance) + '.sh' + ' > ' + self.UESourceCodePath + '/cmake_targets/ue_' + self.testCase_id + '.log ' + ' 2>&1 &', self.UEUserName, 5)
time.sleep(6) time.sleep(6)
self.command('cd ../..', '\$', 5) self.command('cd ../..', '\$', 5)
......
ci-scripts/runTestOnVM.sh
View file @ 15df3054
This diff is collapsed.
cmake_targets/autotests/test_case_list.xml
View file @ 15df3054
This source diff could not be displayed because it is too large. You can view the blob instead.
cmake_targets/autotests/v2/actions/run_enb.bash
View file @ 15df3054
...@@ -5,7 +5,7 @@ cd /tmp/oai_test_setup/oai ...@@ -5,7 +5,7 @@ cd /tmp/oai_test_setup/oai
source oaienv source oaienv
sudo rmmod nasmesh || true sudo rmmod nasmesh || true
sudo rmmod ue_ip || true sudo rmmod ue_ip || true
cd cmake_targets/lte_build_oai/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
......
cmake_targets/tools/build_helper
View file @ 15df3054
...@@ -149,7 +149,7 @@ clean_all_files() { ...@@ -149,7 +149,7 @@ clean_all_files() {
set_openair_env set_openair_env
dir=$OPENAIR_DIR/cmake_targets dir=$OPENAIR_DIR/cmake_targets
rm -rf $dir/log $OPENAIR_DIR/targets/bin/* rm -rf $dir/log $OPENAIR_DIR/targets/bin/*
rm -rf $dir/lte_build_oai $dir/lte-simulators/build rm -rf $dir/ran_build $dir/lte-simulators/build
rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt
rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build
} }
......
common/utils/telnetsrv/DOC/telnetusage.md
View file @ 15df3054
...@@ -8,7 +8,7 @@ By default the embedded telnet server, which is implemented in a shared library, ...@@ -8,7 +8,7 @@ By default the embedded telnet server, which is implemented in a shared library,
./build_oai --build-lib telnetsrv ./build_oai --build-lib telnetsrv
``` ```
This will create the `libtelnetsrv.so` file in the `targets/bin` and `cmake_targets/lte_build_oai/build` sub directories of the oai repository. This will create the `libtelnetsrv.so` file in the `targets/bin` and `cmake_targets/ran_build/build` sub directories of the oai repository.
When starting the softmodem, you must specify the **_\-\-telnetsrv_** option to load and start the telnet server. The telnet server is loaded via the [oai shared library loader](loader). When starting the softmodem, you must specify the **_\-\-telnetsrv_** option to load and start the telnet server. The telnet server is loaded via the [oai shared library loader](loader).
......
common/utils/telnetsrv/telnetsrv_CMakeLists.txt
View file @ 15df3054
set(TELNETROOT ${OPENAIR_DIR}/common/utils/telnetsrv ) set(TELNETROOT ${OPENAIR_DIR}/common/utils/telnetsrv )
set(TELNETSRV_SOURCE set(TELNETSRV_SOURCE
${TELNETROOT}/telnetsrv.c ${TELNETROOT}/telnetsrv.c
${TELNETROOT}/telnetsrv_phycmd.c ${TELNETROOT}/telnetsrv_phycmd.c
...@@ -16,14 +12,12 @@ set(TELNETSRV_SOURCE ...@@ -16,14 +12,12 @@ set(TELNETSRV_SOURCE
# ${APPROOT}/telnetsrv/telnetsrv_ethdevcmd.c # ${APPROOT}/telnetsrv/telnetsrv_ethdevcmd.c
# ) # )
add_library(telnetsrv MODULE ${TELNETSRV_SOURCE} ) add_library(telnetsrv MODULE ${TELNETSRV_SOURCE} )
#add_library(telnetsrv_ethdevcmd MODULE ${TELNETSRV_ETHDEVCMD_SOURCE} ) #add_library(telnetsrv_ethdevcmd MODULE ${TELNETSRV_ETHDEVCMD_SOURCE} )
target_link_libraries(telnetsrv PRIVATE history) target_link_libraries(telnetsrv PRIVATE history)
install(TARGETS telnetsrv DESTINATION bin) install(TARGETS telnetsrv DESTINATION bin)
if (EXISTS "${OPENAIR_BUILD_DIR}/lte_build_oai/build" AND IS_DIRECTORY "${OPENAIR_BUILD_DIR}/lte_build_oai/build") if (EXISTS "${OPENAIR_BUILD_DIR}/ran_build/build" AND IS_DIRECTORY "${OPENAIR_BUILD_DIR}/ran_build/build")
install(TARGETS telnetsrv DESTINATION ${OPENAIR_BUILD_DIR}/lte_build_oai/build) install(TARGETS telnetsrv DESTINATION ${OPENAIR_BUILD_DIR}/ran_build/build)
endif (EXISTS "${OPENAIR_BUILD_DIR}/lte_build_oai/build" AND IS_DIRECTORY "${OPENAIR_BUILD_DIR}/lte_build_oai/build") endif (EXISTS "${OPENAIR_BUILD_DIR}/ran_build/build" AND IS_DIRECTORY "${OPENAIR_BUILD_DIR}/ran_build/build")
\ No newline at end of file
d2d_emulator_setup.txt
View file @ 15df3054
...@@ -29,7 +29,7 @@ OAI build/execute ...@@ -29,7 +29,7 @@ OAI build/execute
- cd cmake_targets - cd cmake_targets
- ./build_oai --UE - ./build_oai --UE
(if necessary, use ./build_oai -I --UE to install required packages) (if necessary, use ./build_oai -I --UE to install required packages)
- cd lte_build_oai/build/ - cd ran_build/build/
- cp ../../../targets/bin/.ue* . - cp ../../../targets/bin/.ue* .
- cp ../../../targets/bin/.usim* . - cp ../../../targets/bin/.usim* .
- sudo insmod ../../../targets/bin/ue_ip.ko - sudo insmod ../../../targets/bin/ue_ip.ko
......
doc/BUILD.md
View file @ 15df3054
...@@ -60,7 +60,7 @@ cd cmake_targets/ ...@@ -60,7 +60,7 @@ cd cmake_targets/
You can build the eNodeB and the UE separately, you may not need both of them depending on your oai usage. You can build the eNodeB and the UE separately, you may not need both of them depending on your oai usage.
After completing the build, the binaries are available in the `cmake_targets/lte_build_oai/build` directory. A copy is also available in the `target/bin` directory, with all binaries suffixed by the 3GPP release number, today .Rel14 by default. It must be noticed that the option for building for a specific 3GPP release number is not tested by the CI and may be removed in the future. After completing the build, the binaries are available in the `cmake_targets/ran_build/build` directory. A copy is also available in the `target/bin` directory, with all binaries suffixed by the 3GPP release number, today .Rel14 by default. It must be noticed that the option for building for a specific 3GPP release number is not tested by the CI and may be removed in the future.
## Issue when building `nasmeh` module ## ## Issue when building `nasmeh` module ##
......
doc/L1SIM.md
View file @ 15df3054
...@@ -42,7 +42,7 @@ Run lte-softmodem as usual with this configuration. ...@@ -42,7 +42,7 @@ Run lte-softmodem as usual with this configuration.
$ source oaienv $ source oaienv
$ cd cmake_targets/tools $ cd cmake_targets/tools
$ sudo -E ./init_nas_nos1 eNB $ sudo -E ./init_nas_nos1 eNB
$ cd ../lte_build_oai/build $ cd ../ran_build/build
$ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0 $ sudo -E ./lte-softmodem -O YYY.conf --noS1 --nokrnmod 0
``` ```
...@@ -56,7 +56,7 @@ Run it like: ...@@ -56,7 +56,7 @@ Run it like:
$ source oaienv $ source oaienv
$ cd cmake_targets/tools $ cd cmake_targets/tools
$ sudo -E ./init_nas_nos1 UE $ sudo -E ./init_nas_nos1 UE
$ cd ../lte_build_oai/build $ cd ../ran_build/build
$ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0 $ sudo ./lte-uesoftmodem -O XXX.conf -r 25 --siml1 --noS1 --nokrnmod 0
``` ```
......
doc/L2NFAPI_S1.md
View file @ 15df3054
...@@ -246,7 +246,7 @@ In the first terminal (the one you used to build the eNB): ...@@ -246,7 +246,7 @@ In the first terminal (the one you used to build the eNB):
```bash ```bash
$ ssh sudousername@machineB $ ssh sudousername@machineB
$ cd enb_folder/cmake_targets $ cd enb_folder/cmake_targets
$ sudo -E ./lte_build_oai/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf > enb.log 2>&1 $ sudo -E ./ran_build/build/lte-softmodem -O ../ci-scripts/conf_files/rcc.band7.tm1.nfapi.conf > enb.log 2>&1
``` ```
If you don't use redirection, you can test but many logs are printed on the console and this may affect performance of the L2-nFAPI simulator. If you don't use redirection, you can test but many logs are printed on the console and this may affect performance of the L2-nFAPI simulator.
...@@ -261,9 +261,9 @@ In the second terminal (the one you used to build the UE): ...@@ -261,9 +261,9 @@ In the second terminal (the one you used to build the UE):
$ ssh sudousername@machineB $ ssh sudousername@machineB
$ cd ue_folder/cmake_targets $ cd ue_folder/cmake_targets
# Test 64 UEs, 64 threads in FDD mode # Test 64 UEs, 64 threads in FDD mode
$ sudo -E ./lte_build_oai/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 > ue.log 2>&1 $ sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 > ue.log 2>&1
# Test 64 UEs, 64 threads in TDD mode # Test 64 UEs, 64 threads in TDD mode
$ sudo -E ./lte_build_oai/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 -T 1 > ue.log 2>&1 $ sudo -E ./ran_build/build/lte-uesoftmodem -O ../ci-scripts/conf_files/ue.nfapi.conf --L2-emul 3 --num-ues 64 --nums-ue-thread 64 -T 1 > ue.log 2>&1
# The "-T 1" option means TDD config # The "-T 1" option means TDD config
``` ```
......
doc/RUNMODEM.md
View file @ 15df3054
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</tr> </tr>
</table> </table>
After you have [built the softmodem executables](BUILD.md) you can set your default directory to the build directory `cmake_targets/lte_build_oai/build/` and start testing some use cases. Below, the description of the different oai functionalities should help you choose the oai configuration that suits your need. After you have [built the softmodem executables](BUILD.md) you can set your default directory to the build directory `cmake_targets/ran_build/build/` and start testing some use cases. Below, the description of the different oai functionalities should help you choose the oai configuration that suits your need.
# RF Simulator # RF Simulator
......
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