From fe2193ba75358df406061ca9b9fc8ba16c648f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Leroy?= <frederic.leroy@b-com.com>
Date: Tue, 2 Aug 2016 11:06:00 +0200
Subject: [PATCH] fix .ue* filenames in scripts and documentation
TODO add option to conf2uedata and adapt script
---
cmake_targets/tools/build_helper | 2 +-
openair3/NAS/TEST/NETWORK/README | 12 ++++++------
.../GENERIC-LTE-EPC/start_enb_and_ue_virt.bash | 12 ++++++------
targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash | 12 ++++++------
targets/build_helper.bash | 12 ++++++------
targets/build_oai.bash | 8 ++++----
6 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 8a9d64b6d8..5d4a1dbeae 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -450,7 +450,7 @@ install_asn1c_from_source(){
################################################
install_nas_tools() {
- if [ ! -f $2/§.ue.nvram -o ! -f $2/.usim.nvram ]; then
+ if [ ! -f $2/.ue.nvram0 -o ! -f $2/.usim.nvram0 ]; then
cd $OPENAIR_DIR/targets/bin
./conf2uedata -c $1 -o $2
echo_success "$1 $2"
diff --git a/openair3/NAS/TEST/NETWORK/README b/openair3/NAS/TEST/NETWORK/README
index 25a6de5d14..465e355e78 100644
--- a/openair3/NAS/TEST/NETWORK/README
+++ b/openair3/NAS/TEST/NETWORK/README
@@ -18,9 +18,9 @@ EURECOM-NAS directory should contain following files:
EURECOM-NAS
|-- bin
-| |-- .ue.nvram
-| |-- .ue_emm.nvram
-| |-- .usim.nvram
+| |-- .ue.nvram0
+| |-- .ue_emm.nvram0
+| |-- .usim.nvram0
| |-- NetworkProcess
| |-- UEprocess
| `-- UserProcess
@@ -57,10 +57,10 @@ UE for testing purpose.
When starting up, UEprocess reads configuration data from .nvram binary
files used as UE's non-volatile memory.
-.usim.nvram contains data stored into the USIM
-.ue.nvram contains data related to the UE identification (IMEI,
+.usim.nvram0 contains data stored into the USIM
+.ue.nvram0 contains data related to the UE identification (IMEI,
manufacturer, model, PIN code)
-.ue_emm.nvram contains data related to EPS Mobility Management (IMSI, last
+.ue_emm.nvram0 contains data related to EPS Mobility Management (IMSI, last
registered PLMN)
--------------------------------------------------------------------------------
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
index 5339af13e4..6ea2d5bb0a 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_enb_and_ue_virt.bash
@@ -125,18 +125,18 @@ if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ] || [ ! -f $OPENAIR3_DIR/NA
fi
echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS -f Makefile PROCESS=UE all"
make -f Makefile --debug=b --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE all
- rm .ue.nvram
- rm .usim.nvram
+ rm .ue.nvram0
+ rm .usim.nvram0
touch /tmp/nas_cleaned
fi
-if [ ! -f .ue.nvram ]; then
- echo_success "generate .ue_emm.nvram .ue.nvram"
+if [ ! -f .ue.nvram0 ]; then
+ echo_success "generate .ue_emm.nvram0 .ue.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
-if [ ! -f .usim.nvram ]; then
- echo_success "generate .usim.nvram"
+if [ ! -f .usim.nvram0 ]; then
+ echo_success "generate .usim.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash b/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
index e6d96602e2..ff16e27982 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/start_ue.bash
@@ -68,20 +68,20 @@ export NVRAM_DIR=$THIS_SCRIPT_PATH
if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data ]; then
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
- rm .ue.nvram
+ rm .ue.nvram0
fi
if [ ! -f $OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data ]; then
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS veryveryclean
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS PROCESS=UE
- rm .usim.nvram
+ rm .usim.nvram0
fi
-if [ ! -f .ue.nvram ]; then
- # generate .ue_emm.nvram .ue.nvram
+if [ ! -f .ue.nvram0 ]; then
+ # generate .ue_emm.nvram0 .ue.nvram0
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
-if [ ! -f .usim.nvram ]; then
- # generate .usim.nvram
+if [ ! -f .usim.nvram0 ]; then
+ # generate .usim.nvram0
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
diff --git a/targets/build_helper.bash b/targets/build_helper.bash
index 163be3ba53..f161275c65 100755
--- a/targets/build_helper.bash
+++ b/targets/build_helper.bash
@@ -852,8 +852,8 @@ compile_nas_tools() {
fi
echo_success "make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all"
make --directory=$OPENAIR3_DIR/NAS/EURECOM-NAS/tools all
- rm .ue.nvram
- rm .usim.nvram
+ rm .ue.nvram0
+ rm .usim.nvram0
touch /tmp/nas_cleaned
}
@@ -1027,13 +1027,13 @@ install_oaisim() {
install_nas_tools() {
cd $OPENAIR_TARGETS/bin
- if [ ! -f .ue.nvram ]; then
- echo_success "generate .ue_emm.nvram .ue.nvram"
+ if [ ! -f .ue.nvram0 ]; then
+ echo_success "generate .ue_emm.nvram0 .ue.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
- if [ ! -f .usim.nvram ]; then
- echo_success "generate .usim.nvram"
+ if [ ! -f .usim.nvram0 ]; then
+ echo_success "generate .usim.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
diff --git a/targets/build_oai.bash b/targets/build_oai.bash
index 1303ef9e7e..7a6a179beb 100755
--- a/targets/build_oai.bash
+++ b/targets/build_oai.bash
@@ -756,13 +756,13 @@ if [ $RUN -ne 0 ]; then
install_nasmesh
else
# prepare NAS for UE
- if [ ! -f .ue.nvram ]; then
- echo_success "generate .ue_emm.nvram .ue.nvram"
+ if [ ! -f .ue.nvram0 ]; then
+ echo_success "generate .ue_emm.nvram0 .ue.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --gen
fi
- if [ ! -f .usim.nvram ]; then
- echo_success "generate .usim.nvram"
+ if [ ! -f .usim.nvram0 ]; then
+ echo_success "generate .usim.nvram0"
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/usim_data --gen
fi
$OPENAIR3_DIR/NAS/EURECOM-NAS/bin/ue_data --print
--
GitLab