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

[L] Change in docker-playground[master]: open5gs configs: update to current format
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email ) Change subject: open5gs configs: update to current format ...................................................................... open5gs configs: update to current format Adjust open5gs configs to the new formats from: https://github.com/open5gs/open5gs/pull/2739 This fixes all open5gs programs from crashing on startup with various errors such as: 11/21 07:39:25.971: [core] FATAL: epoll_init: Assertion `context->epfd >= 0' failed. (../lib/core/ogs-epoll.c:77) Related: OS#6267 Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 --- M ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml M ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml M ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml M ttcn3-pgw-test/open5gs-nrf-master.yaml M ttcn3-pgw-test/open5gs-smf-master.yaml M ttcn3-pgw-test/open5gs-upf-master.yaml 7 files changed, 158 insertions(+), 116 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/05/35105/1 diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml index afb5cf2..4b5891e 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml @@ -3,6 +3,10 @@ logger: level: info +global: + max: + ue: 1024 + sbi: server: no_tls: true @@ -17,30 +21,43 @@ smf: sbi: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 port: 7777 + client: + nrf: + - uri: http://172.18.3.201:7777 + scp: + - uri: http://127.0.1.10:7777 pfcp: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 + client: + upf: + - address: 172.18.3.222 gtpc: - - addr: 172.18.3.201 - option: - so_bindtodevice: eth0 + server: + - address: 172.18.3.201 + option: + so_bindtodevice: eth0 gtpu: - - addr: 172.18.3.201 - port: 2152 - option: - so_bindtodevice: eth0 + server: + - address: 172.18.3.201 + port: 2152 + option: + so_bindtodevice: eth0 metrics: - addr: 172.18.3.201 - port: 9090 - subnet: - - addr: 176.16.16.1/20 + server: + - address: 172.18.3.201 + port: 9090 + session: + - subnet: 176.16.16.1/20 dnn: internet - - addr: 2001:780:44:2000:0:0:0:1/56 + - subnet: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 - - addr: 176.16.32.1/20 + - subnet: 176.16.32.1/20 dnn: inet46 - - addr: 2001:780:44:2100:0:0:0:1/56 + - subnet: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 dns: - 172.18.3.222 @@ -52,21 +69,6 @@ enabled: auto freeDiameter: /data/freediameter.conf -scp: - sbi: - - addr: 127.0.1.10 - port: 7777 - -nrf: - sbi: - - addr: - - 172.18.3.201 - port: 7777 - -upf: - pfcp: - - addr: 172.18.3.222 - parameter: max: diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml index 73e1bac..81afc6e 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml @@ -3,31 +3,37 @@ logger: level: info +global: + max: + ue: 1024 + upf: pfcp: - - addr: 172.18.3.222 + server: + - address: 172.18.3.222 gtpu: - - addr: 172.18.3.222 - port: 2152 - option: - so_bindtodevice: eth0 - subnet: - - addr: 176.16.16.1/20 + server: + - address: 172.18.3.222 + port: 2152 + option: + so_bindtodevice: eth0 + session: + - subnet: 176.16.16.1/20 dnn: internet dev: ogstun4 - - addr: 2001:780:44:2000:0:0:0:1/56 + - subnet: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 dev: ogstun6 - - addr: 176.16.32.1/20 + - subnet: 176.16.32.1/20 dnn: inet46 dev: ogstun46 - - addr: 2001:780:44:2100:0:0:0:1/56 + - subnet: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 dev: ogstun46 smf: pfcp: - - addr: 172.18.3.201 + - address: 172.18.3.201 parameter: diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml index 8d1f42e..df92b6f 100644 --- a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml +++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml @@ -5,6 +5,10 @@ logger: level: trace +global: + max: + ue: 1024 + hss: freeDiameter: /data/freediameter.conf diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml index 35b718d..520a0b5 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml @@ -3,26 +3,52 @@ logger: level: info +global: + max: + ue: 1024 + mme: freeDiameter: /data/freediameter.conf s1ap: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 gtpc: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 + client: + sgwc: + - address: 172.18.3.202 + smf: + - address: 172.18.3.201 + - address: ::1 + sgsn: + - address: + - 172.18.3.202 + port: 2124 + routes: + - rai: + lai: + plmn_id: + mcc: 262 + mnc: 42 + lac: 43690 + rac: 187 + ci: 1223 metrics: - - addr: 172.18.3.201 - port: 9090 + server: + - address: 172.18.3.201 + port: 9090 gummei: - plmn_id: - mcc: 001 - mnc: 01 - mme_gid: 2 - mme_code: 1 + - plmn_id: + mcc: 001 + mnc: 01 + mme_gid: 2 + mme_code: 1 tai: - plmn_id: - mcc: 001 - mnc: 01 - tac: 12345 + - plmn_id: + mcc: 001 + mnc: 01 + tac: 12345 security: integrity_order : [ EIA2, EIA1, EIA0 ] ciphering_order : [ EEA0, EEA1, EEA2 ] @@ -30,31 +56,6 @@ full: Open5GS mme_name: open5gs-mme0 -sgwc: - gtpc: - - addr: 172.18.3.202 - -smf: - gtpc: - - addr: - - 172.18.3.201 - - ::1 - -sgsn: - - gtpc: - addr: - - 172.18.3.202 - port: 2124 - routes: - - rai: - lai: - plmn_id: - mcc: 262 - mnc: 42 - lac: 43690 - rac: 187 - ci: 1223 - parameter: max: diff --git a/ttcn3-pgw-test/open5gs-nrf-master.yaml b/ttcn3-pgw-test/open5gs-nrf-master.yaml index b37ec0d..45c3340 100644 --- a/ttcn3-pgw-test/open5gs-nrf-master.yaml +++ b/ttcn3-pgw-test/open5gs-nrf-master.yaml @@ -5,6 +5,10 @@ logger: level: info +global: + max: + ue: 1024 + sbi: server: no_tls: true @@ -19,9 +23,9 @@ nrf: sbi: - addr: - - 172.18.18.10 - port: 7777 + server: + - address: 172.18.18.10 + port: 7777 scp: sbi: diff --git a/ttcn3-pgw-test/open5gs-smf-master.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml index 622618b..3448aba 100644 --- a/ttcn3-pgw-test/open5gs-smf-master.yaml +++ b/ttcn3-pgw-test/open5gs-smf-master.yaml @@ -3,6 +3,10 @@ logger: level: info +global: + max: + ue: 1024 + sbi: server: no_tls: true @@ -17,21 +21,34 @@ smf: sbi: - - addr: 172.18.18.4 - port: 7777 + server: + - address: 172.18.18.4 + port: 7777 + client: + nrf: + - uri: http://172.18.18.10:7777 + scp: + - uri: http://127.0.1.10:7777 pfcp: - - addr: 172.18.18.4 + server: + - address: 172.18.18.4 + client: + upf: + - address: 172.18.18.7 gtpc: - - addr: 172.18.18.4 + server: + - address: 172.18.18.4 gtpu: - - addr: 172.18.18.4 + server: + - address: 172.18.18.4 metrics: - addr: 172.18.18.4 - port: 9090 - subnet: - - addr: 10.45.0.1/16 + server: + - address: 172.18.18.4 + port: 9090 + session: + - subnet: 10.45.0.1/16 dnn: internet - - addr: cafe::1/64 + - subnet: cafe::1/64 dnn: internet dns: - 8.8.8.8 @@ -43,20 +60,6 @@ enabled: auto freeDiameter: /data/freeDiameter-smf.conf -scp: - sbi: - - addr: 127.0.1.10 - port: 7777 -nrf: - sbi: - - addr: - - 172.18.18.10 - port: 7777 - -upf: - pfcp: - - addr: 172.18.18.7 - parameter: max: diff --git a/ttcn3-pgw-test/open5gs-upf-master.yaml b/ttcn3-pgw-test/open5gs-upf-master.yaml index fec9fc7..9e9280a 100644 --- a/ttcn3-pgw-test/open5gs-upf-master.yaml +++ b/ttcn3-pgw-test/open5gs-upf-master.yaml @@ -3,23 +3,28 @@ logger: level: info +global: + max: + ue: 1024 + upf: pfcp: - - addr: 172.18.18.7 + server: + - address: 172.18.18.7 + client: + smf: + - address: 172.18.18.4 gtpu: - - addr: 172.18.18.7 - subnet: - - addr: 10.45.0.1/16 + server: + - address: 172.18.18.7 + session: + - subnet: 10.45.0.1/16 dnn: internet dev: ogstun46 - - addr: cafe::1/64 + - subnet: cafe::1/64 dnn: internet dev: ogstun46 -smf: - pfcp: - addr: 172.18.18.4 - parameter: max: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 Gerrit-Change-Number: 35105 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[XL] Change in docker-playground[master]: open5gs configs: remove comments
by osmith 23 Nov '23

23 Nov '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35103?usp=email ) Change subject: open5gs configs: remove comments ...................................................................... open5gs configs: remove comments A lot of these comments got outdated with recent config changes in the related PR. Instead of syncing the comments again and having a big diff, remove the comments once and then only have diffs of actual config changes in future patches. This will make it easier to maintain these configs. Related: https://github.com/open5gs/open5gs/pull/2739 Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd --- M ttcn3-ggsn-test/ogs/open5gs-smf.yaml M ttcn3-ggsn-test/ogs/open5gs-upf.yaml M ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml M ttcn3-pgw-test/open5gs-nrf.yaml M ttcn3-pgw-test/open5gs-smf.yaml M ttcn3-pgw-test/open5gs-upf.yaml 7 files changed, 32 insertions(+), 2,973 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/03/35103/1 diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml index 045c585..afb5cf2 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf.yaml @@ -1,63 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in + logger: level: info -# -# 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 @@ -70,525 +15,6 @@ 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>:7777) -# sbi: -# server: -# no_tls: true -# smf: -# sbi: -# - addr: -# - 0.0.0.0 -# - ::0 -# port: 7777 -# -# o SBI Server(https://<all address available>:443) -# sbi: -# server: -# key: /etc/open5gs/tls/smf.key -# cert: /etc/open5gs/tls/smf.crt -# smf: -# sbi: -# -# 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 -# - addr: ::1 -# -# 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 -# - fd69:f21d:873c:fa::3 -# -# 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 -# -# <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 -# -# -# 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - 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: -# - 10.45.0.100-10.45.0.200 -# - 10.45.1.100-10.45.1.200 -# - addr: 2001:db8:cafe::1/48 -# range: -# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0 -# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0 -# -# <Domain Name Server> -# -# o Primary/Secondary can be configured. Others are ignored. -# -# smf: -# dns: -# - 8.8.8.8 -# - 8.8.4.4 -# - 2001:4860:4860::8888 -# - 2001:4860:4860::8844 -# -# <MTU Size> -# -# o Provisioning a limit on the size of the packets sent by the MS -# to avoid packet fragmentation in the backbone network -# between the MS and the GGSN/PGW and/or across the (S)Gi reference point) -# when some of the backbone links does not support -# packets larger then 1500 octets -# -# <P-CSCF> -# -# 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. -# 3. AMF selects SMF based on S-NSSAI, DNN and TAI in SmfInfo. -# -# 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 -# dnn: -# - internet -# -# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# sd: 009000 -# dnn: -# - internet -# - ims -# -# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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: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:99970 TAC:10-20,30-40] -# -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 1-9 -# - s_nssai: -# - sst: 2 -# sd: 000080 -# dnn: -# - internet -# - ims -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 10-20 -# - 30-40 -# -# o Complex Example -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# - sst: 1 -# sd: 000080 -# dnn: -# - internet -# - ims -# - sst: 1 -# sd: 009000 -# dnn: -# [internet, ims] -# - sst: 2 -# dnn: -# - internet -# - sst: 3 -# sd: 123456 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: [1, 2, 3] -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: 4 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: -# - 5 -# - 6 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 100-200 -# - 300-400 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 500-600 -# - 700-800 -# - 900-1000 -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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 @@ -626,262 +52,23 @@ enabled: auto freeDiameter: /data/freediameter.conf -# -# <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.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, 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 -# - 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) -# If prefer_ipv4 is true, http://127.0.0.10:80 is selected. -# -# sbi: -# addr: -# - 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: - 172.18.3.201 port: 7777 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.7:8805) -# upf: -# pfcp: -# addr: 127.0.0.7 -# -# <UPF Selection> -# -# o Round-Robin -# (note that round robin can be disabled for a particular node -# by setting flag 'rr' to 0) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# - addr: 127.0.0.12 -# rr: 0 -# - addr: 127.0.0.19 -# -# o UPF selection by eNodeB TAC -# (either single TAC or multiple TACs, DECIMAL representation) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# tac: 1 -# - addr: 127.0.0.12 -# tac: [3,5,8] -# -# o UPF selection by UE's DNN/APN (either single DNN/APN or multiple DNNs/APNs) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# dnn: ims -# - addr: 127.0.0.12 -# dnn: [internet, web] -# -# o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit) -# (either single enb_id or multiple enb_ids, HEX representation) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# e_cell_id: 463 -# - addr: 127.0.0.12 -# nr_cell_id: [123456789, 9413] -# upf: pfcp: - addr: 172.18.3.222 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# -# o Disable selection of UPF PFCP in Round-Robin manner -# 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 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: -# -# 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 -# -# o Handover Wait Duration (Default : 300 ms) -# 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 c82a80c..73e1bac 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf.yaml @@ -1,192 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/upf.yaml.in + logger: level: info -# -# <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 -# - ::1 -# teid_range_indication: 4 -# teid_range: 10 -# network_instance: internet -# source_interface: 0 -# - addr: 127.0.10.4 -# teid_range_indication: 4 -# teid_range: 5 -# network_instance: ims -# 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. -# (ogstun, ogstun2, ogstunX, ..) -# -# o IPv4 Pool -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# -# upf: -# subnet: -# addr: 10.45.0.1/16 -# -# o IPv4/IPv6 Pool -# $ 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 -# -# -# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 -# All other APNs use 10.45.0.1/16, 2001:db8:cafe::1/48 -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# $ sudo ip addr add 10.46.0.1/16 dev ogstun -# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun -# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun -# -# ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. -# -# upf: -# subnet: -# - addr: 10.45.0.1/16 -# dnn: internet -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 10.50.0.1/16 ## FALLBACK SUBNET -# -# o Multiple Devices (default: ogstun) -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun2 -# $ 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# dev: ogstun2 -# - addr: 10.46.0.1/16 -# dnn: ims -# dev: ogstun3 -# - addr: 2001:db8:babe::1/48 -# 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 @@ -209,54 +25,12 @@ dnn: inet46 dev: ogstun46 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.4:8805) -# smf: -# pfcp: -# addr: 127.0.0.4 -# smf: pfcp: - addr: 172.18.3.201 -# -# o Number of output streams per SCTP associations. -# parameter: -# sctp_streams: 30 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# 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: diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml index 5f38e58..8d1f42e 100644 --- a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml +++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml @@ -1,63 +1,13 @@ +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/hss.yaml.in + db_uri: mongodb://172.18.3.103/open5gs -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# logger: level: trace hss: freeDiameter: /data/freediameter.conf -# -# hss: -# sms_over_ims: "sip:smsc.mnc001.mcc001.3gppnetwork.org:7060;transport=tcp" -# - -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# -# o Use MongoDB Change Stream -# parameter: -# use_mongodb_change_stream: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml index 74229ea..35b718d 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml @@ -1,323 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/mme.yaml.in + logger: level: info -# -# <S1AP Server>> -# -# o S1AP Server(all address available) -# mme: -# s1ap: -# -# o S1AP Server(0.0.0.0:36412) -# mme: -# s1ap: -# addr: 0.0.0.0 -# -# o S1AP Server(127.0.0.2:36412, [::1]:36412) -# mme: -# s1ap: -# - addr: 127.0.0.2 -# - addr: ::1 -# -# o S1AP Server(different port) -# mme: -# s1ap: -# - addr: 127.0.0.2 -# port: 36413 -# -# o S1AP Server(address available in `eth0` interface) -# mme: -# s1ap: -# dev: eth0 -# -# o S1AP Option (Default) -# - sctp_nodelay : true -# - so_linger.l_onoff : false -# -# mme: -# s1ap: -# addr: 127.0.0.2 -# option: -# stcp_nodelay: false -# so_linger: -# l_onoff: true -# l_linger: 10 -# -# o S1AP SCTP Option (Default) -# - spp_hbinterval : 5000 (5secs) -# - spp_sackdelay : 200 (200ms) -# - srto_initial : 3000 (3secs) -# - srto_min : 1000 (1sec) -# - srto_max : 5000 (5secs) -# - sinit_num_ostreams : 30 -# - sinit_max_instreams : 65535 -# - sinit_max_attempts : 4 -# - sinit_max_init_timeo : 8000(8secs) -# -# mme: -# s1ap: -# addr: 127.0.0.2 -# option: -# sctp: -# spp_hbinterval : 5000 -# spp_sackdelay : 200 -# srto_initial : 3000 -# srto_min : 1000 -# srto_max : 5000 -# sinit_num_ostreams : 30 -# sinit_max_instreams : 65535 -# sinit_max_attempts : 4 -# sinit_max_init_timeo : 8000 -# -# <GTP-C Server>> -# -# o GTP-C Server(all address available) -# mme: -# gtpc: -# -# o GTP-C Server(127.0.0.2:2123, [::1]:2123) -# mme: -# gtpc: -# - addr: 127.0.0.2 -# - addr: ::1 -# -# <SGsAP> -# -# o Single MSC/VLR(127.0.0.2) -# mme: -# sgsap: -# addr: 127.0.0.2 -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4130 -# lai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# lac: 43690 -# map: -# tai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# tac: 4132 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43692 -# -# o Multiple MSC/VLR -# mme: -# sgsap: -# - addr: 127.0.0.2 -# port: 29119 -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4131 -# lai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# lac: 43691 -# map: -# tai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# tac: 4132 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43692 -# - addr -# - 127.0.0.4 -# - fd69:f21d:873c:fa::2 -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4132 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43692 -# - name: msc.open5gs.org -# map: -# tai: -# plmn_id: -# mcc: 001 -# mnc: 01 -# tac: 4133 -# lai: -# plmn_id: -# mcc: 002 -# mnc: 02 -# lac: 43693 -# -# <Metrics Server> -# -# o Metrics Server(http://<any address>:9090) -# mme: -# metrics: -# - addr: 0.0.0.0 -# port: 9090 -# -# <GUMMEI> -# -# o Multiple GUMMEI -# mme: -# gummei: -# - plmn_id: -# mcc: 001 -# mnc: 01 -# mme_gid: 2 -# mme_code: 1 -# - plmn_id: -# - mcc: 002 -# mnc: 02 -# - mcc: 003 -# mnc: 03 -# mme_gid: [3, 4] -# mme_code: -# - 2 -# - 3 -# -# -# <TAI> -# -# o Multiple TAI -# -# When multiple TAIs are configured as shown below, -# the Served TAI is determined by comparing UserLocationInformation -# of UplinkNASTransport sent from eNB. -# -# For example, if the eNB sends TAC with 30 to the MME, -# the fourth TAI (TAC: 20, 28, 29-32, 36-38, 40-42, 50, 60, 70, 70) -# is determined as the Served TAI. The result is transmitted to the eNB -# as a Tracking Area identity List in Registration Accept. -# -# mme: -# tai: -# - plmn_id: -# mcc: 001 -# mnc: 01 -# tac: [1, 3, 5] -# tai: -# - plmn_id: -# mcc: 002 -# mnc: 02 -# tac: [6-10, 15-18] -# tai: -# - plmn_id: -# mcc: 003 -# mnc: 03 -# tac: 20 -# - plmn_id: -# mcc: 004 -# mnc: 04 -# tac: 21 -# tai: -# - plmn_id: -# mcc: 005 -# mnc: 05 -# tac: [22, 28] -# - plmn_id: -# mcc: 006 -# mnc: 06 -# tac: [30-32, 34, 36-38, 40-42, 44, 46, 48] -# - plmn_id: -# mcc: 007 -# mnc: 07 -# tac: 50 -# - plmn_id: -# mcc: 008 -# mnc: 08 -# tac: 60 -# - plmn_id: -# mcc: 009 -# mnc: 09 -# tac: [70, 80] -# -# -# <Access Control> -# -# If access_control is not specified, then all networks are allowed -# If access_control is defined, -# no other networks are allowed other than matching plmn_id. -# -# default_reject_cause may be used to overwrite the default error cause #11 -# for non matching plmn_id -# -# for matching plmn_id with reject_cause defined, -# the MME rejects access with the reject_cause error cause -# -# for matching plmn_id without reject_cause defined, -# the MME accepts the PLMN traffic -# -# o The example below only accepts 002/02 and 999/70 PLMNs. -# 001/01 is rejected with cause 15, -# and the rest of the PLMNs are rejected with default cause 13. -# -# mme: -# access_control: -# - default_reject_cause: 13 -# - plmn_id: -# reject_cause: 15 -# mcc: 001 -# mnc: 01 -# - plmn_id: -# mcc: 002 -# mnc: 02 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# -# -# <Network Name> -# mme: -# network_name: -# full: Open5GS -# short: Next -# -# <MME Name> -# mme: -# mme_name: open5gs-mme0 -# -# <Relative Capacity> - Default(255) -# mme: -# relative_capacity: 100 -# mme: freeDiameter: /data/freediameter.conf s1ap: @@ -345,172 +30,16 @@ full: Open5GS mme_name: open5gs-mme0 -# -# <GTP-C Client> -# -# o Specify SGW addresses the GTP-C must connect to -# -# o One SGW is defined. -# If prefer_ipv4 is not true, [fd69:f21d:873c:fa::2] is selected. -# sgwc: -# gtpc: -# addr: -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# -# o Two SGW are defined. MME selects SGW with round-robin manner per UE -# sgwc: -# gtpc: -# - addr: 127.0.0.3 -# - addr: fd69:f21d:873c:fa::2 -# -# o Three SGW are defined. MME selects SGW with round-robin manner per UE -# sgwc: -# gtpc: -# - addr -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# - addr -# - 127.0.0.22 -# - fd69:f21d:873c:fa::12 -# - name: sgw3.open5gs.org -# -# <SGW Selection Mode> -# -# o Round-Robin -# sgwc: -# gtpc: -# addr: 127.0.0.3 -# addr: 127.0.2.2 -# addr: 127.0.4.2 -# -# o SGW selection by eNodeB TAC -# (either single TAC or multiple TACs, DECIMAL representation) -# -# sgwc: -# gtpc: -# - addr: 127.0.0.3 -# tac: 26000 -# - addr: 127.0.2.2 -# tac: [25000, 27000, 28000] -# -# o SGW selection by e_cell_id(28bit) -# (either single or multiple e_cell_id, HEX representation) -# -# sgwc: -# gtpc: -# - addr: 127.0.0.3 -# e_cell_id: abcde01 -# - addr: 127.0.2.2 -# e_cell_id: [12345, a9413, 98765] -# sgwc: gtpc: - addr: 172.18.3.202 -# -# smf: -# -# <GTP-C Client> -# -# o By default, the SMF uses the first SMF node. -# - To use a different APN for each SMF, specify gtpc.apn as the APN name. -# - If the HSS uses WebUI to set the SMF IP for each UE, -# you can use a specific SMF node for each UE. -# (Default values are used, so no configuration is required) -# -# o Two SMF are defined. 127.0.0.4:2123 is used. -# [fd69:f21d:873c:fa::3]:2123 is ignored. -# smf: -# gtpc: -# - addr: 127.0.0.4 -# - addr: fd69:f21d:873c:fa::3 -# -# o One SMF is defined. if prefer_ipv4 is not true, -# [fd69:f21d:873c:fa::3] is selected. -# smf: -# gtpc: -# - addr: -# - 127.0.0.4 -# - fd69:f21d:873c:fa::3 -# -# o Two SMF are defined with a different APN. -# - Note that if SMF IP for UE is configured in HSS, -# the following configurion for this UE is ignored. -# smf: -# gtpc: -# - addr: 127.0.0.4 -# apn: internet -# - addr: 127.0.0.5 -# apn: volte -# -# o If APN is omitted, the default APN uses the first SMF node. -# smf: -# gtpc: -# - addr: 127.0.0.4 -# - addr: 127.0.0.5 -# apn: volte -# -# o SMF selection by eNodeB TAC -# (either single TAC or multiple TACs, DECIMAL representation) -# -# gtpc: -# - addr: 127.0.0.4 -# tac: 26000 -# - addr: 127.0.2.4 -# tac: [25000, 27000, 28000] -# -# o SMF selection by e_cell_id(28bit) -# (either single or multiple e_cell_id, HEX representation) -# -# gtpc: -# - addr: 127.0.0.4 -# e_cell_id: abcde01 -# - addr: 127.0.2.4 -# e_cell_id: [12345, a9413, 98765] smf: gtpc: - addr: - 172.18.3.201 - ::1 - -# <GTP-C Client> -# -# o Specify SGSN addresses the GTP-C must connect to -# -# o One SGSN is defined. -# If prefer_ipv4 is not true, [fd69:f21d:873c:fa::2] is selected. -# sgsn: -# - gtpc: -# addr: -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# routes: -# - rai: XYZ -# ci: XYZ -# -# o Three SGW are defined. MME selects SGW with round-robin manner per UE -# sgsn: -# - gtpc: -# addr: -# - 127.0.0.3 -# - fd69:f21d:873c:fa::2 -# routes: -# - rai: XYZ -# ci: XYZ -# - gtpc: -# addr -# - 127.0.0.22 -# - fd69:f21d:873c:fa::12 -# routes: -# - rai: XYZ -# ci: XYZ -# - name: sgsn3.open5gs.org -# routes: -# - rai: XYZ -# ci: XYZ -# sgsn: - gtpc: addr: @@ -526,63 +55,10 @@ rac: 187 ci: 1223 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# usrsctp: -# udp_port : 9899 -# usrsctp: -# -# 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 -# -# o Handover Wait Duration (Default : 300 ms) -# Time to wait for MME to send UEContextReleaseCommand -# to the source eNB after receiving HandoverNotify -# (Default values are used, so no configuration is required) -# -# o Handover Wait Duration (500ms) -# time: -# handover: -# duration: 500 -# -# o Timers of EPS mobility/session management -# time: -# t3402: -# value: 720 # 12 minutes * 60 = 720 seconds -# t3412: -# value: 3240 # 54 minutes * 60 = 3240 seconds -# t3423: -# value: 720 # 12 minutes * 60 = 720 seconds time: diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf.yaml index a7b615f..b37ec0d 100644 --- a/ttcn3-pgw-test/open5gs-nrf.yaml +++ b/ttcn3-pgw-test/open5gs-nrf.yaml @@ -1,68 +1,10 @@ +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/nrf.yaml.in + db_uri: mongodb://localhost/open5gs -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# logger: level: info -# -# 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 @@ -75,266 +17,20 @@ key: /etc/open5gs/tls/nrf.key cert: /etc/open5gs/tls/nrf.crt -# -# <SBI Server> -# -# o SBI Server(http://<all address available>:80) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# -# o SBI Server(http://<any address>:7777) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - addr: -# - 0.0.0.0 -# - ::0 -# port: 7777 -# -# o SBI Server(https://<all address available>:443) -# sbi: -# server: -# key: /etc/open5gs/tls/nrf.key -# cert: /etc/open5gs/tls/nrf.crt -# nrf: -# sbi: -# -# o SBI Server(https://127.0.0.10:443, https://[::1]:443) without verification -# sbi: -# server: -# no_verify: true -# key: /etc/open5gs/tls/nrf.key -# cert: /etc/open5gs/tls/nrf.crt -# nrf: -# sbi: -# - addr: 127.0.0.10 -# - addr: ::1 -# -# o SBI Server(https://nrf.open5gs.org:443) -# Use the specified certificate while verifying the client -# -# sbi: -# server: -# cacert: /etc/open5gs/tls/ca.crt -# key: /etc/open5gs/tls/nrf.key -# cert: /etc/open5gs/tls/nrf.crt -# nrf: -# sbi: -# - name: nrf.open5gs.org -# -# o SBI Server(http://127.0.0.10:7777) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - addr: 127.0.0.10 -# port: 7777 -# -# o SBI Server(http://<eth0 IP address>:80) -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - dev: eth0 -# -# o Provide custom SBI address to be advertised to NRF -# sbi: -# server: -# no_tls: true -# nrf: -# sbi: -# - dev: eth0 -# advertise: open5gs-nrf.svc.local -# -# o Another example of advertising on NRF -# sbi: -# server: -# no_tls: true -# nrf: -# 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 -# nrf: -# sbi: -# addr: 127.0.0.10 -# option: -# tcp_nodelay: false -# so_linger: -# l_onoff: true -# l_linger: 10 -# -# <NF Service> -# -# o NF Service Name(Default : all NF services available) -# nrf: -# service_name: -# -# o NF Service Name(Only some NF services are available) -# nrf: -# service_name: -# - nnrf-nfm -# - nnrf-disc -# nrf: sbi: addr: - 172.18.18.10 port: 7777 -# -# <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 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# -# o NF Instance Heartbeat (Default : 10 seconds) -# (Default values are used, so no configuration is required) -# -# o NF Instance Heartbeat (Disabled) -# time: -# nf_instance: -# heartbeat: 0 -# -# o NF Instance Heartbeat (5 seconds) -# time: -# nf_instance: -# heartbeat: 5 -# -# o NF Instance Validity (Default : 3600 seconds = 1 hour) -# (Default values are used, so no configuration is required) -# -# o NF Instance Validity (10 seconds) -# time: -# nf_instance: -# validity: 10 -# -# o Subscription Validity (Default : 86400 seconds = 1 day) -# (Default values are used, so no configuration is required) -# -# o Subscription Validity (Disabled) -# time: -# subscription: -# validity: 0 -# -# o Subscription Validity (3600 seconds = 1 hour) -# time: -# subscription: -# validity: 3600 -# -# 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: diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf.yaml index f75a6e6..622618b 100644 --- a/ttcn3-pgw-test/open5gs-smf.yaml +++ b/ttcn3-pgw-test/open5gs-smf.yaml @@ -1,63 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/smf.yaml.in + logger: level: info -# -# 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 @@ -70,525 +15,6 @@ 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>:7777) -# sbi: -# server: -# no_tls: true -# smf: -# sbi: -# - addr: -# - 0.0.0.0 -# - ::0 -# port: 7777 -# -# o SBI Server(https://<all address available>:443) -# sbi: -# server: -# key: /etc/open5gs/tls/smf.key -# cert: /etc/open5gs/tls/smf.crt -# smf: -# sbi: -# -# 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 -# - addr: ::1 -# -# 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 -# - fd69:f21d:873c:fa::3 -# -# 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 -# -# <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 -# -# -# 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - 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: -# - 10.45.0.100-10.45.0.200 -# - 10.45.1.100-10.45.1.200 -# - addr: 2001:db8:cafe::1/48 -# range: -# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0 -# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0 -# -# <Domain Name Server> -# -# o Primary/Secondary can be configured. Others are ignored. -# -# smf: -# dns: -# - 8.8.8.8 -# - 8.8.4.4 -# - 2001:4860:4860::8888 -# - 2001:4860:4860::8844 -# -# <MTU Size> -# -# o Provisioning a limit on the size of the packets sent by the MS -# to avoid packet fragmentation in the backbone network -# between the MS and the GGSN/PGW and/or across the (S)Gi reference point) -# when some of the backbone links does not support -# packets larger then 1500 octets -# -# <P-CSCF> -# -# 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. -# 3. AMF selects SMF based on S-NSSAI, DNN and TAI in SmfInfo. -# -# 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 -# dnn: -# - internet -# -# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# sd: 009000 -# dnn: -# - internet -# - ims -# -# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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: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:99970 TAC:10-20,30-40] -# -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 1-9 -# - s_nssai: -# - sst: 2 -# sd: 000080 -# dnn: -# - internet -# - ims -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 10-20 -# - 30-40 -# -# o Complex Example -# smf: -# info: -# - s_nssai: -# - sst: 1 -# dnn: -# - internet -# - sst: 1 -# sd: 000080 -# dnn: -# - internet -# - ims -# - sst: 1 -# sd: 009000 -# dnn: -# [internet, ims] -# - sst: 2 -# dnn: -# - internet -# - sst: 3 -# sd: 123456 -# dnn: -# - internet -# tai: -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: [1, 2, 3] -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: 4 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# tac: -# - 5 -# - 6 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 100-200 -# - 300-400 -# - plmn_id: -# mcc: 999 -# mnc: 70 -# range: -# - 500-600 -# - 700-800 -# - 900-1000 -# - s_nssai: -# - sst: 4 -# dnn: -# - internet -# tai: -# - plmn_id: -# 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.18.4 @@ -617,262 +43,22 @@ enabled: auto freeDiameter: /data/freeDiameter-smf.conf -# -# <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.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, 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 -# - 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) -# If prefer_ipv4 is true, http://127.0.0.10:80 is selected. -# -# sbi: -# addr: -# - 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: - 172.18.18.10 port: 7777 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.7:8805) -# upf: -# pfcp: -# addr: 127.0.0.7 -# -# <UPF Selection> -# -# o Round-Robin -# (note that round robin can be disabled for a particular node -# by setting flag 'rr' to 0) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# - addr: 127.0.0.12 -# rr: 0 -# - addr: 127.0.0.19 -# -# o UPF selection by eNodeB TAC -# (either single TAC or multiple TACs, DECIMAL representation) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# tac: 1 -# - addr: 127.0.0.12 -# tac: [3,5,8] -# -# o UPF selection by UE's DNN/APN (either single DNN/APN or multiple DNNs/APNs) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# dnn: ims -# - addr: 127.0.0.12 -# dnn: [internet, web] -# -# o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit) -# (either single enb_id or multiple enb_ids, HEX representation) -# -# upf: -# pfcp: -# - addr: 127.0.0.7 -# e_cell_id: 463 -# - addr: 127.0.0.12 -# nr_cell_id: [123456789, 9413] -# upf: pfcp: - addr: 172.18.18.7 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# -# o Disable selection of UPF PFCP in Round-Robin manner -# 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 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: -# -# 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 -# -# o Handover Wait Duration (Default : 300 ms) -# 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-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf.yaml index 693a1d7..fec9fc7 100644 --- a/ttcn3-pgw-test/open5gs-upf.yaml +++ b/ttcn3-pgw-test/open5gs-upf.yaml @@ -1,192 +1,8 @@ -# -# 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' -# (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,sbi,ausf,event,tlv,mem,sock -# +# See https://github.com/open5gs/open5gs/blob/main/configs/open5gs/upf.yaml.in + logger: level: info -# -# <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 -# - ::1 -# teid_range_indication: 4 -# teid_range: 10 -# network_instance: internet -# source_interface: 0 -# - addr: 127.0.10.4 -# teid_range_indication: 4 -# teid_range: 5 -# network_instance: ims -# 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. -# (ogstun, ogstun2, ogstunX, ..) -# -# o IPv4 Pool -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# -# upf: -# subnet: -# addr: 10.45.0.1/16 -# -# o IPv4/IPv6 Pool -# $ 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 -# -# -# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 -# All other APNs use 10.45.0.1/16, 2001:db8:cafe::1/48 -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# $ sudo ip addr add 10.46.0.1/16 dev ogstun -# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun -# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun -# -# ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash. -# -# upf: -# subnet: -# - addr: 10.45.0.1/16 -# dnn: internet -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 2001:db8:babe::1/48 -# dnn: ims -# -# 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 -# - addr: 10.46.0.1/16 -# dnn: ims -# - addr: 10.50.0.1/16 ## FALLBACK SUBNET -# -# o Multiple Devices (default: ogstun) -# $ sudo ip addr add 10.45.0.1/16 dev ogstun -# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun2 -# $ 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 -# - addr: 2001:db8:cafe::1/48 -# dnn: internet -# dev: ogstun2 -# - addr: 10.46.0.1/16 -# dnn: ims -# dev: ogstun3 -# - addr: 2001:db8:babe::1/48 -# 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.18.7 @@ -200,54 +16,12 @@ dnn: internet dev: ogstun46 -# -# <PFCP Client>> -# -# o PFCP Client(127.0.0.4:8805) -# smf: -# pfcp: -# addr: 127.0.0.4 -# smf: pfcp: addr: 172.18.18.4 -# -# o Number of output streams per SCTP associations. -# parameter: -# sctp_streams: 30 -# -# o Disable use of IPv4 addresses (only IPv6) -# parameter: -# no_ipv4: true -# -# o Disable use of IPv6 addresses (only IPv4) -# parameter: -# no_ipv6: true -# -# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. -# parameter: -# prefer_ipv4: true -# parameter: -# -# o Maximum Number of UE -# max: -# ue: 1024 -# -# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) -# max: -# peer: 64 -# max: -# -# 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/+/35103?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I67c2a198b9682e15e23a466380e62a976e6236cd Gerrit-Change-Number: 35103 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
by jolly 23 Nov '23

