Commit d71e3333 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files

Merge branch 'ci-rfsim5g-fix' into 'develop' (!3517) 

CI: set interface name in UPF container for RFSim5G

This MR addresses an issue related to CN deployment, observed in the RFSim5G CI pipeline. Specifically, the IP addresses within the UPF container were not consistently bound to the correct network interfaces. This inconsistency led to incorrect IP address assignments for the N3, N4, and N6 interfaces, resulting in connectivity issues.

See merge request !3517
parents 8bf6d5d7 4a169f6c

ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml

+2 −0
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ services: 
        networks:

            public_net:

                ipv4_address: 192.168.71.134

                interface_name: eth0

            traffic_net:

                ipv4_address: 192.168.72.134

                interface_name: eth1



    oai-ext-dn:

        privileged: true

ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml

+2 −0
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ services: 
        networks:

            public_net:

                ipv4_address: 192.168.71.134

                interface_name: eth0

            traffic_net:

                ipv4_address: 192.168.72.134

                interface_name: eth1

    oai-ext-dn:

        privileged: true

        container_name: rfsim5g-oai-ext-dn

ci-scripts/yaml_files/5g_rfsimulator/README.md

+13 −2
Original line number Diff line number Diff line
@@ -67,6 +67,18 @@ All the following commands **SHALL** be run from the `ci-scripts/yaml_files/5g_r 
For a deployment with the gNB split in CU and DU components, please refer to the `../5g_f1_rfsimulator` folder.

For a deployment with the gNB split in CU-CP, CU-UP, and DU components, please refer to the `../5g_rfsimulator_e1` folder.



Note: **These instructions require `docker compose` v2.36.0 or later** due to the

use of the `interface_name` property, which is necessary for ensuring consistent

IP address assignment to the container interface.



If you're using an older version of `docker compose`, you may encounter the following

error:

```

validating docker-compose.yaml: services.oai-upf.networks.public_net Additional property interface_name is not allowed

```

To update to the required version, you can follow the official Docker documentation:

https://docs.docker.com/compose/install/linux/



## 2.1. Deploy OAI 5G Core Network ##



```bash
@@ -546,8 +558,7 @@ section in the file for details. This includes an image build service as well as 
code compilation service. This is necessary as the executable has to be linked

against the same libraries that are present in the executing image. This might

take a while the first time but other that that is very fast. Here is a list of

commands (wait between each command). Tested with `docker compose` v2.27.0



commands (wait between each command). Tested with `docker compose` v2.36.2.



This command deploys OAI 5G Core Network

```bash

ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml

+2 −0
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ services: 
        networks:

            public_net:

                ipv4_address: 192.168.71.134

                interface_name: eth0

            traffic_net:

                ipv4_address: 192.168.72.134

                interface_name: eth1

    oai-ext-dn:

        privileged: true

        container_name: rfsim5g-oai-ext-dn

ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml

+2 −0
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ services: 
        networks:

            public_net:

                ipv4_address: 192.168.71.134

                interface_name: eth0

            traffic_net:

                ipv4_address: 192.168.72.134

                interface_name: eth1

    oai-ext-dn:

        privileged: true

        container_name: rfsim5g-oai-ext-dn