February 2023 - gerrit-log - lists.osmocom.org

[L] Change in docker-playground[master]: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31506 ) Change subject: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files ...................................................................... ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Related: I27adbab6a6b95ddf4c6d39803e4f7dd079f11a4c Related: OS#5913 --- M ttcn3-ggsn-test/ogs/open5gs-smf.yaml M ttcn3-ggsn-test/ogs/open5gs-upf.yaml 2 files changed, 494 insertions(+), 124 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Verified diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml index 38579be..045c585 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml @@ -1,92 +1,282 @@ # -# logger: -# # o Set OGS_LOG_INFO to all domain level # - If `level` is omitted, the default level is OGS_LOG_INFO) # - If `domain` is omitted, the all domain level is set from 'level' -# (Nothing is needed) +# (Default values are used, so no configuration is required) # # o Set OGS_LOG_ERROR to all domain level # - `level` can be set with none, fatal, error, warn, info, debug, trace +# logger: # level: error # # o Set OGS_LOG_DEBUG to mme/emm domain level +# logger: # level: debug # domain: mme,emm # # o Set OGS_LOG_TRACE to all domain level +# logger: # level: trace -# domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock +# domain: core,sbi,ausf,event,tlv,mem,sock # logger: level: info # -# smf: +# o TLS enable/disable +# sbi: +# server|client: +# no_tls: false|true +# - false: (Default) Use TLS +# - true: TLS disabled +# +# o Verification enable/disable +# sbi: +# server|client: +# no_verify: false|true +# - false: (Default) Verify the PEER +# - true: Skip the verification step +# +# o Server-side does not use TLS +# sbi: +# server: +# no_tls: true +# +# o Client-side skips the verification step +# sbi: +# client: +# no_verify: true +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# +# o Use the specified certificate while verifying the client +# sbi: +# server +# cacert: /etc/open5gs/tls/ca.crt +# +# o Use the specified certificate while verifying the server +# sbi: +# client +# cacert: /etc/open5gs/tls/ca.crt +# +sbi: + server: + no_tls: true + cacert: /etc/open5gs/tls/ca.crt + key: /etc/open5gs/tls/smf.key + cert: /etc/open5gs/tls/smf.crt + client: + no_tls: true + cacert: /etc/open5gs/tls/ca.crt + key: /etc/open5gs/tls/smf.key + cert: /etc/open5gs/tls/smf.crt + # # <SBI Server> # # o SBI Server(http://<all address available>:80) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # -# o SBI Server(http://<any address>:80) +# o SBI Server(http://<any address>:7777) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - addr: # - 0.0.0.0 # - ::0 # port: 7777 # -# o SBI Server(https://<all address avaiable>:443) +# o SBI Server(https://<all address available>:443) +# sbi: +# server: +# key: /etc/open5gs/tls/smf.key +# cert: /etc/open5gs/tls/smf.crt +# smf: # sbi: -# - tls: -# key: smf.key -# pem: smf.pem # -# o SBI Server(https://127.0.0.4:443, http://[::1]:80) +# o SBI Server(https://127.0.0.4:443, https://[::1]:443) without verification +# sbi: +# server: +# no_verify: true +# key: /etc/open5gs/tls/smf.key +# cert: /etc/open5gs/tls/smf.crt +# smf: # sbi: # - addr: 127.0.0.4 -# tls: -# key: smf.key -# pem: smf.pem # - addr: ::1 # -# o SBI Server(http://smf.open5gs.org:80) +# o SBI Server(https://smf.open5gs.org:443) +# Use the specified certificate while verifying the client +# +# sbi: +# server: +# cacert: /etc/open5gs/tls/ca.crt +# key: /etc/open5gs/tls/smf.key +# cert: /etc/open5gs/tls/smf.crt +# smf: # sbi: # - name: smf.open5gs.org # # o SBI Server(http://127.0.0.4:7777) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - addr: 127.0.0.4 # port: 7777 # # o SBI Server(http://<eth0 IP address>:80) +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - dev: eth0 # # o Provide custom SBI address to be advertised to NRF +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - dev: eth0 # advertise: open5gs-smf.svc.local # +# o Another example of advertising on NRF +# sbi: +# server: +# no_tls: true +# smf: # sbi: # - addr: localhost # advertise: # - 127.0.0.99 # - ::1 # +# o SBI Option (Default) +# - tcp_nodelay : true +# - so_linger.l_onoff : false +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# addr: 127.0.0.4 +# option: +# tcp_nodelay: false +# so_linger: +# l_onoff: true +# l_linger: 10 +# +# +# <NF Service> +# +# o NF Service Name(Default : all NF services available) +# smf: +# service_name: +# +# o NF Service Name(Only some NF services are available) +# smf: +# service_name: +# - nsmf-pdusession +# +# <NF Discovery Query Parameter> +# +# o (Default) If you do not set Query Parameter as shown below, +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# +# - 'service-names' is included. +# +# o Service-Names are not included +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# discovery: +# option: +# no_service_names: false +# +# o To remove 'service-names' from URI query parameters in NS Discovery +# no_service_names: true +# +# * For Indirect Communication with Delegated Discovery, +# 'service-names' is always included in the URI query parameter. +# * That is, 'no_service_names' has no effect. +# +# <For Indirect Communication with Delegated Discovery> +# +# o (Default) If you do not set Delegated Discovery as shown below, +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# +# - Use SCP if SCP available. Otherwise NRF is used. +# => App fails if both NRF and SCP are unavailable. +# +# sbi: +# server: +# no_tls: true +# smf: +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# discovery: +# delegated: auto +# +# o To use SCP always => App fails if no SCP available. +# delegated: yes +# +# o Don't use SCP server => App fails if no NRF available. +# delegated: no +# # <PFCP Server> # # o PFCP Server(127.0.0.4:8805, ::1:8805) +# smf: # pfcp: # - addr: 127.0.0.4 # - addr: ::1 # # o PFCP-U Server(127.0.0.1:2152, [::1]:2152) +# smf: # pfcp: # name: localhost # +# o PFCP Option (Default) +# - so_bindtodevice : NULL +# +# smf: +# pfcp: +# addr: 127.0.0.4 +# option: +# so_bindtodevice: vrf-blue +# # <GTP-C Server> # # o GTP-C Server(127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123) +# smf: # gtpc: # addr: # - 127.0.0.4 @@ -94,35 +284,59 @@ # # o On SMF, Same configuration # (127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123). +# smf: # gtpc: # - addr: 127.0.0.4 # - addr: fd69:f21d:873c:fa::3 # +# o GTP-C Option (Default) +# - so_bindtodevice : NULL +# +# smf: +# gtpc: +# addr: 127.0.0.4 +# option: +# so_bindtodevice: vrf-blue +# # <GTP-U Server>> # # o GTP-U Server(127.0.0.4:2152, [::1]:2152) +# smf: # gtpu: # - addr: 127.0.0.4 # - addr: ::1 # # o GTP-U Server(127.0.0.1:2152, [::1]:2152) +# smf: # gtpu: # name: localhost # +# o GTP-U Option (Default) +# - so_bindtodevice : NULL +# +# smf: +# gtpu: +# addr: 127.0.0.4 +# option: +# so_bindtodevice: vrf-blue +# # <Metrics Server> # # o Metrics Server(http://<any address>:9090) +# smf: # metrics: -# addr: 0.0.0.0 -# port: 9090 +# - addr: 0.0.0.0 +# port: 9090 # # <Subnet for UE Pool> # # o IPv4 Pool +# smf: # subnet: # addr: 10.45.0.1/16 # # o IPv4/IPv6 Pool +# smf: # subnet: # - addr: 10.45.0.1/16 # - addr: 2001:db8:cafe::1/48 @@ -131,6 +345,7 @@ # o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 # ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. # +# smf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -144,6 +359,7 @@ # o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16) # ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash. # +# smf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -152,22 +368,26 @@ # - addr: 10.50.0.1/16 ## FALLBACK SUBNET # # o Pool Range Sample +# smf: # subnet: # - addr: 10.45.0.1/24 # range: 10.45.0.100-10.45.0.200 # +# smf: # subnet: # - addr: 10.45.0.1/24 # range: # - 10.45.0.5-10.45.0.50 # - 10.45.0.100- # +# smf: # subnet: # - addr: 10.45.0.1/24 # range: # - -10.45.0.200 # - 10.45.0.210-10.45.0.220 # +# smf: # subnet: # - addr: 10.45.0.1/16 # range: @@ -182,6 +402,7 @@ # # o Primary/Secondary can be configured. Others are ignored. # +# smf: # dns: # - 8.8.8.8 # - 8.8.4.4 @@ -200,10 +421,25 @@ # # o Proxy Call Session Control Function # +# smf: # p-cscf: # - 127.0.0.1 # - ::1 # +# <CTF> +# +# o Gy interface parameters towards OCS. +# o enabled: +# o auto: Default. Use Gy only if OCS available among Diameter peers +# o yes: Use Gy always; +# reject subscribers if no OCS available among Diameter peers +# o no: Don't use Gy interface if there is an OCS available +# +# smf: +# ctf: +# enabled: auto|yes|no +# +# # <SMF Selection - 5G Core only> # 1. SMF sends SmfInfo(S-NSSAI, DNN, TAI) to the NRF # 2. NRF responds to AMF with SmfInfo during NF-Discovery. @@ -212,6 +448,7 @@ # Note that if there is no SmfInfo, any AMF can select this SMF. # # o S-NSSAI[SST:1] and DNN[internet] - At least 1 DNN is required in S-NSSAI +# smf: # info: # - s_nssai: # - sst: 1 @@ -219,6 +456,7 @@ # - internet # # o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] +# smf: # info: # - s_nssai: # - sst: 1 @@ -227,7 +465,8 @@ # - internet # - ims # -# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1] +# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] +# smf: # info: # - s_nssai: # - sst: 1 @@ -235,15 +474,16 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: 1 # # o If any of conditions below are met: -# - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1-9] +# - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1-9] # - S-NSSAI[SST:2 SD:000080] and DNN[internet or ims] -# - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:90170 TAC:10-20,30-40] +# - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:99970 TAC:10-20,30-40] # +# smf: # info: # - s_nssai: # - sst: 1 @@ -251,7 +491,7 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 1-9 @@ -267,13 +507,14 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 10-20 # - 30-40 # # o Complex Example +# smf: # info: # - s_nssai: # - sst: 1 @@ -297,27 +538,27 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: [1, 2, 3] # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: 4 # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: # - 5 # - 6 # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 100-200 # - 300-400 # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # range: # - 500-600 @@ -329,11 +570,25 @@ # - internet # tai: # - plmn_id: -# mcc: 901 +# mcc: 999 # mnc: 70 # tac: 99 # - +# <Security Indication - 5G Core only> +# +# According to 3GPP TS38.413 Section 9.3.1.27, +# Security Indication IE may be instructed to 5G gNB. +# +# If you set the security_indication in smf.yaml, +# this information is delivered using PDU Session Resource Request Transfer IE +# +# smf: +# security_indication: +# integrity_protection_indication: required|preferred|not-needed +# confidentiality_protection_indication: required|preferred|not-needed +# maximum_integrity_protected_data_rate_uplink: bitrate64kbs|maximum-UE-rate +# maximum_integrity_protected_data_rate_downlink: bitrate64kbs|maximum-UE-rate +# smf: sbi: - addr: 172.18.3.201 @@ -372,21 +627,107 @@ freeDiameter: /data/freediameter.conf # -# nrf: +# <SBI Client>> +# +# o SBI Client(http://127.0.1.10:7777) +# sbi: +# client: +# no_tls: true +# scp: +# sbi: +# addr: 127.0.1.10 +# port: 7777 +# +# o SBI Client(https://127.0.1.10:443, https://[::1]:443) without verification +# sbi: +# client: +# no_verify: true +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# scp: +# sbi: +# - addr: 127.0.1.10 +# - addr: ::1 +# +# o SBI Client(https://scp.open5gs.org:443) +# Use the specified certificate while verifying the server +# +# sbi: +# client: +# cacert: /etc/open5gs/tls/ca.crt +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# scp: +# sbi: +# - name: scp.open5gs.org +# +# o SBI Client(http://[fd69:f21d:873c:fb::1]:80) +# If prefer_ipv4 is true, http://127.0.1.10:80 is selected. +# +# sbi: +# client: +# no_tls: true +# scp: +# sbi: +# addr: +# - 127.0.1.10 +# - fd69:f21d:873c:fb::1 +# +# o SBI Option (Default) +# - tcp_nodelay : true +# - so_linger.l_onoff : false +# +# sbi: +# client: +# no_tls: true +# scp: +# sbi: +# addr: 127.0.1.10 +# option: +# tcp_nodelay: false +# so_linger: +# l_onoff: true +# l_linger: 10 +# +# +scp: + sbi: + - addr: 127.0.1.10 + port: 7777 + # # <SBI Client>> # -# o SBI Client(http://127.0.0.1:7777) +# o SBI Client(http://127.0.0.10:7777) +# sbi: +# client: +# no_tls: true +# nrf: # sbi: # addr: 127.0.0.10 # port: 7777 # -# o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80) +# o SBI Client(https://127.0.0.10:443, https://[::1]:443) without verification +# sbi: +# client: +# no_verify: true +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# nrf: # sbi: # - addr: 127.0.0.10 -# tls: -# key: nrf.key -# pem: nrf.pem +# - addr: ::1 +# +# o SBI Client(https://nrf.open5gs.org:443) +# Use the specified certificate while verifying the server +# +# sbi: +# client: +# cacert: /etc/open5gs/tls/ca.crt +# key: /etc/open5gs/tls/amf.key +# cert: /etc/open5gs/tls/amf.crt +# nrf: +# sbi: # - name: nrf.open5gs.org # # o SBI Client(http://[fd69:f21d:873c:fa::1]:80) @@ -397,6 +738,22 @@ # - 127.0.0.10 # - fd69:f21d:873c:fa::1 # +# o SBI Option (Default) +# - tcp_nodelay : true +# - so_linger.l_onoff : false +# +# sbi: +# client: +# no_tls: true +# nrf: +# sbi: +# addr: 127.0.0.10 +# option: +# tcp_nodelay: false +# so_linger: +# l_onoff: true +# l_linger: 10 +# nrf: sbi: - addr: @@ -404,12 +761,10 @@ port: 7777 # -# upf: -# # <PFCP Client>> # # o PFCP Client(127.0.0.7:8805) -# +# upf: # pfcp: # addr: 127.0.0.7 # @@ -460,76 +815,62 @@ - addr: 172.18.3.222 # -# parameter: -# -# o Number of output streams per SCTP associations. -# sctp_streams: 30 -# # o Disable use of IPv4 addresses (only IPv6) -# no_ipv4: true +# parameter: +# no_ipv4: true # # o Disable use of IPv6 addresses (only IPv4) -# no_ipv6: true +# parameter: +# no_ipv6: true # # o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# prefer_ipv4: true +# parameter: +# prefer_ipv4: true # # o Disable selection of UPF PFCP in Round-Robin manner -# no_pfcp_rr_select: true +# parameter: +# no_pfcp_rr_select: true +# +# o Legacy support for pre-release LTE 11 devices +# - Omits adding local address in packet filters for compatibility +# parameter: +# no_ipv4v6_local_addr_in_packet_filter: true # parameter: # +# o Maximum Number of UE # max: +# ue: 1024 # -# o Maximum Number of UE per AMF/MME -# ue: 1024 -# o Maximum Number of gNB/eNB per AMF/MME -# gnb: 64 +# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) +# max: +# peer: 64 +# +# o Maximum Number of GTP peer nodes per SGWC/SMF +# max: +# gtp_peer: 64 # max: # -# pool: -# -# o The default memory pool size was set assuming 1024 UEs. -# To connect more UEs, you need to increase the size further. -# -# - Pool-size 128 => 65536 Number -# - Pool-size 256 => 16384 Number -# - Pool-size 512 => 4096 Number -# - Pool-size 1024 => 1024 Number -# - Pool-size 2048 => 512 Number -# - Pool-size 8192 => 128 Number -# - Pool-size 1024*1024 => 8 Number -# -# 128: 65536 -# 256: 16384 -# 512: 4096 -# 1024: 1024 -# 2048: 512 -# 8192: 128 -# big: 8 -# -pool: - -# -# time: -# # o NF Instance Heartbeat (Default : 0) # NFs will not send heart-beat timer in NFProfile # NRF will send heart-beat timer in NFProfile +# (Default values are used, so no configuration is required) # # o NF Instance Heartbeat (20 seconds) # NFs will send heart-beat timer (20 seconds) in NFProfile # NRF can change heart-beat timer in NFProfile -# +# time: # nf_instance: # heartbeat: 20 # # o Message Wait Duration (Default : 10,000 ms = 10 seconds) +# (Default values are used, so no configuration is required) # # o Message Wait Duration (3000 ms) +# time: # message: # duration: 3000 # @@ -537,8 +878,10 @@ # Time to wait for SMF to send # PFCP Session Modification Request(Remove Indirect Tunnel) to the UPF # after sending Nsmf_PDUSession_UpdateSMContext Response(hoState:COMPLETED) +# (Default values are used, so no configuration is required) # # o Handover Wait Duration (500ms) +# time: # handover: # duration: 500 time: diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml index 96368b7..c82a80c 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml @@ -1,52 +1,65 @@ # -# logger: -# # o Set OGS_LOG_INFO to all domain level # - If `level` is omitted, the default level is OGS_LOG_INFO) # - If `domain` is omitted, the all domain level is set from 'level' -# (Nothing is needed) +# (Default values are used, so no configuration is required) # # o Set OGS_LOG_ERROR to all domain level # - `level` can be set with none, fatal, error, warn, info, debug, trace +# logger: # level: error # # o Set OGS_LOG_DEBUG to mme/emm domain level +# logger: # level: debug # domain: mme,emm # # o Set OGS_LOG_TRACE to all domain level +# logger: # level: trace -# domain: core,pfcp,gtp,upf,event,tlv,mem,sock +# domain: core,sbi,ausf,event,tlv,mem,sock # logger: level: info # -# upf: -# # <PFCP Server> # # o PFCP Server(127.0.0.7:8805, ::1:8805) +# upf: # pfcp: # - addr: 127.0.0.7 # - addr: ::1 # # o PFCP-U Server(127.0.0.1:2152, [::1]:2152) +# upf: # pfcp: # name: localhost # +# o PFCP Option (Default) +# - so_bindtodevice : NULL +# +# upf: +# pfcp: +# addr: 127.0.0.7 +# option: +# so_bindtodevice: vrf-blue +# # <GTP-U Server>> # # o GTP-U Server(127.0.0.7:2152, [::1]:2152) +# upf: # gtpu: # - addr: 127.0.0.7 # - addr: ::1 # # o GTP-U Server(127.0.0.1:2152, [::1]:2152) +# upf: # gtpu: # name: localhost # # o User Plane IP Resource information +# upf: # gtpu: # - addr: # - 127.0.0.7 @@ -62,24 +75,37 @@ # source_interface: 1 # # o Provide custom UPF GTP-U address to be advertised inside NGAP messages +# upf: # gtpu: # - addr: 10.4.128.21 # advertise: 172.24.15.30 # +# upf: # gtpu: # - addr: 10.4.128.21 # advertise: # - 127.0.0.1 # - ::1 # +# upf: # gtpu: # - addr: 10.4.128.21 # advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org # +# upf: # gtpu: # - dev: ens3 # advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org # +# o GTP-U Option (Default) +# - so_bindtodevice : NULL +# +# upf: +# gtpu: +# addr: 127.0.0.7 +# option: +# so_bindtodevice: vrf-blue +# # <Subnet for UE network> # # Note that you need to setup your UE network using TUN device. @@ -88,6 +114,7 @@ # o IPv4 Pool # $ sudo ip addr add 10.45.0.1/16 dev ogstun # +# upf: # subnet: # addr: 10.45.0.1/16 # @@ -95,6 +122,7 @@ # $ sudo ip addr add 10.45.0.1/16 dev ogstun # $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun # +# upf: # subnet: # - addr: 10.45.0.1/16 # - addr: 2001:db8:cafe::1/48 @@ -109,6 +137,7 @@ # # ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. # +# upf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -122,6 +151,7 @@ # o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16) # ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash. # +# upf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -135,6 +165,7 @@ # $ sudo ip addr add 10.46.0.1/16 dev ogstun3 # $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun3 # +# upf: # subnet: # - addr: 10.45.0.1/16 # dnn: internet @@ -148,6 +179,14 @@ # dnn: ims # dev: ogstun3 # +# <Metrics Server> +# +# o Metrics Server(http://<any address>:9090) +# upf: +# metrics: +# - addr: 0.0.0.0 +# port: 9090 +# upf: pfcp: - addr: 172.18.3.222 @@ -171,12 +210,10 @@ dev: ogstun46 # -# smf: -# # <PFCP Client>> # # o PFCP Client(127.0.0.4:8805) -# +# smf: # pfcp: # addr: 127.0.0.4 # @@ -185,62 +222,41 @@ - addr: 172.18.3.201 # -# parameter: -# # o Number of output streams per SCTP associations. -# sctp_streams: 30 +# parameter: +# sctp_streams: 30 # # o Disable use of IPv4 addresses (only IPv6) -# no_ipv4: true +# parameter: +# no_ipv4: true # # o Disable use of IPv6 addresses (only IPv4) -# no_ipv6: true +# parameter: +# no_ipv6: true # # o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# prefer_ipv4: true +# parameter: +# prefer_ipv4: true # parameter: # +# o Maximum Number of UE # max: +# ue: 1024 # -# o Maximum Number of UE per AMF/MME -# ue: 1024 -# o Maximum Number of gNB/eNB per AMF/MME -# gnb: 64 +# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) +# max: +# peer: 64 # max: # -# pool: -# -# o The default memory pool size was set assuming 1024 UEs. -# To connect more UEs, you need to increase the size further. -# -# - Pool-size 128 => 65536 Number -# - Pool-size 256 => 16384 Number -# - Pool-size 512 => 4096 Number -# - Pool-size 1024 => 1024 Number -# - Pool-size 2048 => 512 Number -# - Pool-size 8192 => 128 Number -# - Pool-size 1024*1024 => 8 Number -# -# 128: 65536 -# 256: 16384 -# 512: 4096 -# 1024: 1024 -# 2048: 512 -# 8192: 128 -# big: 8 -# -pool: - -# -# time: -# # o Message Wait Duration (Default : 10,000 ms = 10 seconds) +# (Default values are used, so no configuration is required) # # o Message Wait Duration (3000 ms) +# time: # message: # duration: 3000 time: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Gerrit-Change-Number: 31506 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[L] Change in docker-playground[master]: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files

by fixeria

Attention is currently required from: osmith, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31506 ) Change subject: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > i'm curious why the many changes to commented-out lines ... […] This is how the config files in open5gs evolved over the years. Similar to I27adbab6a6b95ddf4c6d39803e4f7dd079f11a4c, the idea here is to make our config files up to date with the upstream, so that it's easier to diff them. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Gerrit-Change-Number: 31506 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:43:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[XL] Change in libosmo-abis[master]: trau_pcu_ericsson: add testvectors for MCS1-MCS8

by laforge

Attention is currently required from: neels, fixeria, msuraev, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31454 ) Change subject: trau_pcu_ericsson: add testvectors for MCS1-MCS8 ...................................................................... Patch Set 3: (1 comment) File tests/trau_pcu_ericsson/trau_pcu_ericsson_test.c: https://gerrit.osmocom.org/c/libosmo-abis/+/31454/comment/888763a1_5a4faae8 PS2, Line 2087: printf(" ccu_data_ind.tav=%02x\n", frame.u.ccu_data_ind.tav); > Since I receive a lot of criticism regarding the code duplication I will clean this up in a follow u […] It's not about "optimization", but about code maintainability and readability. So if N times the same thing happens, it's easier to read and maintain if it's one fucntion, rather than somebody having to look at N copies and trying to identify if they really do all the same thing or differ in some subtle way. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31454 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7e7e35930a373c9db74faef24f6c404eb5516278 Gerrit-Change-Number: 31454 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:34:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in libosmocore[master]: utils: use built-in static_assert() if available

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31496 ) Change subject: utils: use built-in static_assert() if available ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31496 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5ca34bc14c05e8c38c721d7df33feb1c6c41c76e Gerrit-Change-Number: 31496 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:32:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[M] Change in libosmocore[master]: GSMTAP: allow configuring src IP for log messages

