From 63124fc4873029d3eebd6e3b165b5ab2779cf4b5 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Fri, 27 Jan 2023 13:49:42 +0100 Subject: [PATCH] chore(ci): updating simulators docker-compose for CN5G release v1.5 Signed-off-by: Raphael Defosseux --- .../5g_f1_rfsimulator/docker-compose.yaml | 112 ++++------------- .../5g_fdd_rfsimulator/docker-compose.yaml | 112 ++++------------- ci-scripts/yaml_files/5g_l2sim_tdd/README.md | 16 +-- .../5g_l2sim_tdd/docker-compose.yaml | 113 ++++------------- .../yaml_files/5g_rfsimulator/README.md | 22 ++-- .../5g_rfsimulator/amf-healthcheck.sh | 57 --------- .../5g_rfsimulator/docker-compose.yaml | 114 ++++------------- .../5g_rfsimulator/nrf-healthcheck.sh | 20 --- .../5g_rfsimulator/smf-healthcheck.sh | 21 ---- .../5g_rfsimulator/spgwu-healthcheck.sh | 28 ----- .../5g_rfsimulator_24prb/docker-compose.yaml | 119 ++++-------------- .../5g_rfsimulator_2x2/docker-compose.yaml | 118 ++++------------- .../docker-compose.yaml | 118 ++++------------- 13 files changed, 171 insertions(+), 799 deletions(-) delete mode 100755 ci-scripts/yaml_files/5g_rfsimulator/amf-healthcheck.sh delete mode 100755 ci-scripts/yaml_files/5g_rfsimulator/nrf-healthcheck.sh delete mode 100755 ci-scripts/yaml_files/5g_rfsimulator/smf-healthcheck.sh delete mode 100755 ci-scripts/yaml_files/5g_rfsimulator/spgwu-healthcheck.sh diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index 5765a33351..d9d97670d3 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -2,27 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "rfsim5g-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 mysql: container_name: "rfsim5g-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -36,17 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -62,132 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 oai-spgwu: container_name: "rfsim5g-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -200,24 +140,16 @@ services: cap_drop: - ALL privileged: true - volumes: - - ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: rfsim5g-oai-ext-dn + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index 695a05f2b0..c3c3797125 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -2,27 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "rfsim5g-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 mysql: container_name: "rfsim5g-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -36,17 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -62,132 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 oai-spgwu: container_name: "rfsim5g-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -200,24 +140,16 @@ services: cap_drop: - ALL privileged: true - volumes: - - ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: rfsim5g-oai-ext-dn + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md index 9578d037ca..adbb6edd44 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md @@ -32,11 +32,12 @@ Password: Now pull images. ```bash -$ docker pull mysql:5.7 -$ docker pull oaisoftwarealliance/oai-amf:develop -$ docker pull oaisoftwarealliance/oai-nrf:develop -$ docker pull oaisoftwarealliance/oai-smf:develop -$ docker pull oaisoftwarealliance/oai-spgwu-tiny:develop +$ docker pull mysql:8.0 +$ docker pull oaisoftwarealliance/oai-amf:v1.5.0 +$ docker pull oaisoftwarealliance/oai-nrf:v1.5.0 +$ docker pull oaisoftwarealliance/oai-smf:v1.5.0 +$ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 +$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest $ docker pull oaisoftwarealliance/oai-gnb:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop @@ -46,11 +47,6 @@ $ docker pull oaisoftwarealliance/proxy:latest And **re-tag** them for tutorials' docker-compose file to work. ```bash -$ docker image tag oaisoftwarealliance/oai-amf:latest oai-amf:august-dev -$ docker image tag oaisoftwarealliance/oai-nrf:latest oai-nrf:august-dev -$ docker image tag oaisoftwarealliance/oai-smf:latest oai-smf:august-dev -$ docker image tag oaisoftwarealliance/oai-spgwu-tiny:latest oai-spgwu-tiny:august-dev - $ docker image tag oaisoftwarealliance/oai-gnb:develop oai-gnb:develop $ docker image tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue:develop $ docker image tag oaisoftwarealliance/proxy:latest oai-lte-multi-ue-proxy:latest diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml index 83b6ce50ae..265f130c08 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml @@ -2,27 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "l2sim-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ../5g_rfsimulator/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 mysql: container_name: "l2sim-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -36,17 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 oai-amf: container_name: "l2sim-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -62,132 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ../5g_rfsimulator/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 oai-smf: container_name: "l2sim-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ../5g_rfsimulator/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 oai-spgwu: container_name: "l2sim-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -200,24 +140,17 @@ services: cap_drop: - ALL privileged: true - volumes: - - ../5g_rfsimulator/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: "l2sim-oai-ext-dn" + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ + "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: - oai-spgwu diff --git a/ci-scripts/yaml_files/5g_rfsimulator/README.md b/ci-scripts/yaml_files/5g_rfsimulator/README.md index f75d3721da..901aa37f78 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/README.md +++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md @@ -14,7 +14,7 @@ This page is only valid for an `Ubuntu18` host. -**NOTE: this version (2022-01-27) has been updated for the `v1.3.0` version of the `OAI 5G CN`.** +**NOTE: this version (2023-01-27) has been updated for the `v1.5.0` version of the `OAI 5G CN`.** **Table of Contents** @@ -36,11 +36,12 @@ Password: Now pull images. ```bash -$ docker pull mysql:5.7 -$ docker pull oaisoftwarealliance/oai-amf:develop -$ docker pull oaisoftwarealliance/oai-nrf:develop -$ docker pull oaisoftwarealliance/oai-smf:develop -$ docker pull oaisoftwarealliance/oai-spgwu-tiny:develop +$ docker pull mysql:8.0 +$ docker pull oaisoftwarealliance/oai-amf:v1.5.0 +$ docker pull oaisoftwarealliance/oai-nrf:v1.5.0 +$ docker pull oaisoftwarealliance/oai-smf:v1.5.0 +$ docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 +$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest $ docker pull oaisoftwarealliance/oai-gnb:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop @@ -49,11 +50,6 @@ $ docker pull oaisoftwarealliance/oai-nr-ue:develop And **re-tag** them for tutorials' docker-compose file to work. ```bash -$ docker image tag oaisoftwarealliance/oai-amf:latest oai-amf:august-dev -$ docker image tag oaisoftwarealliance/oai-nrf:latest oai-nrf:august-dev -$ docker image tag oaisoftwarealliance/oai-smf:latest oai-smf:august-dev -$ docker image tag oaisoftwarealliance/oai-spgwu-tiny:latest oai-spgwu-tiny:august-dev - $ docker image tag oaisoftwarealliance/oai-gnb:develop oai-gnb:develop $ docker image tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue:develop ``` @@ -62,9 +58,9 @@ $ docker image tag oaisoftwarealliance/oai-nr-ue:develop oai-nr-ue:develop $ docker logout ``` -**CAUTION: 2022/01/27 with the release `v1.3.0` of the `CN5G`, the previous version was not compatible any-more.** +**CAUTION: 2023/01/27 with the release `v1.5.0` of the `CN5G`, the previous version was not compatible any-more.** -**This new version is working only with the `v1.3.0` of the `CN5G`.** +**This new version is working only with the `v1.5.0` of the `CN5G`.** # 2. Deploy containers # diff --git a/ci-scripts/yaml_files/5g_rfsimulator/amf-healthcheck.sh b/ci-scripts/yaml_files/5g_rfsimulator/amf-healthcheck.sh deleted file mode 100755 index 8bfdee2aac..0000000000 --- a/ci-scripts/yaml_files/5g_rfsimulator/amf-healthcheck.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -set -eo pipefail - -STATUS=0 -AMF_PORT_FOR_NGAP=38412 -AMF_PORT_FOR_N11_HTTP=80 -AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'}) -AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'}) -N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP") -N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP") -#Check if entrypoint properly configured the conf file and no parameter is unset (optional) -NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true` - -if [ $NB_UNREPLACED_AT -ne 0 ]; then - STATUS=1 - echo "Healthcheck error: configuration file is not configured properly" -fi - -if [[ -z $N2_PORT_STATUS ]]; then - STATUS=1 - echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening" -fi - -if [[ -z $N11_PORT_STATUS ]]; then - STATUS=1 - echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening" -fi - -#host="${MYSQL_SERVER}" -#user="${MYSQL_USER:-root}" -#export MYSQL_PWD="${MYSQL_PASS}" - -#args=( -# -h"$host" -# -u"$user" -# --silent -#) - -#if ! command -v mysql &> /dev/null; then -# echo "Installing mysql command" -# apt update -# apt-get -y install mysql-client -#else -# if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then -# database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;") -# if [[ -z $database_check ]]; then -# echo "Healthcheck error: oai_db not populated" -# STATUS=1 -# fi -# STATUS=0 -# else -# echo "Healthcheck error: Mysql port inactive" -# STATUS=1 -# fi -#fi - -exit $STATUS diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index 107ec626e2..ab78b35ab5 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -2,27 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "rfsim5g-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 mysql: container_name: "rfsim5g-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -36,17 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -62,132 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 oai-spgwu: container_name: "rfsim5g-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -200,24 +140,16 @@ services: cap_drop: - ALL privileged: true - volumes: - - ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: rfsim5g-oai-ext-dn + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: @@ -234,7 +166,7 @@ services: image: oai-gnb:develop privileged: true container_name: rfsim5g-oai-gnb - environment: + environment: RFSIMULATOR: server USE_SA_TDD_MONO: 'yes' GNB_NAME: gnb-rfsim diff --git a/ci-scripts/yaml_files/5g_rfsimulator/nrf-healthcheck.sh b/ci-scripts/yaml_files/5g_rfsimulator/nrf-healthcheck.sh deleted file mode 100755 index 3479c092e8..0000000000 --- a/ci-scripts/yaml_files/5g_rfsimulator/nrf-healthcheck.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -eo pipefail - -STATUS=0 -NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'}) -NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI") -#Check if entrypoint properly configured the conf file and no parameter is unset(optional) -NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true` - -if [ $NB_UNREPLACED_AT -ne 0 ]; then - STATUS=1 - echo "Healthcheck error: UNHEALTHY configuration file is not configured properly" -fi - -if [[ -z $NRF_SBI_PORT_STATUS ]]; then - STATUS=1 - echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening." -fi - -exit $STATUS \ No newline at end of file diff --git a/ci-scripts/yaml_files/5g_rfsimulator/smf-healthcheck.sh b/ci-scripts/yaml_files/5g_rfsimulator/smf-healthcheck.sh deleted file mode 100755 index d9ff7608e8..0000000000 --- a/ci-scripts/yaml_files/5g_rfsimulator/smf-healthcheck.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -eo pipefail - -STATUS=0 -SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'}) -SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI") - -#Check if entrypoint properly configured the conf file and no parameter is unset(optional) -#NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true` - -#if [ $NB_UNREPLACED_AT -ne 0 ]; then -# STATUS=-1 -# echo "Healthcheck error: UNHEALTHY configuration file is not configured properly" -#fi -# -if [[ -z $SMF_SBI_PORT_STATUS ]]; then - STATUS=-1 - echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening." -fi - -exit $STATUS diff --git a/ci-scripts/yaml_files/5g_rfsimulator/spgwu-healthcheck.sh b/ci-scripts/yaml_files/5g_rfsimulator/spgwu-healthcheck.sh deleted file mode 100755 index 0e3b67ee7e..0000000000 --- a/ci-scripts/yaml_files/5g_rfsimulator/spgwu-healthcheck.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -set -eo pipefail - -STATUS=0 -SGW_PORT_FOR_S1U_S12_S4_UP=2152 -SGW_PORT_FOR_SX=8805 -SGW_IP_S1U_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP | grep inet | awk {'print $2'}) -SGW_IP_SX_INTERFACE=$(ifconfig $SGW_INTERFACE_NAME_FOR_SX | grep inet | awk {'print $2'}) -S1U_S12_S4_UP_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_S1U_INTERFACE:$SGW_PORT_FOR_S1U_S12_S4_UP") -SX_PORT_STATUS=$(netstat -unpl | grep -o "$SGW_IP_SX_INTERFACE:$SGW_PORT_FOR_SX") -#Check if entrypoint properly configured the conf file and no parameter is unset (optional) -NB_UNREPLACED_AT=`cat /openair-spgwu/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true` -if [ $NB_UNREPLACED_AT -ne 0 ]; then - STATUS=1 - echo "Healthcheck error: UNHEALTHY configuration file is not configured properly" -fi - -if [[ -z $S1U_S12_S4_UP_PORT_STATUS ]]; then - STATUS=1 - echo "Healthcheck error: UNHEALTHY S1U port $SGW_PORT_FOR_S1U_S12_S4_UP is not listening." -fi - -if [[ -z $SX_PORT_STATUS ]]; then - STATUS=1 - echo "Healthcheck error: UNHEALTHY SX port $SGW_PORT_FOR_SX is not listening." -fi - -exit $STATUS \ No newline at end of file diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 683c6bd9e6..64a507e4f6 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -2,28 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "rfsim5g-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ../5g_rfsimulator/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 - mysql: container_name: "rfsim5g-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -37,18 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 - oai-amf: container_name: "rfsim5g-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -64,134 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ../5g_rfsimulator/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 - oai-smf: container_name: "rfsim5g-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ../5g_rfsimulator/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 - oai-spgwu: container_name: "rfsim5g-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -204,25 +140,16 @@ services: cap_drop: - ALL privileged: true - volumes: - - ../5g_rfsimulator/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 - oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: rfsim5g-oai-ext-dn + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: @@ -235,7 +162,6 @@ services: interval: 10s timeout: 5s retries: 5 - oai-gnb: image: oai-gnb:develop privileged: true @@ -256,7 +182,6 @@ services: interval: 10s timeout: 5s retries: 5 - oai-nr-ue: image: oai-nr-ue:develop privileged: true diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index 6161f223f8..06f1dcc80e 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -2,28 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "rfsim5g-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ../5g_rfsimulator/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 - mysql: container_name: "rfsim5g-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -37,18 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 - oai-amf: container_name: "rfsim5g-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -64,134 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ../5g_rfsimulator/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 - oai-smf: container_name: "rfsim5g-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ../5g_rfsimulator/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 - oai-spgwu: container_name: "rfsim5g-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -204,25 +140,16 @@ services: cap_drop: - ALL privileged: true - volumes: - - ../5g_rfsimulator/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 - oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: rfsim5g-oai-ext-dn + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: @@ -235,7 +162,6 @@ services: interval: 10s timeout: 5s retries: 5 - oai-gnb: image: oai-gnb:develop privileged: true diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index 973a687e87..51d21efc60 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -2,28 +2,16 @@ version: '3.8' services: oai-nrf: container_name: "rfsim5g-oai-nrf" - image: oai-nrf:august-dev + image: oaisoftwarealliance/oai-nrf:v1.5.0 environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - - NRF_INTERFACE_PORT_FOR_SBI=80 - - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - - NRF_API_VERSION=v1 - - INSTANCE=0 - - PID_DIRECTORY=/var/run + - TZ=Europe/Paris networks: public_net: ipv4_address: 192.168.71.130 - volumes: - - ../5g_rfsimulator/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 - mysql: container_name: "rfsim5g-mysql" - image: mysql:5.7 + image: mysql:8.0 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -37,18 +25,15 @@ services: test: /bin/bash -c "/tmp/mysql-healthcheck.sh" interval: 10s timeout: 5s - retries: 5 + retries: 30 networks: public_net: ipv4_address: 192.168.71.131 - oai-amf: container_name: "rfsim5g-oai-amf" - image: oai-amf:august-dev + image: oaisoftwarealliance/oai-amf:v1.5.0 environment: - TZ=Europe/paris - - INSTANCE=0 - - PID_DIRECTORY=/var/run - MCC=208 - MNC=99 - REGION_ID=128 @@ -64,134 +49,85 @@ services: - PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_TAC=0x0001 + # Only one slice is defined (1, 0xFFFFFF). - SST_0=1 - - SD_0=0xffffff - - SST_1=1 - - SD_1=1 - AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0 + # One single SMF instance - SMF_INSTANCE_ID_0=1 - SMF_FQDN_0=oai-smf - - SMF_IPV4_ADDR_0=0.0.0.0 - - SMF_HTTP_VERSION_0=v1 + - SMF_IPV4_ADDR_0=192.168.71.133 - 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 definition in AMF is mandatory in mini deployment. - MYSQL_SERVER=192.168.71.131 - MYSQL_USER=root - MYSQL_PASS=linux - MYSQL_DB=oai_db - - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1 + # NF registration - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 + - NRF_FQDN=oai-nrf - NF_REGISTRATION=yes - SMF_SELECTION=yes - USE_FQDN_DNS=yes - - NRF_API_VERSION=v1 - - NRF_FQDN=oai-nrf - - EXTERNAL_AUSF=no - - AUSF_IPV4_ADDRESS=0.0.0.0 - - AUSF_PORT=80 - - AUSF_API_VERSION=v1 - - AUSF_FQDN=localhost + - USE_HTTP2=no depends_on: - oai-nrf - mysql - volumes: - - ../5g_rfsimulator/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" - interval: 10s - timeout: 15s - retries: 5 networks: public_net: ipv4_address: 192.168.71.132 - oai-smf: container_name: "rfsim5g-oai-smf" - image: oai-smf:august-dev + 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=4.4.4.4 - - AMF_IPV4_ADDRESS=0.0.0.0 - - AMF_PORT=80 - - AMF_API_VERSION=v1 + - AMF_IPV4_ADDRESS=192.168.71.132 - AMF_FQDN=oai-amf - - UDM_IPV4_ADDRESS=127.0.0.1 - - UDM_PORT=80 - - UDM_API_VERSION=v1 - - UDM_FQDN=localhost - UPF_IPV4_ADDRESS=192.168.71.134 - UPF_FQDN_0=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf - REGISTER_NRF=yes - DISCOVER_UPF=yes - USE_FQDN_DNS=yes + - USE_LOCAL_SUBSCRIPTION_INFO=yes + - UE_MTU=1500 + # Only one slice is defined (1, 0xFFFFFF) - DNN_NI0=oai - TYPE0=IPv4 - DNN_RANGE0=12.1.1.2 - 12.1.1.127 - NSSAI_SST0=1 - - NSSAI_SD0=0xFFFFFF - SESSION_AMBR_UL0=200Mbps - SESSION_AMBR_DL0=400Mbps - - DNN_NI2=oai.ipv4 + - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 + - ENABLE_USAGE_REPORTING=no depends_on: - oai-nrf - oai-amf - volumes: - - ../5g_rfsimulator/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.133 - oai-spgwu: container_name: "rfsim5g-oai-spgwu" - image: oai-spgwu-tiny:august-dev + 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.71.133 - - BYPASS_UL_PFCP_RULES=no - - MCC=208 - - MNC=99 - - MNC03=099 - - TAC=1 - - GTP_EXTENSION_HEADER_PRESENT=yes - - GW_ID=1 - - REALM=openairinterface.org - ENABLE_5G_FEATURES=yes - REGISTER_NRF=yes - USE_FQDN_NRF=yes - UPF_FQDN_5G=oai-spgwu - NRF_IPV4_ADDRESS=192.168.71.130 - - NRF_PORT=80 - - NRF_API_VERSION=v1 - NRF_FQDN=oai-nrf + # Only one slice is defined (1, 0xFFFFFF) - NSSAI_SST_0=1 - NSSAI_SD_0=0xffffff - DNN_0=oai @@ -204,25 +140,16 @@ services: cap_drop: - ALL privileged: true - volumes: - - ../5g_rfsimulator/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - healthcheck: - test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" - interval: 10s - timeout: 5s - retries: 5 networks: public_net: ipv4_address: 192.168.71.134 traffic_net: ipv4_address: 192.168.72.134 - oai-ext-dn: - image: ubuntu:bionic privileged: true container_name: rfsim5g-oai-ext-dn + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity" depends_on: @@ -235,7 +162,6 @@ services: interval: 10s timeout: 5s retries: 5 - oai-gnb: image: oai-gnb:develop privileged: true