From 8ef0bf84625923faf0431ffa5163cd5d8a46e964 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Tue, 8 Jul 2025 10:46:55 +0200 Subject: [PATCH] CI: specify interface names in UPF container --- .../yaml_files/5g_f1_rfsimulator/docker-compose.yaml | 2 ++ .../yaml_files/5g_fdd_rfsimulator/docker-compose.yaml | 2 ++ ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml | 2 ++ .../yaml_files/5g_rfsimulator_24prb/docker-compose.yaml | 2 ++ .../yaml_files/5g_rfsimulator_2x2/docker-compose.yaml | 2 ++ .../yaml_files/5g_rfsimulator_e1/docker-compose.yaml | 2 ++ .../5g_rfsimulator_fr2_32prb/docker-compose.yaml | 2 ++ .../yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml | 2 ++ .../yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml | 2 ++ .../5g_rfsimulator_sidelink/docker-compose.yaml | 8 -------- .../5g_rfsimulator_u0_25prb/docker-compose.yaml | 2 ++ 11 files changed, 20 insertions(+), 8 deletions(-) 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 b4bec0e486..5c3bdc7a18 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -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 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 dd306c15f6..164a9bc0d4 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -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 diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index ac89f0d036..cdce17520a 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -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 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 8dfe5a5980..7b09c4a955 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -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 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 3231a2f76e..5d4970459a 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -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 diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 66b746b6f2..53fa6a8181 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -65,8 +65,10 @@ services: networks: core_net: ipv4_address: 192.168.71.134 + interface_name: eth0 traffic_net: ipv4_address: 192.168.72.134 + interface_name: eth1 oai-cucp: image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop} diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml index 413fdb1358..aa0b9a6ca3 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml @@ -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 diff --git a/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml index a8c9785f15..f127fdc3b0 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml @@ -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 diff --git a/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml index 65de72fb51..a0c44153cd 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml @@ -63,8 +63,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 diff --git a/ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml index cae436e001..c04e634ca2 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_sidelink/docker-compose.yaml @@ -60,11 +60,3 @@ networks: - subnet: 192.168.71.128/26 driver_opts: com.docker.network.bridge.name: "rfsim5g-public" - 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" 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 2dca6cc25f..24a9edd8d7 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 @@ -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