maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/resolve_fqdn' into integration_2022_wk42b

Browse Source
This commit is contained in:
Robert Schmidt
2022-10-20 14:57:52 +02:00
parent c36a1ef453 048c7df304
commit 8a290ece2a
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/scripts/enb_entrypoint.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -uo pipefail
PREFIX=/opt/oai-enb PREFIX=/opt/oai-enb
RRC_INACTIVITY_THRESHOLD=${RRC_INACTIVITY_THRESHOLD:-0} RRC_INACTIVITY_THRESHOLD=${RRC_INACTIVITY_THRESHOLD:-0}
docker/scripts/gnb_entrypoint.sh
+4 -6
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -uo pipefail
PREFIX=/opt/oai-gnb PREFIX=/opt/oai-gnb
ENABLE_X2=${ENABLE_X2:-yes} ENABLE_X2=${ENABLE_X2:-yes}
@@ -21,11 +21,9 @@ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.c
# Defualt Parameters # Defualt Parameters
GNB_ID=${GNB_ID:-e00} GNB_ID=${GNB_ID:-e00}
NSSAI_SD=${NSSAI_SD:-ffffff} NSSAI_SD=${NSSAI_SD:-ffffff}
USE_FQDN=${USE_FQDN:-false} # AMF_IP_ADDRESS can be amf ip address of amf fqdn
AMF_FQDN=${AMF_FQDN:-oai-amf-svc} if [[ -v AMF_IP_ADDRESS ]] && [[ "${AMF_IP_ADDRESS}" =~ [a-zA-Z] ]] && [[ -z `getent hosts $AMF_IP_ADDRESS | awk '{print $1}'` ]]; then echo "not able to resolve AMF FQDN" && exit 1 ; fi
[[ -v AMF_IP_ADDRESS ]] && [[ "${AMF_IP_ADDRESS}" =~ [a-zA-Z] ]] && AMF_IP_ADDRESS=$(getent hosts $AMF_IP_ADDRESS | awk '{print $1}')
# Resolve AMF FQDN
if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi
# Only this template will be manipulated # Only this template will be manipulated
CONFIG_FILES=`ls $PREFIX/etc/gnb.conf || true` CONFIG_FILES=`ls $PREFIX/etc/gnb.conf || true`
docker/scripts/lte_ru_entrypoint.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -uo pipefail
PREFIX=/opt/oai-lte-ru PREFIX=/opt/oai-lte-ru
docker/scripts/lte_ue_entrypoint.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -uo pipefail
PREFIX=/opt/oai-lte-ue PREFIX=/opt/oai-lte-ue
docker/scripts/nr_ue_entrypoint.sh
+5 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -uo pipefail
PREFIX=/opt/oai-nr-ue PREFIX=/opt/oai-nr-ue
@@ -11,6 +11,10 @@ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/nr-ue
# if none, pick the default # if none, pick the default
if [ ! -f $PREFIX/etc/nr-ue.conf ]; then cp $PREFIX/etc/nr-ue-sim.conf $PREFIX/etc/nr-ue.conf; fi if [ ! -f $PREFIX/etc/nr-ue.conf ]; then cp $PREFIX/etc/nr-ue-sim.conf $PREFIX/etc/nr-ue.conf; fi
# RFSIMULATOR can have ip-address or service name
if [[ -v RFSIMULATOR ]] && [[ "${RFSIMULATOR}" =~ [a-zA-Z] ]] && [[ -z `getent hosts $RFSIMULATOR | awk '{print $1}'` ]]; then echo "not able to resolve RFSIMULATOR FQDN" && exit 1 ; fi
[[ -v RFSIMULATOR ]] && [[ "${RFSIMULATOR}" =~ [a-zA-Z] ]] && RFSIMULATOR=$(getent hosts $RFSIMULATOR | awk '{print $1}')
# Only this template will be manipulated # Only this template will be manipulated
CONFIG_FILES=`ls $PREFIX/etc/nr-ue.conf || true` CONFIG_FILES=`ls $PREFIX/etc/nr-ue.conf || true`