Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lizhongxiao
OpenXG-RAN
Commits
44672c4c
Commit
44672c4c
authored
Apr 29, 2021
by
hardy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/docker-improvements-2021-april' into integration_2021_wk17_b
parents
13113e50
7b087705
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
254 additions
and
113 deletions
+254
-113
docker/Dockerfile.eNB.rhel8.2
docker/Dockerfile.eNB.rhel8.2
+12
-30
docker/Dockerfile.eNB.ubuntu18
docker/Dockerfile.eNB.ubuntu18
+0
-16
docker/Dockerfile.lteUE.rhel8.2
docker/Dockerfile.lteUE.rhel8.2
+10
-28
docker/Dockerfile.lteUE.ubuntu18
docker/Dockerfile.lteUE.ubuntu18
+9
-28
docker/scripts/enb_entrypoint.sh
docker/scripts/enb_entrypoint.sh
+11
-8
docker/scripts/enb_parameters.yaml
docker/scripts/enb_parameters.yaml
+3
-1
docker/scripts/generateTemplate.py
docker/scripts/generateTemplate.py
+8
-2
docker/scripts/lte_ue_entrypoint.sh
docker/scripts/lte_ue_entrypoint.sh
+72
-0
docker/scripts/lte_ue_parameters.yaml
docker/scripts/lte_ue_parameters.yaml
+37
-0
docker/scripts/lte_ue_sim_parameters.yaml
docker/scripts/lte_ue_sim_parameters.yaml
+47
-0
openair3/NAS/TOOLS/ue_sim_ci.conf
openair3/NAS/TOOLS/ue_sim_ci.conf
+45
-0
No files found.
docker/Dockerfile.eNB.rhel8.2
View file @
44672c4c
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#
#
#---------------------------------------------------------------------
#---------------------------------------------------------------------
FROM
localhost/ran-build:latest AS enb-build
FROM
ran-build:latest AS enb-build
RUN rm -Rf /oai-ran
RUN rm -Rf /oai-ran
WORKDIR /oai-ran
WORKDIR /oai-ran
...
@@ -37,10 +37,9 @@ RUN /bin/sh oaienv && \
...
@@ -37,10 +37,9 @@ RUN /bin/sh oaienv && \
mkdir -p log && \
mkdir -p log && \
./build_oai --eNB --ninja -w USRP --verbose-ci
./build_oai --eNB --ninja -w USRP --verbose-ci
# debug
RUN yum install -y python3-pip && \
#RUN ldconfig -v && ldd /oai-ran/targets/bin/lte-softmodem.Rel15
pip3 install --ignore-installed pyyaml && \
#RUN ls -ls /oai-ran/targets/bin
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml
#RUN ls -ls /oai-ran/cmake_targets/ran_build/build/*.so
#start from scratch for target executable
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-enb
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-enb
...
@@ -59,6 +58,7 @@ RUN yum update -y && \
...
@@ -59,6 +58,7 @@ RUN yum update -y && \
WORKDIR /opt/oai-enb/bin
WORKDIR /opt/oai-enb/bin
COPY --from=enb-build /oai-ran/targets/bin/lte-softmodem.Rel15 .
COPY --from=enb-build /oai-ran/targets/bin/lte-softmodem.Rel15 .
COPY --from=enb-build /oai-ran/docker/scripts/enb_entrypoint.sh entrypoint.sh
WORKDIR /usr/local/lib/
WORKDIR /usr/local/lib/
COPY --from=enb-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
COPY --from=enb-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
...
@@ -93,34 +93,16 @@ COPY --from=enb-build /usr/local/lib64/libuhd.so.4.0.0 /usr/local/lib64
...
@@ -93,34 +93,16 @@ COPY --from=enb-build /usr/local/lib64/libuhd.so.4.0.0 /usr/local/lib64
RUN ldconfig
RUN ldconfig
#debug
#RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
#RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
#RUN ldd /usr/local/lib/librfsimulator.so.Rel15
#RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
#RUN ldd /usr/local/lib/libcoding.so
#RUN ldd /usr/local/lib/libparams_libconfig.so
#RUN ldd /usr/local/lib/libdfts.so
#RUN ldd /usr/local/lib/liboai_iqplayer.so
#RUN ldd /opt/oai-enb/bin/lte-softmodem.Rel15
# Copy the relevant configuration files for eNB
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-enb/etc
WORKDIR /opt/oai-enb/etc
COPY --from=enb-build /oai-ran/ci-scripts/conf_files/enb.* .
COPY --from=enb-build /oai-ran/docker/etc .
COPY --from=enb-build /oai-ran/ci-scripts/conf_files/rcc.* .
COPY --from=enb-build /oai-ran/ci-scripts/conf_files/cu.* .
COPY --from=enb-build /oai-ran/ci-scripts/conf_files/du.* .
COPY --from=enb-build /oai-ran/ci-scripts/conf_files/rru.* .
WORKDIR /opt/oai-enb
WORKDIR /opt/oai-enb
#EXPOSE 2152/udp # S1U, GTP/UDP
# 2152 --> S1U, GTP/UDP
#EXPOSE 22100/tcp # ?
# 36412 --> S1C, SCTP/UDP
#EXPOSE 36412/udp # S1C, SCTP/UDP
# 36422 --> X2C, SCTP/UDP
#EXPOSE 36422/udp # X2C, SCTP/UDP
EXPOSE 2152/udp 36412/udp 36422/udp
#EXPOSE 50000/udp # IF5 / ORI (control)
#EXPOSE 50001/udp # IF5 / ECPRI (data)
#CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]
ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
#ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
CMD ["/opt/oai-enb/bin/lte-softmodem.Rel15", "-O", "/opt/oai-enb/etc/enb.conf"]
CMD ["sleep", "infinity"]
docker/Dockerfile.eNB.ubuntu18
View file @
44672c4c
...
@@ -41,11 +41,6 @@ RUN apt-get install -y python3-pip && \
...
@@ -41,11 +41,6 @@ RUN apt-get install -y python3-pip && \
pip3 install --ignore-installed pyyaml && \
pip3 install --ignore-installed pyyaml && \
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml
# debug
#RUN ldconfig -v && ldd /oai-ran/targets/bin/lte-softmodem.Rel15
#RUN ls -ls /oai-ran/targets/bin
#RUN ls -ls /oai-ran/cmake_targets/ran_build/build/*.so
#start from scratch for target executable
#start from scratch for target executable
FROM ubuntu:bionic as oai-enb
FROM ubuntu:bionic as oai-enb
ENV DEBIAN_FRONTEND=noninteractive
ENV DEBIAN_FRONTEND=noninteractive
...
@@ -98,17 +93,6 @@ COPY --from=enb-build /usr/local/lib/libprotobuf-c.so.1 .
...
@@ -98,17 +93,6 @@ COPY --from=enb-build /usr/local/lib/libprotobuf-c.so.1 .
RUN ldconfig
RUN ldconfig
#debug
#RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
#RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
#RUN ldd /usr/local/lib/librfsimulator.so.Rel15
#RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
#RUN ldd /usr/local/lib/libcoding.so
#RUN ldd /usr/local/lib/libparams_libconfig.so
#RUN ldd /usr/local/lib/libdfts.so
#RUN ldd /usr/local/lib/liboai_iqplayer.so
#RUN ldd /opt/oai-enb/bin/lte-softmodem.Rel15
# Copy the relevant configuration files for eNB
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-enb/etc
WORKDIR /opt/oai-enb/etc
COPY --from=enb-build /oai-ran/docker/etc .
COPY --from=enb-build /oai-ran/docker/etc .
...
...
docker/Dockerfile.lteUE.rhel8.2
View file @
44672c4c
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#
#
#---------------------------------------------------------------------
#---------------------------------------------------------------------
FROM
localhost/ran-build:latest AS lte-ue-build
FROM
ran-build:latest AS lte-ue-build
RUN rm -Rf /oai-ran
RUN rm -Rf /oai-ran
WORKDIR /oai-ran
WORKDIR /oai-ran
...
@@ -37,10 +37,10 @@ RUN /bin/sh oaienv && \
...
@@ -37,10 +37,10 @@ RUN /bin/sh oaienv && \
mkdir -p log && \
mkdir -p log && \
./build_oai --UE --ninja -w USRP --verbose-ci
./build_oai --UE --ninja -w USRP --verbose-ci
# debug
RUN yum install -y python3-pip && \
#RUN ldconfig -v && ldd /oai-ran/targets/bin/lte-uesoftmodem.Rel15
pip3 install --ignore-installed pyyaml && \
#RUN ls -lst /oai-ran/targets/bin
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
#RUN ls -lst /oai-ran/cmake_targets/ran_build/build/*.so
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml
#start from scratch for target executable
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ue
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ue
...
@@ -59,12 +59,10 @@ RUN yum update -y && \
...
@@ -59,12 +59,10 @@ RUN yum update -y && \
WORKDIR /opt/oai-lte-ue/bin
WORKDIR /opt/oai-lte-ue/bin
COPY --from=lte-ue-build /oai-ran/targets/bin/lte-uesoftmodem.Rel15 .
COPY --from=lte-ue-build /oai-ran/targets/bin/lte-uesoftmodem.Rel15 .
COPY --from=lte-ue-build /oai-ran/docker/scripts/lte_ue_entrypoint.sh entrypoint.sh
COPY --from=lte-ue-build /oai-ran/targets/bin/conf2uedata .
COPY --from=lte-ue-build /oai-ran/targets/bin/conf2uedata .
COPY --from=lte-ue-build /oai-ran/targets/bin/nvram .
COPY --from=lte-ue-build /oai-ran/targets/bin/nvram .
COPY --from=lte-ue-build /oai-ran/targets/bin/usim .
COPY --from=lte-ue-build /oai-ran/targets/bin/usim .
COPY --from=lte-ue-build /oai-ran/targets/bin/.ue_emm.nvram0 .
COPY --from=lte-ue-build /oai-ran/targets/bin/.ue.nvram0 .
COPY --from=lte-ue-build /oai-ran/targets/bin/.usim.nvram0 .
WORKDIR /usr/local/lib/
WORKDIR /usr/local/lib/
COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
...
@@ -99,26 +97,10 @@ COPY --from=lte-ue-build /usr/local/lib64/libuhd.so.4.0.0 /usr/local/lib64
...
@@ -99,26 +97,10 @@ COPY --from=lte-ue-build /usr/local/lib64/libuhd.so.4.0.0 /usr/local/lib64
RUN ldconfig
RUN ldconfig
#debug
# Copy the relevant configuration files for UE
#RUN ldd /opt/oai-lte-ue/bin/lte-uesoftmodem.Rel15
#RUN ldd /opt/oai-lte-ue/bin/conf2uedata
#RUN ldd /opt/oai-lte-ue/bin/nvram
#RUN ldd /opt/oai-lte-ue/bin/usim
#RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
#RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
#RUN ldd /usr/local/lib/librfsimulator.so.Rel15
#RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
#RUN ldd /usr/local/lib/libcoding.so
#RUN ldd /usr/local/lib/libparams_libconfig.so
#RUN ldd /usr/local/lib/libSIMU.so
#RUN ldd /usr/local/lib/libdfts.so
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-lte-ue/etc
WORKDIR /opt/oai-lte-ue/etc
COPY --from=lte-ue-build /oai-ran/ci-scripts/conf_files/ue.* .
COPY --from=lte-ue-build /oai-ran/docker/etc .
COPY --from=lte-ue-build /oai-ran/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf ./ue_usim.conf
WORKDIR /opt/oai-lte-ue
WORKDIR /opt/oai-lte-ue
#CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem", "-O", "/opt/oai-lte-ue/etc/enb.conf"]
CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem.Rel15"]
#ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
CMD ["sleep", "infinity"]
docker/Dockerfile.lteUE.ubuntu18
View file @
44672c4c
...
@@ -37,11 +37,10 @@ RUN /bin/sh oaienv && \
...
@@ -37,11 +37,10 @@ RUN /bin/sh oaienv && \
mkdir -p log && \
mkdir -p log && \
./build_oai --UE --ninja -w USRP --verbose-ci
./build_oai --UE --ninja -w USRP --verbose-ci
# debug
RUN apt-get install -y python3-pip && \
#RUN ldconfig -v
pip3 install --ignore-installed pyyaml && \
#RUN ldd /oai-ran/targets/bin/lte-uesoftmodem.Rel15
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \
#RUN ls -lst /oai-ran/targets/bin
python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml
#RUN ls -lst /oai-ran/cmake_targets/ran_build/build/*.so
#start from scratch for target executable
#start from scratch for target executable
FROM ubuntu:bionic as oai-lte-ue
FROM ubuntu:bionic as oai-lte-ue
...
@@ -76,12 +75,10 @@ RUN apt-get update && \
...
@@ -76,12 +75,10 @@ RUN apt-get update && \
WORKDIR /opt/oai-lte-ue/bin
WORKDIR /opt/oai-lte-ue/bin
COPY --from=lte-ue-build /oai-ran/targets/bin/lte-uesoftmodem.Rel15 .
COPY --from=lte-ue-build /oai-ran/targets/bin/lte-uesoftmodem.Rel15 .
COPY --from=lte-ue-build /oai-ran/docker/scripts/lte_ue_entrypoint.sh entrypoint.sh
COPY --from=lte-ue-build /oai-ran/targets/bin/conf2uedata .
COPY --from=lte-ue-build /oai-ran/targets/bin/conf2uedata .
COPY --from=lte-ue-build /oai-ran/targets/bin/nvram .
COPY --from=lte-ue-build /oai-ran/targets/bin/nvram .
COPY --from=lte-ue-build /oai-ran/targets/bin/usim .
COPY --from=lte-ue-build /oai-ran/targets/bin/usim .
COPY --from=lte-ue-build /oai-ran/targets/bin/.ue_emm.nvram0 .
COPY --from=lte-ue-build /oai-ran/targets/bin/.ue.nvram0 .
COPY --from=lte-ue-build /oai-ran/targets/bin/.usim.nvram0 .
WORKDIR /usr/local/lib/
WORKDIR /usr/local/lib/
COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
COPY --from=lte-ue-build /oai-ran/targets/bin/liboai_eth_transpro.so.Rel15 .
...
@@ -100,26 +97,10 @@ COPY --from=lte-ue-build /usr/local/lib/libprotobuf-c.so.1 .
...
@@ -100,26 +97,10 @@ COPY --from=lte-ue-build /usr/local/lib/libprotobuf-c.so.1 .
RUN ldconfig
RUN ldconfig
#debug
# Copy the relevant configuration files for UE
#RUN ldd /opt/oai-lte-ue/bin/lte-uesoftmodem.Rel15
#RUN ldd /opt/oai-lte-ue/bin/conf2uedata
#RUN ldd /opt/oai-lte-ue/bin/nvram
#RUN ldd /opt/oai-lte-ue/bin/usim
#RUN ldd /usr/local/lib/liboai_eth_transpro.so.Rel15
#RUN ldd /usr/local/lib/libtcp_bridge_oai.so.Rel15
#RUN ldd /usr/local/lib/librfsimulator.so.Rel15
#RUN ldd /usr/local/lib/liboai_usrpdevif.so.Rel15
#RUN ldd /usr/local/lib/libcoding.so
#RUN ldd /usr/local/lib/libparams_libconfig.so
#RUN ldd /usr/local/lib/libSIMU.so
#RUN ldd /usr/local/lib/libdfts.so
# Copy the relevant configuration files for eNB
WORKDIR /opt/oai-lte-ue/etc
WORKDIR /opt/oai-lte-ue/etc
COPY --from=lte-ue-build /oai-ran/ci-scripts/conf_files/ue.* ./
COPY --from=lte-ue-build /oai-ran/docker/etc .
COPY --from=lte-ue-build /oai-ran/openair3/NAS/TOOLS/ue_eurecom_test_sfr.conf ./ue_usim.conf
WORKDIR /opt/oai-lte-ue
WORKDIR /opt/oai-lte-ue
#CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem", "-O", "/opt/oai-lte-ue/etc/enb.conf"]
CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem.Rel15"]
#ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
CMD ["sleep", "infinity"]
docker/scripts/enb_entrypoint.sh
View file @
44672c4c
...
@@ -2,17 +2,20 @@
...
@@ -2,17 +2,20 @@
set
-euo
pipefail
set
-euo
pipefail
PREFIX
=
/opt/oai-enb
RRC_INACTIVITY_THRESHOLD
=
${
RRC_INACTIVITY_THRESHOLD
:-
0
}
# Based another env var, pick one template to use
# Based another env var, pick one template to use
if
[[
-v
USE_FDD_CU
]]
;
then
ln
-s
/opt/oai-enb/etc/cu.fdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_CU
]]
;
then
ln
-s
$PREFIX
/etc/cu.fdd.conf
$PREFIX
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_DU
]]
;
then
ln
-s
/opt/oai-enb/etc/du.fdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_DU
]]
;
then
ln
-s
$PREFIX
/etc/du.fdd.conf
$PREFIX
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_MONO
]]
;
then
ln
-s
/opt/oai-enb/etc/enb.fdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_MONO
]]
;
then
ln
-s
$PREFIX
/etc/enb.fdd.conf
$PREFIX
/etc/enb.conf
;
fi
if
[[
-v
USE_TDD_MONO
]]
;
then
ln
-s
/opt/oai-enb/etc/enb.tdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_TDD_MONO
]]
;
then
ln
-s
$PREFIX
/etc/enb.tdd.conf
$PREFIX
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_
RCC
]]
;
then
ln
-s
/opt/oai-enb/etc/rcc.if4p5.enb.fdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_
FAPI_RCC
]]
;
then
ln
-s
$PREFIX
/etc/rcc.nfapi.fdd.conf
$PREFIX
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_RRU
]]
;
then
ln
-s
/opt/oai-enb/etc/rru.fdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_FDD_RRU
]]
;
then
ln
-s
$PREFIX
/etc/rru.fdd.conf
$PREFIX
/etc/enb.conf
;
fi
if
[[
-v
USE_TDD_RRU
]]
;
then
ln
-s
/opt/oai-enb/etc/rru.tdd.conf /opt/oai-enb
/etc/enb.conf
;
fi
if
[[
-v
USE_TDD_RRU
]]
;
then
ln
-s
$PREFIX
/etc/rru.tdd.conf
$PREFIX
/etc/enb.conf
;
fi
# Only this template will be manipulated
# Only this template will be manipulated
CONFIG_FILES
=
`
ls
/opt/oai-enb/etc/enb.conf
`
CONFIG_FILES
=
`
ls
$PREFIX
/etc/enb.conf
||
true
`
for
c
in
${
CONFIG_FILES
}
;
do
for
c
in
${
CONFIG_FILES
}
;
do
# grep variable names (format: ${VAR}) from template to be rendered
# grep variable names (format: ${VAR}) from template to be rendered
...
...
docker/scripts/enb_parameters.yaml
View file @
44672c4c
...
@@ -159,6 +159,8 @@
...
@@ -159,6 +159,8 @@
env
:
"
@ENB_S1U_IP_ADDRESS@"
env
:
"
@ENB_S1U_IP_ADDRESS@"
-
key
:
ENB_IPV4_ADDRESS_FOR_X2C
-
key
:
ENB_IPV4_ADDRESS_FOR_X2C
env
:
"
@ENB_X2_IP_ADDRESS@"
env
:
"
@ENB_X2_IP_ADDRESS@"
-
key
:
rrc_inactivity_threshold
env
:
"
@RRC_INACTIVITY_THRESHOLD@"
-
key
:
FLEXRAN_ENABLED
-
key
:
FLEXRAN_ENABLED
env
:
"
@FLEXRAN_ENABLED@"
env
:
"
@FLEXRAN_ENABLED@"
-
key
:
FLEXRAN_INTERFACE_NAME
-
key
:
FLEXRAN_INTERFACE_NAME
...
@@ -204,7 +206,7 @@
...
@@ -204,7 +206,7 @@
env
:
"
@F1_CU_IP_ADDRESS@"
env
:
"
@F1_CU_IP_ADDRESS@"
-
filePrefix
:
"
rcc.band7.tm1.nfapi"
-
filePrefix
:
"
rcc.band7.tm1.nfapi"
outputfilename
:
"
rcc.
if4p5.enb
.fdd.conf"
outputfilename
:
"
rcc.
nfapi
.fdd.conf"
config
:
config
:
-
key
:
Active_eNBs
-
key
:
Active_eNBs
env
:
"
@ENB_NAME@"
env
:
"
@ENB_NAME@"
...
...
docker/scripts/generateTemplate.py
View file @
44672c4c
...
@@ -35,11 +35,12 @@ def main():
...
@@ -35,11 +35,12 @@ def main():
data
=
yaml
.
full_load
(
f
)
data
=
yaml
.
full_load
(
f
)
dir
=
os
.
listdir
(
f'
{
data
[
0
][
"paths"
][
"source_dir"
]
}
'
)
dir
=
os
.
listdir
(
f'
{
data
[
0
][
"paths"
][
"source_dir"
]
}
'
)
#identify configs, read and replace corresponding values
#identify configs, read and replace corresponding values
for
config
in
data
[
1
][
"configurations"
]:
for
config
in
data
[
1
][
"configurations"
]:
filePrefix
=
config
[
"filePrefix"
]
filePrefix
=
config
[
"filePrefix"
]
outputfilename
=
config
[
"outputfilename"
]
outputfilename
=
config
[
"outputfilename"
]
print
(
'filePrefix = '
+
filePrefix
)
print
(
'outputfilename = '
+
outputfilename
)
for
inputfile
in
dir
:
for
inputfile
in
dir
:
if
inputfile
.
find
(
filePrefix
)
>=
0
:
if
inputfile
.
find
(
filePrefix
)
>=
0
:
prefix_outputfile
=
{
"cu"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
prefix_outputfile
=
{
"cu"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
...
@@ -48,7 +49,9 @@ def main():
...
@@ -48,7 +49,9 @@ def main():
"rru.tdd"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"rru.tdd"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"enb.band7.tm1.25PRB.usrpb210"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"enb.band7.tm1.25PRB.usrpb210"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"enb.band40.tm1.25PRB.FairScheduler.usrpb210"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"enb.band40.tm1.25PRB.FairScheduler.usrpb210"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"rcc.band7.tm1.nfapi"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
"rcc.band7.tm1.nfapi"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"ue.nfapi"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
,
"ue_sim_ci"
:
f'
{
data
[
0
][
"paths"
][
"dest_dir"
]
}
/
{
outputfilename
}
'
}
}
if
filePrefix
in
prefix_outputfile
:
if
filePrefix
in
prefix_outputfile
:
outputfile1
=
prefix_outputfile
[
filePrefix
]
outputfile1
=
prefix_outputfile
[
filePrefix
]
...
@@ -61,6 +64,9 @@ def main():
...
@@ -61,6 +64,9 @@ def main():
open
(
outputfile1
,
mode
=
'w'
)
as
outputfile
:
open
(
outputfile1
,
mode
=
'w'
)
as
outputfile
:
for
line
in
inputfile
:
for
line
in
inputfile
:
count
=
0
count
=
0
if
re
.
search
(
r'EHPLMN_LIST'
,
line
):
outputfile
.
write
(
line
)
continue
for
key
in
config
[
"config"
]:
for
key
in
config
[
"config"
]:
if
line
.
find
(
key
[
"key"
])
>=
0
:
if
line
.
find
(
key
[
"key"
])
>=
0
:
count
+=
1
count
+=
1
...
...
docker/scripts/lte_ue_entrypoint.sh
0 → 100755
View file @
44672c4c
#!/bin/bash
set
-euo
pipefail
PREFIX
=
/opt/oai-lte-ue
# Based another env var, pick one template to use
if
[[
-v
USE_NFAPI
]]
;
then
ln
-s
$PREFIX
/etc/ue.nfapi.conf
$PREFIX
/etc/ue.conf
;
fi
# Only this template will be manipulated and the USIM one!
CONFIG_FILES
=
`
ls
$PREFIX
/etc/ue.conf
$PREFIX
/etc/ue_usim.conf
||
true
`
for
c
in
${
CONFIG_FILES
}
;
do
# grep variable names (format: ${VAR}) from template to be rendered
VARS
=
$(
grep
-oP
'@[a-zA-Z0-9_]+@'
${
c
}
|
sort
|
uniq
| xargs
)
# create sed expressions for substituting each occurrence of ${VAR}
# with the value of the environment variable "VAR"
EXPRESSIONS
=
""
for
v
in
${
VARS
}
;
do
NEW_VAR
=
`
echo
$v
|
sed
-e
"s#@##g"
`
if
[[
"
${
!NEW_VAR
}
x"
==
"x"
]]
;
then
echo
"Error: Environment variable '
${
NEW_VAR
}
' is not set."
\
"Config file '
$(
basename
$c
)
' requires all of
$VARS
."
exit
1
fi
EXPRESSIONS
=
"
${
EXPRESSIONS
}
;s|
${
v
}
|
${
!NEW_VAR
}
|g"
done
EXPRESSIONS
=
"
${
EXPRESSIONS
#
';'
}
"
# render template and inline replace config file
sed
-i
"
${
EXPRESSIONS
}
"
${
c
}
done
#now generate USIM files
# At this point all operations will be run from $PREFIX!
cd
$PREFIX
$PREFIX
/bin/conf2uedata
-c
$PREFIX
/etc/ue_usim.conf
-o
$PREFIX
# Load the USRP binaries
if
[[
-v
USE_B2XX
]]
;
then
/usr/lib/uhd/utils/uhd_images_downloader.py
-t
b2xx
elif
[[
-v
USE_X3XX
]]
;
then
/usr/lib/uhd/utils/uhd_images_downloader.py
-t
x3xx
elif
[[
-v
USE_N3XX
]]
;
then
/usr/lib/uhd/utils/uhd_images_downloader.py
-t
n3xx
fi
# in case we have conf file, append
new_args
=()
while
[[
$#
-gt
0
]]
;
do
new_args+
=(
"
$1
"
)
shift
done
if
[[
-v
USE_NFAPI
]]
;
then
new_args+
=(
"-O"
)
new_args+
=(
"
$PREFIX
/etc/ue.conf"
)
fi
echo
"=================================="
echo
"== Starting LTE UE soft modem"
if
[[
-v
USE_ADDITIONAL_OPTIONS
]]
;
then
echo
"Additional option(s):
${
USE_ADDITIONAL_OPTIONS
}
"
for
word
in
${
USE_ADDITIONAL_OPTIONS
}
;
do
new_args+
=(
"
$word
"
)
done
echo
"
${
new_args
[@]
}
"
exec
"
${
new_args
[@]
}
"
else
echo
"
${
new_args
[@]
}
"
exec
"
${
new_args
[@]
}
"
fi
docker/scripts/lte_ue_parameters.yaml
0 → 100644
View file @
44672c4c
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
---
-
paths
:
source_dir
:
"
ci-scripts/conf_files/"
dest_dir
:
docker/etc
-
configurations
:
-
filePrefix
:
ue.nfapi
outputfilename
:
"
ue.nfapi.conf"
config
:
-
key
:
remote_n_address
env
:
"
@ENB_IP_ADDRESS@"
-
key
:
local_n_address
env
:
"
@LTE_UE_IP_ADDRESS@"
-
key
:
local_n_if_name
env
:
"
@UE_NFAPI_IF_NAME@"
docker/scripts/lte_ue_sim_parameters.yaml
0 → 100644
View file @
44672c4c
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
---
-
paths
:
source_dir
:
"
openair3/NAS/TOOLS/"
dest_dir
:
docker/etc
-
configurations
:
-
filePrefix
:
ue_sim_ci
outputfilename
:
"
ue_usim.conf"
config
:
-
key
:
MNC
env
:
"
@MNC@"
-
key
:
MCC
env
:
"
@MCC@"
-
key
:
MSIN
env
:
"
@SHORT_IMSI@"
-
key
:
USIM_API_K
env
:
"
@LTE_KEY@"
-
key
:
OPC
env
:
"
@OPC@"
-
key
:
MSISDN
env
:
"
@MSISDN@"
-
key
:
HPLMN
env
:
"
@HPLMN@"
-
key
:
OPLMN_LIST
env
:
"
@HPLMN@"
openair3/NAS/TOOLS/ue_sim_ci.conf
0 → 100644
View file @
44672c4c
# 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
= ();
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment