From 913a3f8438bf44ad9b2b610bdccac047ec0a9a68 Mon Sep 17 00:00:00 2001 From: PapaySail <125686203+PapaySail@users.noreply.github.com> Date: Thu, 23 May 2024 23:32:07 +0600 Subject: [PATCH 1/3] fix commit & image tags for oai-nfapi-sim-compose --- docs/deployments/oai-nfapi-sim-compose/README.md | 16 ++++++++++++---- .../docker-compose.override.yml | 10 +++++++++- .../oai-nfapi-sim-compose/nat/busy-poll.sh | 7 ++++--- .../deployments/oai-nfapi-sim-compose/README.md | 16 ++++++++++++---- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/docs/deployments/oai-nfapi-sim-compose/README.md b/docs/deployments/oai-nfapi-sim-compose/README.md index fb526dbf..0fb9d260 100644 --- a/docs/deployments/oai-nfapi-sim-compose/README.md +++ b/docs/deployments/oai-nfapi-sim-compose/README.md @@ -1,5 +1,5 @@ # OpenAir Core + OpenAir RAN as a docker-compose -We will use 5G L2 nFAPI simulator to test L2 and above Layers. Let's pull Eurecom's deployment for 5G SA mode with 1 User: [OAI Full Stack 5G-NR L2 simulation with containers and a proxy](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/develop/ci-scripts/yaml_files/5g_l2sim_tdd) and replace the UPF with our eUPF. +We will use 5G L2 nFAPI simulator to test L2 and above Layers. Let's pull Eurecom's deployment for 5G SA mode with 1 User: [OAI Full Stack 5G-NR L2 simulation with containers and a proxy](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/f1d080d31515d3cc9a31a41fd548753ccba4f09f/ci-scripts/yaml_files/5g_l2sim_tdd) and replace the UPF with our eUPF. 📝This deploy uses `network_mode: "host"` for communications over `lo` interface of the host between containers oai-gnb, proxy, oai-nr-ue0. @@ -7,14 +7,22 @@ We will add two services `edgecom-upf` and `edgecom-nat` with a dedicated networ ## How to deploy: 1. Deploy the whole project "OAI Full Stack 5G-NR L2 simulation with containers and a proxy" - following instructions https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/ci-scripts/yaml_files/5g_l2sim_tdd/README.md + following instructions https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/f1d080d31515d3cc9a31a41fd548753ccba4f09f/ci-scripts/yaml_files/5g_l2sim_tdd/README.md + Use `git checkout f1d080d31515d3cc9a31a41fd548753ccba4f09f`
TLDR: Look at our example where host interface name is `ens3` with IP addr `188.120.232.247`

