chore(ci): updating 5G rfsimulator scenarios to release v2.0

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2024-01-19 11:33:27 +01:00
parent 2f10ce6dad
commit f1d080d315
31 changed files with 588 additions and 1558 deletions
@@ -1,22 +1,13 @@
 version: '3.8'
 services:
-    oai-nrf:
-        container_name: "rfsim5g-oai-nrf"
-        image: oaisoftwarealliance/oai-nrf:v1.5.0
-        environment:
-            - NRF_INTERFACE_NAME_FOR_SBI=eth0
-            - TZ=Europe/1
-        networks:
-            core_net:
-                ipv4_address: 192.168.71.130
    mysql:
        container_name: "rfsim5g-mysql"
        image: mysql:8.0
        volumes:
-            - ../5g_f1_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ../5g_f1_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
        environment:
-            - TZ=Europe/1
+            - TZ=Europe/Paris
            - MYSQL_DATABASE=oai_db
            - MYSQL_USER=test
            - MYSQL_PASSWORD=test
@@ -31,118 +22,36 @@ services:
                ipv4_address: 192.168.71.131
    oai-amf:
        container_name: "rfsim5g-oai-amf"
-        image: oaisoftwarealliance/oai-amf:v1.5.0
+        image: oaisoftwarealliance/oai-amf:v2.0.0
        environment:
-            - TZ=Europe/1
-            - MCC=208
-            - MNC=99
-            - REGION_ID=128
-            - AMF_SET_ID=1
-            - SERVED_GUAMI_MCC_0=208
-            - SERVED_GUAMI_MNC_0=99
-            - SERVED_GUAMI_REGION_ID_0=128
-            - SERVED_GUAMI_AMF_SET_ID_0=1
-            - SERVED_GUAMI_MCC_1=460
-            - SERVED_GUAMI_MNC_1=11
-            - SERVED_GUAMI_REGION_ID_1=10
-            - SERVED_GUAMI_AMF_SET_ID_1=1
-            - PLMN_SUPPORT_MCC=208
-            - PLMN_SUPPORT_MNC=99
-            - PLMN_SUPPORT_TAC=0x0001
-            # Three slices are defined
-            - SST_0=1
-            - SST_1=2
-            - SST_2=3
-            - 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=192.168.71.133
-            - SELECTED_0=true
-            # 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
-            # NF registration
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            - NF_REGISTRATION=yes
-            - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
-            - USE_HTTP2=no
+            - TZ=Europe/paris
+        volumes:
+            - ./mini_nonrf_config_3slices.yaml:/openair-amf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - mysql
        networks:
            core_net:
                ipv4_address: 192.168.71.132
    oai-smf:
        container_name: "rfsim5g-oai-smf"
-        image: oaisoftwarealliance/oai-smf:v1.5.0
+        image: oaisoftwarealliance/oai-smf:v2.0.0
        environment:
-            - TZ=Europe/1
-            - SMF_INTERFACE_NAME_FOR_N4=eth0
-            - SMF_INTERFACE_NAME_FOR_SBI=eth0
-            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
-            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
-            - AMF_IPV4_ADDRESS=192.168.71.132
-            - AMF_FQDN=oai-amf
-            - UPF_IPV4_ADDRESS=192.168.71.134
-            - UPF_FQDN_0=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - 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_SST1=2
-            - NSSAI_SST2=3
-            - SESSION_AMBR_UL0=200Mbps
-            - SESSION_AMBR_DL0=400Mbps
-            - DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1
-            - ENABLE_USAGE_REPORTING=no
+            - TZ=Europe/Paris
+        volumes:
+            - ./mini_nonrf_config_3slices.yaml:/openair-smf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-amf
        networks:
            core_net:
                ipv4_address: 192.168.71.133
-    oai-spgwu:
-        container_name: "rfsim5g-oai-spgwu"
-        image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
+    oai-upf:
+        container_name: "rfsim5g-oai-upf"
+        image: oaisoftwarealliance/oai-upf:v2.0.0
        environment:
-            - TZ=Europe/1
-            - 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
-            - ENABLE_5G_FEATURES=yes
-            - REGISTER_NRF=yes
-            - USE_FQDN_NRF=yes
-            - UPF_FQDN_5G=oai-spgwu
-            - NRF_IPV4_ADDRESS=192.168.71.130
-            - NRF_FQDN=oai-nrf
-            # Three slices are defined
-            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
-            - DNN_0=oai
-            - NSSAI_SST_1=2
-            - NSSAI_SD_1=0xffffff
-            - DNN_1=oai
-            - NSSAI_SST_2=3
-            - NSSAI_SD_2=0xffffff
-            - DNN_2=oai
+            - TZ=Europe/Paris
+        volumes:
+            - ./mini_nonrf_config_3slices.yaml:/openair-upf/etc/config.yaml
        depends_on:
-            - oai-nrf
            - oai-smf
        cap_add:
            - NET_ADMIN
@@ -153,6 +62,8 @@ services:
        networks:
            core_net:
                ipv4_address: 192.168.71.134
+            traffic_net:
+                ipv4_address: 192.168.72.134

    oai-cucp:
        image: oaisoftwarealliance/oai-gnb:develop
@@ -164,7 +75,7 @@ services:
                                    --gNBs.[0].local_s_address 192.168.72.2
            ASAN_OPTIONS: detect_leaks=0
        depends_on:
-            - oai-spgwu
+            - oai-upf
        networks:
            core_net:
                ipv4_address: 192.168.71.150
@@ -435,6 +346,14 @@ networks:
                - subnet: 192.168.71.128/26
        driver_opts:
            com.docker.network.bridge.name: "rfsim5g-core"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"
    f1c_net:
        driver: bridge
        name: rfsim5g-oai-f1c-net