23 Nov '23

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email to look at the new patch set (#4). Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload ...................................................................... LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload A special flag is used to keep track on the establishment of the data link. If it is being established (not re-established) without L3 payload, it is rejected by a release request inside BTS. Related: OS#5971 Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors
by dexter 23 Nov '23

23 Nov '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35102?usp=email ) Change subject: pySim-shell: refuse to execute a startup script on initialization errors ...................................................................... pySim-shell: refuse to execute a startup script on initialization errors When there is an error on initialization (e.g. card not present), we should not continue to execute a startup script that was passed with the pySim-shell commandline. Instead we should print a message that the startup script was ignored due to errors. Related: OS#6271 Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b --- M pySim-shell.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/35102/1 diff --git a/pySim-shell.py b/pySim-shell.py index 795276a..4e08eb7 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -979,7 +979,9 @@ " it should also be noted that some readers may behave strangely when no card") print(" is inserted.)") print("") - app = PysimApp(None, None, sl, ch, opts.script) + if opts.script: + print("will not execute startup script due to card initialization errors!") + app = PysimApp(None, None, sl, ch) # If the user supplies an ADM PIN at via commandline args authenticate # immediately so that the user does not have to use the shell commands -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35102?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b Gerrit-Change-Number: 35102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: app: do not catch exceptions in init_card
by dexter 23 Nov '23

23 Nov '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35101?usp=email ) Change subject: app: do not catch exceptions in init_card ...................................................................... app: do not catch exceptions in init_card The function init_card catches all exceptions and then returns None objects for card or rs in case of an error. This does not fit in the style we pursue in pySim. This is in particular true for library functions. We want those functions to raise exceptions when something is wrong, so that we can catch the exception at top level. Let's fix this for init_card now. Related: OS#6271 Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d --- M pySim/app.py 1 file changed, 19 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/35101/1 diff --git a/pySim/app.py b/pySim/app.py index 1711a1c..5a9f772 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -55,14 +55,7 @@ # Wait up to three seconds for a card in reader and try to detect # the card type. print("Waiting for card...") - try: - sl.wait_for_card(3) - except NoCardError: - print("No card detected!") - return None, None - except: - print("Card not readable!") - return None, None + sl.wait_for_card(3) generic_card = False card = card_detect(scc) @@ -73,8 +66,7 @@ profile = CardProfile.pick(scc) if profile is None: - print("Unsupported card type!") - return None, card + raise ValueError("Unsupported card type!") # ETSI TS 102 221, Table 9.3 specifies a default for the PIN key # references, however card manufactures may still decide to pick an -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d Gerrit-Change-Number: 35101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame
by jolly 23 Nov '23

23 Nov '23

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame ...................................................................... LAPDm: Add a flag to enable suppression of subsequent REJ frame This behaviour was default in earlier versions of LAPDm/LAPD. Because it is only required for osmocom-bb, a flag is added to enable it there. Related: OS#5969 Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 --- M include/osmocom/gsm/lapdm.h M include/osmocom/isdn/lapd_core.h M src/gsm/lapdm.c M src/isdn/lapd_core.c 4 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Gerrit-Change-Number: 35015 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
by jolly 23 Nov '23

23 Nov '23

Attention is currently required from: laforge, neels. Hello Jenkins Builder, laforge, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by neels, Verified+1 by Jenkins Builder Change subject: LAPD: Add support for RTS based polling and T200 ...................................................................... LAPD: Add support for RTS based polling and T200 The T200 timer is started when the current frame is polled at PH-READY-TO-SEND event. A flag is used to enable this feature. The user of LAPD core must track frame numbers to check the timeout condition. Then it must call the external timeout function. Related: OS#4074 Change-Id: Ib961b5a44911b99b0487641533301749c0286995 --- M TODO-RELEASE M include/osmocom/isdn/lapd_core.h M src/isdn/lapd_core.c M src/isdn/libosmoisdn.map 4 files changed, 135 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/34985/9 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
by jolly 23 Nov '23

23 Nov '23

Attention is currently required from: neels. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 ...................................................................... Patch Set 8: (4 comments) File include/osmocom/isdn/lapd_core.h: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/215d440d_f2511945 PS8, Line 88: #define LAPD_F_RTS 0x0001 > (an enum would be nicer IMHO) There is another flag in a later patch. https://gerrit.osmocom.org/c/libosmocore/+/35015 File src/isdn/lapd_core.c: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/437e7a58_4f75489a PS8, Line 220: Function to > (just drop the words "Function to", rationale: it is obvious that it is a function) Done https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/4aeccd7b_30b7fa62 PS8, Line 400: \ref > '\ref' is not valid doxygen here, see https://osmocom. […] Done https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/033fbb3f_b994b69e PS8, Line 1785: Function call when a LAPD frame is ready to sent. > this is hard to understand, could you make this an "imperative form" description of what the functio […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 8 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 23 Nov 2023 10:46:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame
by jolly 23 Nov '23

23 Nov '23

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame ...................................................................... LAPDm: Add a flag to enable suppression of subsequent REJ frame This behaviour was default in earlier versions of LAPDm/LAPD. Because it is only required for osmocom-bb, a flag is added to enable it there. Related: OS#5969 Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 --- M include/osmocom/gsm/lapdm.h M include/osmocom/isdn/lapd_core.h M src/gsm/lapdm.c M src/isdn/lapd_core.c 4 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Gerrit-Change-Number: 35015 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames
by jolly 23 Nov '23

23 Nov '23

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email to look at the new patch set (#13). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: LAPDm: Add an extra queue for UI frames ...................................................................... LAPDm: Add an extra queue for UI frames The extra queue is used to transmit the UI frame only when there is no frame in the regular TX queue. This allows to give LAPD frames prioity over UI frame. Related: OS#4074 Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c 3 files changed, 52 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/34987/13 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da Gerrit-Change-Number: 34987 Gerrit-PatchSet: 13 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0