```ruby - sergo@edgecom:~/gitlab$ git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git - sergo@edgecom:~/gitlab$ cd openairinterface5g/ci-scripts/yaml_files/5g_l2sim_tdd/ + sergo@edgecom:~/gitlab$ git clone -n https://gitlab.eurecom.fr/oai/openairinterface5g.git + sergo@edgecom:~/gitlab$ cd openairinterface5g/ + sergo@edgecom:~/gitlab/openairinterface5g$ git checkout f1d080d31515d3cc9a31a41fd548753ccba4f09f + Note: switching to 'f1d080d31515d3cc9a31a41fd548753ccba4f09f'. + ... + HEAD is now at f1d080d315 chore(ci): updating 5G rfsimulator scenarios to release v2.0 + + + cd ci-scripts/yaml_files/5g_l2sim_tdd/ nano docker-compose.yaml - DEFAULT_DNS_IPV4_ADDRESS=169.254.25.10 #172.21.3.100 diff --git a/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml b/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml index f543ac76..8095d580 100644 --- a/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml +++ b/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml @@ -28,10 +28,14 @@ services: - USE_FQDN_DNS=no oai-gnb: + image: oaisoftwarealliance/oai-gnb:2023.w43 depends_on: !reset - edgecom-upf - oai-amf + oai-nr-ue0: + image: oaisoftwarealliance/oai-nr-ue:2023.w43 + edgecom-upf: container_name: eupf image: ghcr.io/edgecomllc/eupf:7086b71cb1dbc254db84c30e14fa4a68d3beb132 @@ -106,7 +110,7 @@ services: ports: - "8081:80" environment: - - API_PORT=8080 + - API_PORT=8880 networks: privnet_n6: @@ -116,3 +120,7 @@ networks: - subnet: 10.100.250.0/24 driver_opts: com.docker.network.bridge.name: br-oainfapi-n6 + +volumes: + prom_data: + \ No newline at end of file diff --git a/docs/deployments/oai-nfapi-sim-compose/nat/busy-poll.sh b/docs/deployments/oai-nfapi-sim-compose/nat/busy-poll.sh index 6e31dfd3..4abe075a 100644 --- a/docs/deployments/oai-nfapi-sim-compose/nat/busy-poll.sh +++ b/docs/deployments/oai-nfapi-sim-compose/nat/busy-poll.sh @@ -1,5 +1,5 @@ -#!/bin/bash - +#!/bin/sh +set -x terminate=0 #_term() { # echo "Caught SIGTERM signal!" @@ -19,8 +19,9 @@ iptables -A FORWARD -j ACCEPT #ip route add 10.60.0.0/16 via `nslookup upf.free5gc.org | awk '/^Address: / { print $2 }'` dev eth0 ip route add 10.60.0.0/16 via `nslookup upfn6.free5gc.org | awk '/^Address: / { print $2 }'` ip route add 12.1.1.0/24 via `nslookup upfn6.free5gc.org | awk '/^Address: / { print $2 }'` +ip route show - +set +x while [ $terminate -ne 1 ] do sleep 10; diff --git a/docs/docs-ru_ru/deployments/oai-nfapi-sim-compose/README.md b/docs/docs-ru_ru/deployments/oai-nfapi-sim-compose/README.md index ab6a18cd..82d27e0b 100644 --- a/docs/docs-ru_ru/deployments/oai-nfapi-sim-compose/README.md +++ b/docs/docs-ru_ru/deployments/oai-nfapi-sim-compose/README.md @@ -1,6 +1,6 @@ # OpenAir Core + OpenAir RAN as a docker-compose -В данной инструкции используется 5G L2 nFAPI симулятор из проекта OpenAirInterface для эмуляции радиосети и eUPF модуль в качестве замены штатного модуля UPF. Развертывание основано на инструкции Eurecom для 5G SA режиме с 1 абонентом: [OAI Full Stack 5G-NR L2 simulation with containers and a proxy](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/develop/ci-scripts/yaml_files/5g_l2sim_tdd), в которой штатный UPF заменен на eUPF. +В данной инструкции используется 5G L2 nFAPI симулятор из проекта OpenAirInterface для эмуляции радиосети и eUPF модуль в качестве замены штатного модуля UPF. Развертывание основано на инструкции Eurecom для 5G SA режиме с 1 абонентом: [OAI Full Stack 5G-NR L2 simulation with containers and a proxy](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/f1d080d31515d3cc9a31a41fd548753ccba4f09f/ci-scripts/yaml_files/5g_l2sim_tdd), в которой штатный UPF заменен на eUPF. 📝В развертывании используется настройка `network_mode: "host"` для того, чтобы обеспечить взаимодействие через `lo` инерфейс хоста между контейнерами oai-gnb, proxy, oai-nr-ue0. @@ -8,14 +8,22 @@ ## Инструкция по развертыванию 1. Разверните ядро сети и эмулятор радиосети согласно инструкции "OAI Full Stack 5G-NR L2 simulation with containers and a proxy" - по ссылке https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/develop/ci-scripts/yaml_files/5g_l2sim_tdd/README.md + по ссылке https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/f1d080d31515d3cc9a31a41fd548753ccba4f09f/ci-scripts/yaml_files/5g_l2sim_tdd/README.md + Переключитесь на `git checkout f1d080d31515d3cc9a31a41fd548753ccba4f09f`

TLDR: Пример команд для хоста с сетевым интерфейсом `ens3` и IP-адресом `188.120.232.247`

```ruby - sergo@edgecom:~/gitlab$ git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git - sergo@edgecom:~/gitlab$ cd openairinterface5g/ci-scripts/yaml_files/5g_l2sim_tdd/ + sergo@edgecom:~/gitlab$ git clone -n https://gitlab.eurecom.fr/oai/openairinterface5g.git + sergo@edgecom:~/gitlab$ cd openairinterface5g/ + sergo@edgecom:~/gitlab/openairinterface5g$ git checkout f1d080d31515d3cc9a31a41fd548753ccba4f09f + Note: switching to 'f1d080d31515d3cc9a31a41fd548753ccba4f09f'. + ... + HEAD is now at f1d080d315 chore(ci): updating 5G rfsimulator scenarios to release v2.0 + + + cd ci-scripts/yaml_files/5g_l2sim_tdd/ nano docker-compose.yaml - DEFAULT_DNS_IPV4_ADDRESS=169.254.25.10 #172.21.3.100 From b0a0c7211e1c7179978e7881adabd1b3ba6a52ab Mon Sep 17 00:00:00 2001 From: PapaySail <125686203+PapaySail@users.noreply.github.com> Date: Sat, 1 Jun 2024 00:39:44 +0600 Subject: [PATCH 2/3] srsran-gnb: changed image tag to eupf:main doc: corrected command to exec shell in UE pod --- docs/deployments/srsran-gnb/README.md | 2 +- docs/deployments/srsran-gnb/values/eupf.yaml | 2 +- docs/docs-ru_ru/deployments/srsran-gnb/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployments/srsran-gnb/README.md b/docs/deployments/srsran-gnb/README.md index cb84823a..6368f933 100644 --- a/docs/deployments/srsran-gnb/README.md +++ b/docs/deployments/srsran-gnb/README.md @@ -46,7 +46,7 @@ This deployment helps to create an end-to-end fully open-source 5G network, cons 1. exec shell in UE pod - `kubectl -n srs-open5gs exec -ti statefulset/srsran-srs-5g -- /bin/bash` + `kubectl -n srs-open5gs exec -ti statefulset/srsran-srsran5gue-zmq-gnb -- /bin/bash` 2. run ICMP test diff --git a/docs/deployments/srsran-gnb/values/eupf.yaml b/docs/deployments/srsran-gnb/values/eupf.yaml index 6d90c408..42d89a93 100644 --- a/docs/deployments/srsran-gnb/values/eupf.yaml +++ b/docs/deployments/srsran-gnb/values/eupf.yaml @@ -11,7 +11,7 @@ image: registry: ghcr.io repository: edgecomllc name: eupf - tag: 893648fecb05faf4b92656647f26922b34148a6c + tag: main pullPolicy: Always args: diff --git a/docs/docs-ru_ru/deployments/srsran-gnb/README.md b/docs/docs-ru_ru/deployments/srsran-gnb/README.md index 3d0225fa..d6f21915 100644 --- a/docs/docs-ru_ru/deployments/srsran-gnb/README.md +++ b/docs/docs-ru_ru/deployments/srsran-gnb/README.md @@ -46,7 +46,7 @@ 1. запустите оболочку shell в поде UE1 - `kubectl -n open5gs exec -ti statefulset/srsran-srs-5g -- /bin/bash` + `kubectl -n srs-open5gs exec -ti statefulset/srsran-srsran5gue-zmq-gnb -- /bin/bash` 2. проверьте доступность сети с помошью команды ping From 11360bd0d26eba34a4b449c225bbb2cb3634fb84 Mon Sep 17 00:00:00 2001 From: pirog-spb Date: Sat, 8 Jun 2024 22:25:02 +0000 Subject: [PATCH 3/3] use tags instead of revision --- docs/deployments/oai-nfapi-sim-compose/README.md | 10 +++++----- .../oai-nfapi-sim-compose/docker-compose.override.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/deployments/oai-nfapi-sim-compose/README.md b/docs/deployments/oai-nfapi-sim-compose/README.md index 0fb9d260..9e0c7d95 100644 --- a/docs/deployments/oai-nfapi-sim-compose/README.md +++ b/docs/deployments/oai-nfapi-sim-compose/README.md @@ -1,5 +1,5 @@ # OpenAir Core + OpenAir RAN as a docker-compose -We will use 5G L2 nFAPI simulator to test L2 and above Layers. Let's pull Eurecom's deployment for 5G SA mode with 1 User: [OAI Full Stack 5G-NR L2 simulation with containers and a proxy](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/f1d080d31515d3cc9a31a41fd548753ccba4f09f/ci-scripts/yaml_files/5g_l2sim_tdd) and replace the UPF with our eUPF. +We will use 5G L2 nFAPI simulator to test L2 and above Layers. Let's pull Eurecom's deployment for 5G SA mode with 1 User: [OAI Full Stack 5G-NR L2 simulation with containers and a proxy](https://gitlab.eurecom.fr/oai/openairinterface5g/-/tree/v2.1.0/ci-scripts/yaml_files/5g_l2sim_tdd) and replace the UPF with our eUPF. 📝This deploy uses `network_mode: "host"` for communications over `lo` interface of the host between containers oai-gnb, proxy, oai-nr-ue0. @@ -7,8 +7,8 @@ We will add two services `edgecom-upf` and `edgecom-nat` with a dedicated networ ## How to deploy: 1. Deploy the whole project "OAI Full Stack 5G-NR L2 simulation with containers and a proxy" - following instructions https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/f1d080d31515d3cc9a31a41fd548753ccba4f09f/ci-scripts/yaml_files/5g_l2sim_tdd/README.md - Use `git checkout f1d080d31515d3cc9a31a41fd548753ccba4f09f` + following instructions https://gitlab.eurecom.fr/oai/openairinterface5g/-/blob/v2.1.0/ci-scripts/yaml_files/5g_l2sim_tdd/README.md + Use `git checkout v2.1.0`

