Robert Schmidt
0eb33e69c7
Add Ethernet PDU session support and make PDU session request configurable
This MR adds support for Ethernet PDU sessions, and makes PDU sessions
configurable: per-PDU session ID, type (IPv4/IPv4v6/IPv6/Ethernet [1]),
DNN, NSSAI.
Concretely, it adds a new configuration file section pdu_sessions below
uicc0 that looks like this if everything is specified (default values
are shown):
uicc0:
[...]
pdu_sessions:
- id: 1
type: "IPv4"
nssai_sst: 1
nssai_sd: 0xffffff
dnn: "oai"
It is possible to list multiple PDU sessions (add new line - id: 2 to
request a second PDU session). It is backwards-compatible to the current
PDU session configuration (uicc0.dnn/nssai_sst/etc), the idea being that
either legacy or new configuration could be used, but (1) if
pdu_sessions exist, it will overwrite the legacy configuration, and (2)
multiple PDU sessions, and type, can only be configured using the new
config. The old parameters --extra-pdu-id and --default-pdu-id are not
accepted anymore. Documentation has been added to the UE tutorial.
It is possible to test an Ethernet PDU session [1]. It is possible to
test the PDU session inside the UE by verifying it has an TAP interface
oaitap_ue1, and ARPing the data network (arping has been added to
oai-nr-ue container for that purpose):
ip addr add 192.168.72.140/26 dev oaitap_ue1 # same subnet as data network!
ip link set dev oaitap_ue1 up
arping -c 20 -I oaitap_ue1 192.168.72.135 # will send ARP request in Ethernet frame to get IP address of data network
[1] See description MR !3769 for more information. On the UE side, only
the type has to be changed to "Ethernet".
189 lines
6.3 KiB
YAML
189 lines
6.3 KiB
YAML
services:
|
|
mysql:
|
|
container_name: "rfsim5g-mysql"
|
|
image: mysql:8.0
|
|
init: true
|
|
volumes:
|
|
- ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
|
|
- ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
|
|
environment:
|
|
- TZ=Europe/Paris
|
|
- MYSQL_DATABASE=oai_db
|
|
- MYSQL_USER=test
|
|
- MYSQL_PASSWORD=test
|
|
- MYSQL_ROOT_PASSWORD=linux
|
|
healthcheck:
|
|
test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
|
|
start_period: 10s
|
|
start_interval: 500ms
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 30
|
|
networks:
|
|
public_net:
|
|
ipv4_address: 192.168.71.131
|
|
oai-amf:
|
|
container_name: "rfsim5g-oai-amf"
|
|
image: oaisoftwarealliance/oai-amf:v2.1.10
|
|
environment:
|
|
- TZ=Europe/paris
|
|
volumes:
|
|
- ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
|
|
depends_on:
|
|
- mysql
|
|
networks:
|
|
public_net:
|
|
ipv4_address: 192.168.71.132
|
|
oai-smf:
|
|
container_name: "rfsim5g-oai-smf"
|
|
image: oaisoftwarealliance/oai-smf:v2.1.10
|
|
environment:
|
|
- TZ=Europe/Paris
|
|
volumes:
|
|
- ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
|
|
depends_on:
|
|
- oai-amf
|
|
networks:
|
|
public_net:
|
|
ipv4_address: 192.168.71.133
|
|
oai-upf:
|
|
container_name: "rfsim5g-oai-upf"
|
|
image: oaisoftwarealliance/oai-upf:v2.1.10
|
|
init: true
|
|
environment:
|
|
- TZ=Europe/Paris
|
|
volumes:
|
|
- ../5g_rfsimulator/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
|
|
depends_on:
|
|
- oai-smf
|
|
cap_add:
|
|
- NET_ADMIN
|
|
- SYS_ADMIN
|
|
cap_drop:
|
|
- ALL
|
|
privileged: true
|
|
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
|
|
image: oaisoftwarealliance/trf-gen-cn5g:focal
|
|
init: true
|
|
entrypoint: /bin/bash -c \
|
|
"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-upf
|
|
networks:
|
|
traffic_net:
|
|
ipv4_address: 192.168.72.135
|
|
healthcheck:
|
|
test: /bin/bash -c "ping -c 2 192.168.72.134"
|
|
start_period: 10s
|
|
start_interval: 500ms
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
|
|
oai-vnf:
|
|
image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
|
|
container_name: rfsim5g-oai-vnf
|
|
cap_drop:
|
|
- ALL
|
|
environment:
|
|
USE_ADDITIONAL_OPTIONS: --nfapi VNF --log_config.global_log_options level,nocolor,time
|
|
--telnetsrv --telnetsrv.listenaddr 192.168.71.140 --telnetsrv.shrmod ci
|
|
NFAPI_TRACE_LEVEL: info
|
|
ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
|
|
depends_on:
|
|
- oai-ext-dn
|
|
networks:
|
|
public_net:
|
|
ipv4_address: 192.168.71.140
|
|
volumes:
|
|
- ../../conf_files/gnb-vnf.sa.band66.u0.25prb.nfapi.conf:/opt/oai-gnb/etc/gnb.conf
|
|
healthcheck:
|
|
test: /bin/bash -c "pgrep nr-softmodem"
|
|
start_period: 10s
|
|
start_interval: 500ms
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
|
|
oai-pnf:
|
|
image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb}:${TAG:-develop}
|
|
container_name: rfsim5g-oai-pnf
|
|
cap_drop:
|
|
- ALL
|
|
environment:
|
|
USE_ADDITIONAL_OPTIONS: --nfapi PNF --rfsim --log_config.global_log_options level,nocolor,time
|
|
NFAPI_TRACE_LEVEL: info
|
|
ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
|
|
depends_on:
|
|
- oai-vnf
|
|
networks:
|
|
public_net:
|
|
ipv4_address: 192.168.71.141
|
|
volumes:
|
|
- ../../conf_files/gnb-pnf.band66.rfsim.conf:/opt/oai-gnb/etc/gnb.conf
|
|
healthcheck:
|
|
test: /bin/bash -c "pgrep nr-softmodem"
|
|
start_period: 10s
|
|
start_interval: 500ms
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
|
|
oai-nr-ue:
|
|
image: ${REGISTRY-oaisoftwarealliance/}${NRUE_IMG:-oai-nr-ue}:${TAG:-develop}
|
|
container_name: rfsim5g-oai-nr-ue
|
|
cap_drop:
|
|
- ALL
|
|
cap_add:
|
|
- NET_ADMIN # for interface bringup
|
|
- NET_RAW # for ping
|
|
environment:
|
|
USE_ADDITIONAL_OPTIONS: --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48
|
|
--rfsimulator.[0].serveraddr 192.168.71.141 --log_config.global_log_options level,nocolor,time
|
|
--telnetsrv --telnetsrv.shrmod ciUE --telnetsrv.listenaddr 192.168.71.150 --telnetsrv.listenport 8091
|
|
ASAN_OPTIONS: detect_leaks=0:detect_odr_violation=0
|
|
depends_on:
|
|
- oai-pnf
|
|
networks:
|
|
public_net:
|
|
ipv4_address: 192.168.71.150
|
|
devices:
|
|
- /dev/net/tun:/dev/net/tun
|
|
volumes:
|
|
- ../../conf_files/nrue.uicc.2pdu.conf:/opt/oai-nr-ue/etc/nr-ue.conf
|
|
healthcheck:
|
|
test: /bin/bash -c "pgrep nr-uesoftmodem"
|
|
start_period: 10s
|
|
start_interval: 500ms
|
|
interval: 10s
|
|
timeout: 5s
|
|
retries: 5
|
|
|
|
networks:
|
|
public_net:
|
|
driver: bridge
|
|
name: rfsim5g-oai-public-net
|
|
ipam:
|
|
config:
|
|
- 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"
|