by fixeria

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31513 ) Change subject: GSMTAP: allow configuring src IP for log messages ...................................................................... Patch Set 2: Code-Review-1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/bd8f8c87_143ccbba PS2, Line 7: configuring src IP for log messages Can you explain how might this be useful on practice? File src/vty/logging_vty.c: https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/356b03ad_081eadb5 PS2, Line 180: logging source I am sorry, but to me it looks like a wrong direction. You're adding a general parameter, which only applies to GSMTAP target(s). The naming `logging source` is also quite unspecific: source what? IMO, it should be added as an optional parameter of the `log gsmtap` command: log gsmtap [HOSTNAME] [SRCADDR] It's also unlikely that unsetting the source address is useful. Why would you want to unset that? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9000269ce5b3dce1e757271b7c42e77b68d38f25 Gerrit-Change-Number: 31513 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:31:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gtp: use OSMO_ASSERT() in gtp_new()

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/31511 ) Change subject: gtp: use OSMO_ASSERT() in gtp_new() ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > Note that this needs to be backported to the last releases (it seems we usually do the last 2 releas […] I am afraid we won't be able to merge the libosmocore patch as-is, even if we backport this patch and tag a patch release. The general rule is that it should still be possible to compile old apps against new libosmocore. But we can make it configurable at compile-time (disabled by default) and use for development builds. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/31511 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ia8af1736b63d501661046fe70befe5bbabc1045a Gerrit-Change-Number: 31511 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:15:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-bsc[master]: pcu_sock: print OML alerts from PCU

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31499 ) Change subject: pcu_sock: print OML alerts from PCU ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/pcu_sock.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31499/comment/9bb52a52_1ea3f03d PS2, Line 691: LOGP > Use `LOG_BTS`? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31499 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id32553556356c2affe32e47ae1c3ae6a514efdce Gerrit-Change-Number: 31499 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:14:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[S] Change in osmo-bsc[master]: Work around coverity false positives in macros

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31118 ) Change subject: Work around coverity false positives in macros ...................................................................... Work around coverity false positives in macros We have some macros that may at times have signed arguments, and at other times unsigned. Checking for <= 0 is not a bug in this case. Let's typecast any unsigned arguments to signed int to work around. Change-Id: I10e60b20c6f8092cf1ce09ebe501e739fd4a9479 Closes: CID#272993, CID#272992 (and many others) --- M include/osmocom/bsc/gsm_data.h 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 44a9d5e..8c4dcce 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -495,9 +495,9 @@ * * These macros convert from n to the other representations: */ -#define ALG_A5_NR_TO_RSL(A5_N) ((A5_N) >= 0 ? (A5_N)+1 : 0) +#define ALG_A5_NR_TO_RSL(A5_N) ((int)(A5_N) >= 0 ? (A5_N)+1 : 0) #define ALG_A5_NR_TO_BSSAP(A5_N) ALG_A5_NR_TO_RSL(A5_N) -#define ALG_A5_NR_TO_PERM_ALG_BITS(A5_N) ((A5_N) >= 0 ? 1<<(A5_N) : 0) +#define ALG_A5_NR_TO_PERM_ALG_BITS(A5_N) ((int)(A5_N) >= 0 ? 1<<(A5_N) : 0) /* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 3*16. * The real maximum that fits in a total of 16 SI2quater rest octets also depends on the bits left by other SI2quater -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I10e60b20c6f8092cf1ce09ebe501e739fd4a9479 Gerrit-Change-Number: 31118 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

[S] Change in osmo-bsc[master]: Work around coverity false positives in macros

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31118 ) Change subject: Work around coverity false positives in macros ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I10e60b20c6f8092cf1ce09ebe501e739fd4a9479 Gerrit-Change-Number: 31118 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:12:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

[L] Change in docker-playground[master]: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files

by laforge

Attention is currently required from: osmith, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31506 ) Change subject: ttcn3-ggsn-test-ogs: update open5gs-{smf,upf} config files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic92d73e93b47abb4fae99fc9bece0c93bf9b91ef Gerrit-Change-Number: 31506 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 27 Feb 2023 10:11:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023