TLDR: Look at our example where host interface name is `ens3` with IP addr `188.120.232.247`

@@ -16,8 +16,8 @@ We will add two services `edgecom-upf` and `edgecom-nat` with a dedicated networ ```ruby sergo@edgecom:~/gitlab$ git clone -n https://gitlab.eurecom.fr/oai/openairinterface5g.git sergo@edgecom:~/gitlab$ cd openairinterface5g/ - sergo@edgecom:~/gitlab/openairinterface5g$ git checkout f1d080d31515d3cc9a31a41fd548753ccba4f09f - Note: switching to 'f1d080d31515d3cc9a31a41fd548753ccba4f09f'. + sergo@edgecom:~/gitlab/openairinterface5g$ git checkout v2.1.0 + Note: switching to 'v2.1.0'. ... HEAD is now at f1d080d315 chore(ci): updating 5G rfsimulator scenarios to release v2.0 diff --git a/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml b/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml index 8095d580..307278d2 100644 --- a/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml +++ b/docs/deployments/oai-nfapi-sim-compose/docker-compose.override.yml @@ -22,23 +22,23 @@ services: oai-smf: - image: oaisoftwarealliance/oai-smf:v1.5.1 + image: oaisoftwarealliance/oai-smf:v2.1.0 environment: - DISCOVER_UPF=no - USE_FQDN_DNS=no oai-gnb: - image: oaisoftwarealliance/oai-gnb:2023.w43 + image: oaisoftwarealliance/oai-gnb:v2.1.0 depends_on: !reset - edgecom-upf - oai-amf oai-nr-ue0: - image: oaisoftwarealliance/oai-nr-ue:2023.w43 + image: oaisoftwarealliance/oai-nr-ue:v2.1.0 edgecom-upf: container_name: eupf - image: ghcr.io/edgecomllc/eupf:7086b71cb1dbc254db84c30e14fa4a68d3beb132 + image: ghcr.io/edgecomllc/eupf:v0.6.4 privileged: true command: --iface eth0 --iface eth1 --n3addr 192.168.71.134 --nodeid 192.168.71.134 --paddr 192.168.71.134:8805 --attach generic --loglvl trace --feature_ftup true --teid_pool 65535 volumes: