Skip to content
Snippets Groups Projects

feat(test): post-jinja2 update, simplification of docker-compose files

Merged feat(test): post-jinja2 update, simplification of docker-compose files
doc-v1.5-update-simplifications into master
Merged Raphael Defosseux requested to merge doc-v1.5-update-simplifications into master
Compare
and
12 files
+ 237
− 555
Compare changes
  • Side-by-side
  • Inline
Files
12
docker-compose/docker-compose-basic-nonrf.yaml
+ 16
− 89
@@ -16,7 +16,7 @@ services:
test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
retries: 30
networks:
public_net:
ipv4_address: 192.168.70.131
@@ -25,18 +25,11 @@ services:
image: oaisoftwarealliance/oai-udr:v1.5.0
environment:
- TZ=Europe/Paris
- INSTANCE=0
- PID_DIRECTORY=/var/run
- UDR_NAME=OAI_UDR
- UDR_INTERFACE_NAME_FOR_NUDR=eth0
- UDR_INTERFACE_PORT_FOR_NUDR=80
- UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
- USE_HTTP2=no
- UDR_API_VERSION=v1
- MYSQL_IPV4_ADDRESS=192.168.70.131
- MYSQL_USER=test
- MYSQL_PASS=test
- DB_CONNECTION_TIMEOUT=300 # Reset the connection to the DB after expiring the timeout (in second) currently can't be changed
- MYSQL_DB=oai_db
- WAIT_MYSQL=120
- USE_FQDN_DNS=yes
@@ -51,20 +44,12 @@ services:
image: oaisoftwarealliance/oai-udm:v1.5.0
environment:
- TZ=Europe/Paris
- INSTANCE=0
- PID_DIRECTORY=/var/run
- UDM_NAME=OAI_UDM
- SBI_IF_NAME=eth0
- SBI_PORT=80
- SBI_HTTP2_PORT=8080
- USE_HTTP2=no
- UDM_VERSION_NB=v1
- USE_FQDN_DNS=yes
- REGISTER_NRF=no
- UDR_IP_ADDRESS=192.168.70.136
- UDR_PORT=80
- UDR_VERSION_NB=v1
- UDR_FQDN=oai-udr
- REGISTER_NRF=no
depends_on:
- oai-udr
networks:
@@ -75,19 +60,12 @@ services:
image: oaisoftwarealliance/oai-ausf:v1.5.0
environment:
- TZ=Europe/Paris
- INSTANCE_ID=0
- PID_DIR=/var/run
- AUSF_NAME=OAI_AUSF
- SBI_IF_NAME=eth0
- SBI_PORT=80
- USE_HTTP2=no
- SBI_HTTP2_PORT=8080
- USE_FQDN_DNS=yes
- REGISTER_NRF=no
- UDM_IP_ADDRESS=192.168.70.137
- UDM_PORT=80
- UDM_VERSION_NB=v1
- UDM_FQDN=oai-udm
- REGISTER_NRF=no
depends_on:
- oai-udm
networks:
@@ -98,8 +76,6 @@ services:
image: oaisoftwarealliance/oai-amf:v1.5.0
environment:
- TZ=Europe/paris
- INSTANCE=0
- PID_DIRECTORY=/var/run
- MCC=208
- MNC=95
- REGION_ID=128
@@ -115,10 +91,14 @@ services:
- PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=95
- PLMN_SUPPORT_TAC=0xa000
# Slice 0 (1, 0xFFFFFF)
- SST_0=1
- SD_0=0xFFFFFF
# At least one slice SHALL be defined.
# All the others are optional
# Slice 1 (1, 1)
- SST_1=1
- SD_1=1
# Slice 2 (222, 123)
- SST_2=222
- SD_2=123
- AMF_INTERFACE_NAME_FOR_NGAP=eth0
@@ -126,36 +106,12 @@ services:
- SMF_INSTANCE_ID_0=1
- SMF_FQDN_0=oai-smf
- SMF_IPV4_ADDR_0=192.168.70.133
- SMF_HTTP_VERSION_0=v1
- SELECTED_0=true
- SMF_INSTANCE_ID_1=2
- SMF_FQDN_1=oai-smf
- SMF_IPV4_ADDR_1=0.0.0.0
- SMF_HTTP_VERSION_1=v1
- SELECTED_1=false
- MYSQL_SERVER=192.168.70.131
- MYSQL_USER=root
- MYSQL_PASS=linux
- MYSQL_DB=oai_db
- EXTERNAL_NRF=no
- NF_REGISTRATION=no
- SMF_SELECTION=no
- USE_FQDN_DNS=yes
- EXTERNAL_AUSF=yes
- EXTERNAL_UDM=no
- EXTERNAL_NSSF=no
- USE_HTTP2=no
- NRF_IPV4_ADDRESS=0.0.0.0 # not used in this scenario, can't remove
- NRF_PORT=80 # not used in this scenario, can't remove
- NRF_API_VERSION=v1 # not used in this scenario, can't remove
- NRF_FQDN=localhost # not used in this scenario, can't remove
- USE_HTTP2=no
- AUSF_IPV4_ADDRESS=192.168.70.138
- AUSF_PORT=80
- AUSF_API_VERSION=v1
- AUSF_FQDN=oai-ausf
- UDM_IPV4_ADDRESS=192.168.70.137
- UDM_PORT=80
- UDM_API_VERSION=v2
- UDM_FQDN=oai-udm
depends_on:
- mysql
@@ -168,43 +124,29 @@ services:
image: oaisoftwarealliance/oai-smf:v1.5.0
environment:
- TZ=Europe/Paris
- INSTANCE=0
- PID_DIRECTORY=/var/run
- SMF_INTERFACE_NAME_FOR_N4=eth0
- SMF_INTERFACE_NAME_FOR_SBI=eth0
- SMF_INTERFACE_PORT_FOR_SBI=80
- SMF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
- SMF_API_VERSION=v1
- DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
- DEFAULT_DNS_SEC_IPV4_ADDRESS=8.8.8.8
- AMF_IPV4_ADDRESS=192.168.70.132
- AMF_PORT=80
- AMF_API_VERSION=v1
- AMF_FQDN=oai-amf
- UDM_IPV4_ADDRESS=192.168.70.137
- UDM_PORT=80
- UDM_API_VERSION=v2
- UDM_FQDN=oai-udm
- UPF_IPV4_ADDRESS=192.168.70.134
- UPF_FQDN_0=oai-spgwu
- NRF_IPV4_ADDRESS=0.0.0.0 # not used in this scenario, can't remove
- NRF_PORT=80 # not used in this scenario, can't remove
- NRF_API_VERSION=v1 # not used in this scenario, can't remove
- NRF_FQDN=localhost # not used in this scenario, can't remove
- USE_LOCAL_SUBSCRIPTION_INFO=yes #Set to yes if SMF uses local subscription information instead of from an UDM
- USE_NETWORK_INSTANCE=no #Set yes if network instance is to be used for given UPF
- REGISTER_NRF=no
- DISCOVER_UPF=no
- USE_FQDN_DNS=yes
- HTTP_VERSION=1 # Default: 1
- UE_MTU=1500
# Slice 0 (1, 0xFFFFFFF)
- DNN_NI0=oai
- TYPE0=IPv4
- DNN_RANGE0=12.1.1.151 - 12.1.1.253
- NSSAI_SST0=1
- NSSAI_SD0=0xFFFFFF
- SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps
# Slice 1 (1, 1)
- DNN_NI1=oai.ipv4
- TYPE1=IPv4
- DNN_RANGE1=12.1.1.51 - 12.1.1.150
@@ -212,6 +154,7 @@ services:
- NSSAI_SD1=1
- SESSION_AMBR_UL1=100Mbps
- SESSION_AMBR_DL1=200Mbps
# Slice 2 (222, 123)
- DNN_NI2=default
- TYPE2=IPv4
- DNN_RANGE2=12.1.1.2 - 12.1.1.50
@@ -219,6 +162,7 @@ services:
- NSSAI_SD2=123
- SESSION_AMBR_UL2=50Mbps
- SESSION_AMBR_DL2=100Mbps
# Slice 3 for ims
- DNN_NI3=ims
- TYPE3=IPv4v6
- DNN_RANGE3=14.1.1.2 - 14.1.1.253
@@ -236,40 +180,23 @@ services:
image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
environment:
- TZ=Europe/Paris
- PID_DIRECTORY=/var/run
- SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
- SGW_INTERFACE_NAME_FOR_SX=eth0
- PGW_INTERFACE_NAME_FOR_SGI=eth0
- NETWORK_UE_NAT_OPTION=yes
- NETWORK_UE_IP=12.1.1.0/24
- SPGWC0_IP_ADDRESS=192.168.70.133
- BYPASS_UL_PFCP_RULES=no
- THREAD_S1U_PRIO=80
- S1U_THREADS=8
- THREAD_SX_PRIO=81
- SX_THREADS=1
- THREAD_SGI_PRIO=80
- SGI_THREADS=8
- MCC=208
- MNC=95
- MNC03=095
- TAC=40960
- GW_ID=1
- REALM=openairinterface.org
- ENABLE_5G_FEATURES=yes
- REGISTER_NRF=no
- USE_FQDN_NRF=yes
- UPF_FQDN_5G=oai-spgwu
- NRF_IPV4_ADDRESS=0.0.0.0 # not used in this scenario, can't remove
- NRF_PORT=80 # not used in this scenario, can't remove
- NRF_API_VERSION=v1 # not used in this scenario, can't remove
- NRF_FQDN=localhost # not used in this scenario, can't remove
# Slice 0 (1, 0xFFFFFF)
- NSSAI_SST_0=1
- NSSAI_SD_0=0xFFFFFF
- DNN_0=oai
# Slice 1 (1, 1)
- NSSAI_SST_1=1
- NSSAI_SD_1=1
- DNN_1=oai.ipv4
# Slice 2 (222, 123)
- NSSAI_SST_2=222
- NSSAI_SD_2=123
- DNN_2=default