- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: make: Add OPEN5GS_BRANCH build arg

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27062 ) Change subject: make: Add OPEN5GS_BRANCH build arg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I29f85a18f5629e50dc1db527e931a248ab69f8e4 Gerrit-Change-Number: 27062 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 08:26:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: Add ttcn3-ggsn-ogs testsuite

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 ) Change subject: Add ttcn3-ggsn-ogs testsuite ...................................................................... Add ttcn3-ggsn-ogs testsuite This new setup allows running TTCN3 GGSN_Tests against open5gs, which will soon gain GTPv1C support. Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49 --- A ttcn3-ggsn-test-ogs/jenkins.sh A ttcn3-ggsn-test-ogs/ogs A ttcn3-ggsn-test/jenkins-ogs.sh A ttcn3-ggsn-test/ogs/GGSN_Tests.cfg A ttcn3-ggsn-test/ogs/freediameter.conf A ttcn3-ggsn-test/ogs/smfd.yaml A ttcn3-ggsn-test/ogs/upfd-setup.sh A ttcn3-ggsn-test/ogs/upfd.sh A ttcn3-ggsn-test/ogs/upfd.yaml 9 files changed, 1,131 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/63/27063/1 diff --git a/ttcn3-ggsn-test-ogs/jenkins.sh b/ttcn3-ggsn-test-ogs/jenkins.sh new file mode 120000 index 0000000..b688dd2 --- /dev/null +++ b/ttcn3-ggsn-test-ogs/jenkins.sh @@ -0,0 +1 @@ +../ttcn3-ggsn-test/jenkins-ogs.sh \ No newline at end of file diff --git a/ttcn3-ggsn-test-ogs/ogs b/ttcn3-ggsn-test-ogs/ogs new file mode 120000 index 0000000..b048f0e --- /dev/null +++ b/ttcn3-ggsn-test-ogs/ogs @@ -0,0 +1 @@ +../ttcn3-ggsn-test/ogs \ No newline at end of file diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh new file mode 100755 index 0000000..57fed00 --- /dev/null +++ b/ttcn3-ggsn-test/jenkins-ogs.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +. ../jenkins-common.sh + +KERNEL_TEST="${KERNEL_TEST:-0}" +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "open5gs-$IMAGE_SUFFIX" \ + "ttcn3-ggsn-test" + +set_clean_up_trap +set -e + +#Make sure NET_NAME doesn't clash with the AoIP BSC test +NET_NAME=ttcn3-ggsn-test-ogs + +mkdir $VOL_BASE_DIR/ggsn-tester +cp ogs/GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" + +mkdir $VOL_BASE_DIR/ggsn +cp ogs/smfd.yaml $VOL_BASE_DIR/ggsn/ +cp ogs/upfd.yaml $VOL_BASE_DIR/ggsn/ +cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/ +cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/ +cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/ + +SUBNET=3 +network_create $SUBNET + +# start container with ggsn (smf+upf) in background +docker run --cap-add=NET_ADMIN \ + --device /dev/net/tun:/dev/net/tun \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --rm \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/ggsn:/data \ + --name ${BUILD_TAG}-ggsn-ogs-smf -d \ + $DOCKER_ARGS \ + $(docker_network_params $SUBNET 201) \ + $REPO_USER/open5gs-$IMAGE_SUFFIX \ + /bin/sh -c "open5gs-smfd -c /data/smfd.yaml >/data/open5gs-smfd.out 2>&1" + +docker run --cap-add=NET_ADMIN \ + --device /dev/net/tun:/dev/net/tun \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --rm \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/ggsn:/data \ + --name ${BUILD_TAG}-ggsn-ogs-upf -d \ + $DOCKER_ARGS \ + $(docker_network_params $SUBNET 222) \ + $REPO_USER/open5gs-$IMAGE_SUFFIX \ + /bin/sh -c "/data/upfd.sh -c /data/upfd.yaml >/data/open5gs-upfd.out 2>&1" + +# start docker container with testsuite in foreground +docker run --rm \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + $(docker_network_params $SUBNET 202) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/ggsn-tester:/data \ + -e "TTCN3_PCAP_PATH=/data" \ + --name ${BUILD_TAG}-ggsn-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-ggsn-test diff --git a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg new file mode 100644 index 0000000..ccbda8d --- /dev/null +++ b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg @@ -0,0 +1,25 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests.default" + +[LOGGING] +*.JUnitLogger.testsuite_name := "GGSN_Tests" + +[TESTPORT_PARAMETERS] +*.GGSNVTY.CTRL_HOSTNAME := "172.18.3.201" + +[MODULE_PARAMETERS] +# our Own IP address +GGSN_Tests.m_bind_ip_gtpc := "172.18.3.202" +GGSN_Tests.m_bind_ip_gtpu := "172.18.3.202" +# GGSN IP address +GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201" +GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.201" +# GGSN announced DNS address +GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" +GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201" +GGSN_Tests.m_ggsn_impl := GGSN_IMPL_OPEN5GS + +[EXECUTE] +#GGSN_Tests.control +GGSN_Tests.TC_pdp4_act_deact diff --git a/ttcn3-ggsn-test/ogs/freediameter.conf b/ttcn3-ggsn-test/ogs/freediameter.conf new file mode 100644 index 0000000..612bd35 --- /dev/null +++ b/ttcn3-ggsn-test/ogs/freediameter.conf @@ -0,0 +1,267 @@ +# This is a sample configuration file for freeDiameter daemon. + +# Most of the options can be omitted, as they default to reasonable values. +# Only TLS-related options must be configured properly in usual setups. + +# It is possible to use "include" keyword to import additional files +# e.g.: include "/etc/freeDiameter.d/*.conf" +# This is exactly equivalent as copy & paste the content of the included file(s) +# where the "include" keyword is found. + + +############################################################## +## Peer identity and realm + +# The Diameter Identity of this daemon. +# This must be a valid FQDN that resolves to the local host. +# Default: hostname's FQDN +#Identity = "aaa.koganei.freediameter.net"; +Identity = "smf.localdomain"; + +# The Diameter Realm of this daemon. +# Default: the domain part of Identity (after the first dot). +#Realm = "koganei.freediameter.net"; +Realm = "localdomain"; + +############################################################## +## Transport protocol configuration + +# The port this peer is listening on for incoming connections (TCP and SCTP). +# Default: 3868. Use 0 to disable. +Port = 3868; + +# The port this peer is listening on for incoming TLS-protected connections (TCP and SCTP). +# See TLS_old_method for more information about TLS flavours. +# Note: we use TLS/SCTP instead of DTLS/SCTP at the moment. This will change in future version of freeDiameter. +# Default: 5868. Use 0 to disable. +SecPort = 0; + +# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed +# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the +# CER/CEA exchange on a dedicated secure port. +# This parameter only affects outgoing connections. +# The setting can be also defined per-peer (see Peers configuration section). +# Default: use RFC6733 method with separate port for TLS. +#TLS_old_method; + +# Disable use of TCP protocol (only listen and connect over SCTP) +# Default : TCP enabled +#No_TCP; + +# Disable use of SCTP protocol (only listen and connect over TCP) +# Default : SCTP enabled +#No_SCTP; +# This option is ignored if freeDiameter is compiled with DISABLE_SCTP option. + +# Prefer TCP instead of SCTP for establishing new connections. +# This setting may be overwritten per peer in peer configuration blocs. +# Default : SCTP is attempted first. +#Prefer_TCP; + +# Default number of streams per SCTP associations. +# This setting may be overwritten per peer basis. +# Default : 30 streams +#SCTP_streams = 30; + +############################################################## +## Endpoint configuration + +# Disable use of IP addresses (only IPv6) +# Default : IP enabled +#No_IP; + +# Disable use of IPv6 addresses (only IP) +# Default : IPv6 enabled +#No_IPv6; + +# Specify local addresses the server must bind to +# Default : listen on all addresses available. +#ListenOn = "202.249.37.5"; +#ListenOn = "2001:200:903:2::202:1"; +#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; +ListenOn = "172.18.3.201"; + + +############################################################## +## Server configuration + +# How many Diameter peers are allowed to be connecting at the same time ? +# This parameter limits the number of incoming connections from the time +# the connection is accepted until the first CER is received. +# Default: 5 unidentified clients in paralel. +#ThreadsPerServer = 5; + +############################################################## +## TLS Configuration + +# TLS is managed by the GNUTLS library in the freeDiameter daemon. +# You may find more information about parameters and special behaviors +# in the relevant documentation. +# http://www.gnu.org/software/gnutls/manual/ + +# Credentials of the local peer +# The X509 certificate and private key file to use for the local peer. +# The files must contain PKCS-1 encoded RSA key, in PEM format. +# (These parameters are passed to gnutls_certificate_set_x509_key_file function) +# Default : NO DEFAULT +#TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>"; +#TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key"; +TLS_Cred = "/usr/local/etc/freeDiameter/smf.cert.pem", "/usr/local/etc/freeDiameter/smf.key.pem"; + +# Certificate authority / trust anchors +# The file containing the list of trusted Certificate Authorities (PEM list) +# (This parameter is passed to gnutls_certificate_set_x509_trust_file function) +# The directive can appear several times to specify several files. +# Default : GNUTLS default behavior +#TLS_CA = "<file.PEM>"; +TLS_CA = "/usr/local/etc/freeDiameter/cacert.pem"; + +# Certificate Revocation List file +# The information about revoked certificates. +# The file contains a list of trusted CRLs in PEM format. They should have been verified before. +# (This parameter is passed to gnutls_certificate_set_x509_crl_file function) +# Note: openssl CRL format might have interoperability issue with GNUTLS format. +# Default : GNUTLS default behavior +#TLS_CRL = "<file.PEM>"; + +# GNU TLS Priority string +# This string allows to configure the behavior of GNUTLS key exchanges +# algorithms. See gnutls_priority_init function documentation for information. +# You should also refer to the Diameter required TLS support here: +# http://tools.ietf.org/html/rfc6733#section-13.1 +# Default : "NORMAL" +# Example: TLS_Prio = "NONE:+VERS-TLS1.1:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL"; +#TLS_Prio = "NORMAL"; + +# Diffie-Hellman parameters size +# Set the number of bits for generated DH parameters +# Valid value should be 768, 1024, 2048, 3072 or 4096. +# (This parameter is passed to gnutls_dh_params_generate2 function, +# it usually should match RSA key size) +# Default : 1024 +#TLS_DH_Bits = 1024; + +# Alternatively, you can specify a file to load the PKCS#3 encoded +# DH parameters directly from. This accelerates the daemon start +# but is slightly less secure. If this file is provided, the +# TLS_DH_Bits parameters has no effect. +# Default : no default. +#TLS_DH_File = "<file.PEM>"; + + +############################################################## +## Timers configuration + +# The Tc timer of this peer. +# It is the delay before a new attempt is made to reconnect a disconnected peer. +# The value is expressed in seconds. The recommended value is 30 seconds. +# Default: 30 +#TcTimer = 30; + +# The Tw timer of this peer. +# It is the delay before a watchdog message is sent, as described in RFC 3539. +# The value is expressed in seconds. The default value is 30 seconds. Value must +# be greater or equal to 6 seconds. See details in the RFC. +# Default: 30 +#TwTimer = 30; + +############################################################## +## Applications configuration + +# Disable the relaying of Diameter messages? +# For messages not handled locally, the default behavior is to forward the +# message to another peer if any is available, according to the routing +# algorithms. In addition the "0xffffff" application is advertised in CER/CEA +# exchanges. +# Default: Relaying is enabled. +#NoRelay; +NoRelay; + +# Number of server threads that can handle incoming messages at the same time. +# Default: 4 +#AppServThreads = 4; + +# Other applications are configured by loaded extensions. + +############################################################## +## Extensions configuration + +# The freeDiameter framework merely provides support for +# Diameter Base Protocol. The specific application behaviors, +# as well as advanced functions, are provided +# by loadable extensions (plug-ins). +# These extensions may in addition receive the name of a +# configuration file, the format of which is extension-specific. +# +# Format: +#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; +# +# Examples: +#LoadExtension = "extensions/sample.fdx"; +#LoadExtension = "extensions/sample.fdx":"conf/sample.conf"; + +# Extensions are named as follow: +# dict_* for extensions that add content to the dictionary definitions. +# dbg_* for extensions useful only to retrieve more information on the framework execution. +# acl_* : Access control list, to control which peers are allowed to connect. +# rt_* : routing extensions that impact how messages are forwarded to other peers. +# app_* : applications, these extensions usually register callbacks to handle specific messages. +# test_* : dummy extensions that are useful only in testing environments. + + +# The dbg_msg_dump.fdx extension allows you to tweak the way freeDiameter displays some +# information about some events. This extension does not actually use a configuration file +# but receives directly a parameter in the string passed to the extension. Here are some examples: +## LoadExtension = "dbg_msg_dumps.fdx" : "0x1111"; # Removes all default hooks, very quiet even in case of errors. +## LoadExtension = "dbg_msg_dumps.fdx" : "0x2222"; # Display all events with few details. +## LoadExtension = "dbg_msg_dumps.fdx" : "0x0080"; # Dump complete information about sent and received messages. +# The four digits respectively control: connections, routing decisions, sent/received messages, errors. +# The values for each digit are: +# 0 - default - keep the default behavior +# 1 - quiet - remove any specific log +# 2 - compact - display only a summary of the information +# 4 - full - display the complete information on a single long line +# 8 - tree - display the complete information in an easier to read format spanning several lines. + +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; +LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; + + +############################################################## +## Peers configuration + +# The local server listens for incoming connections. By default, +# all unknown connecting peers are rejected. Extensions can override this behavior (e.g., acl_wl). +# +# In addition to incoming connections, the local peer can +# be configured to establish and maintain connections to some +# Diameter nodes and allow connections from these nodes. +# This is achieved with the ConnectPeer directive described below. +# +# Note that the configured Diameter Identity MUST match +# the information received inside CEA, or the connection will be aborted. +# +# Format: +#ConnectPeer = "diameterid" [ { parameter1; parameter2; ...} ] ; +# Parameters that can be specified in the peer's parameter list: +# No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; +# No_TLS; # assume transparent security instead of TLS. DTLS is not supported yet (will change in future versions). +# Port = 5868; # The port to connect to +# TcTimer = 30; +# TwTimer = 30; +# ConnectTo = "202.249.37.5"; +# ConnectTo = "2001:200:903:2::202:1"; +# TLS_Prio = "NORMAL"; +# Realm = "realm.net"; # Reject the peer if it does not advertise this realm. +# Examples: +#ConnectPeer = "aaa.wide.ad.jp"; +#ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ; +ConnectPeer = "ttcn3ggsntest.localdomain" { ConnectTo = "172.18.3.202"; Port = 3868; No_TLS; TcTimer = 2; }; + + +############################################################## diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml new file mode 100644 index 0000000..634cc9a --- /dev/null +++ b/ttcn3-ggsn-test/ogs/smfd.yaml @@ -0,0 +1,520 @@ +# +# 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) +# +# o Set OGS_LOG_ERROR to all domain level +# - `level` can be set with none, fatal, error, warn, info, debug, trace +# level: error +# +# o Set OGS_LOG_DEBUG to mme/emm domain level +# level: debug +# domain: mme,emm +# +# o Set OGS_LOG_TRACE to all domain level +# level: trace +# domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock +# +logger: + file: /data/open5gs-smfd.log + level: info +# +# smf: +# +# <SBI Server> +# +# o SBI Server(http://<all address available>:80) +# sbi: +# +# o SBI Server(http://<any address>:80) +# sbi: +# - addr: +# - 0.0.0.0 +# - ::0 +# port: 7777 +# +# o SBI Server(https://<all address avaiable>:443) +# sbi: +# - tls: +# key: smf.key +# pem: smf.pem +# +# o SBI Server(https://127.0.0.4:443, http://[::1]:80) +# sbi: +# - addr: 127.0.0.4 +# tls: +# key: smf.key +# pem: smf.pem +# - addr: ::1 +# +# o SBI Server(http://smf.open5gs.org:80) +# sbi: +# - name: smf.open5gs.org +# +# o SBI Server(http://127.0.0.4:7777) +# sbi: +# - addr: 127.0.0.4 +# port: 7777 +# +# o SBI Server(http://<eth0 IP address>:80) +# sbi: +# - dev: eth0 +# +# o Provide custom SBI address to be advertised to NRF +# sbi: +# - dev: eth0 +# advertise: open5gs-smf.svc.local +# +# sbi: +# - addr: localhost +# advertise: +# - 127.0.0.99 +# - ::1 +# +# <PFCP Server> +# +# o PFCP Server(127.0.0.4:8805, ::1:8805) +# pfcp: +# - addr: 127.0.0.4 +# - addr: ::1 +# +# o PFCP-U Server(127.0.0.1:2152, [::1]:2152) +# pfcp: +# name: localhost +# +# <GTP-C Server> +# +# o GTP-C Server(127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123) +# 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). +# gtpc: +# - addr: 127.0.0.4 +# - addr: fd69:f21d:873c:fa::3 +# +# <GTP-U Server>> +# +# o GTP-U Server(127.0.0.4:2152, [::1]:2152) +# gtpu: +# - addr: 127.0.0.4 +# - addr: ::1 +# +# o GTP-U Server(127.0.0.1:2152, [::1]:2152) +# gtpu: +# name: localhost +# +# <Subnet for UE Pool> +# +# o IPv4 Pool +# subnet: +# addr: 10.45.0.1/16 +# +# o IPv4/IPv6 Pool +# 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. +# +# 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. +# +# 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 +# subnet: +# - addr: 10.45.0.1/24 +# range: 10.45.0.100-10.45.0.200 +# +# subnet: +# - addr: 10.45.0.1/24 +# range: +# - 10.45.0.5-10.45.0.50 +# - 10.45.0.100- +# +# subnet: +# - addr: 10.45.0.1/24 +# range: +# - -10.45.0.200 +# - 10.45.0.210-10.45.0.220 +# +# 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. +# +# 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 +# +# p-cscf: +# - 127.0.0.1 +# - ::1 +# +# <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 +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# +# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] +# info: +# - s_nssai: +# - sst: 1 +# sd: 009000 +# dnn: +# - internet +# - ims +# +# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1] +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 901 +# 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: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] +# +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 901 +# mnc: 70 +# range: +# - 1-9 +# - s_nssai: +# - sst: 2 +# sd: 000080 +# dnn: +# - internet +# - ims +# - s_nssai: +# - sst: 4 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 901 +# mnc: 70 +# range: +# - 10-20 +# - 30-40 +# +# o Complex Example +# 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: 901 +# mnc: 70 +# tac: [1, 2, 3] +# - plmn_id: +# mcc: 901 +# mnc: 70 +# tac: 4 +# - plmn_id: +# mcc: 901 +# mnc: 70 +# tac: +# - 5 +# - 6 +# - plmn_id: +# mcc: 901 +# mnc: 70 +# range: +# - 100-200 +# - 300-400 +# - plmn_id: +# mcc: 901 +# mnc: 70 +# range: +# - 500-600 +# - 700-800 +# - 900-1000 +# - s_nssai: +# - sst: 4 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 901 +# mnc: 70 +# tac: 99 +# + +smf: + sbi: + - addr: 172.18.3.201 + port: 7777 + pfcp: + - addr: 172.18.3.201 + gtpc: + - addr: 172.18.3.201 + gtpu: + - addr: 172.18.3.201 + port: 2152 + subnet: + - addr: 176.16.222.1/24 + dns: + - 172.18.3.201 + - 8.8.8.8 + mtu: 1400 + freeDiameter: /data/freediameter.conf + +# +# nrf: +# +# <SBI Client>> +# +# o SBI Client(http://127.0.0.1:7777) +# sbi: +# addr: 127.0.0.10 +# port: 7777 +# +# o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80) +# sbi: +# - addr: 127.0.0.10 +# tls: +# key: nrf.key +# pem: nrf.pem +# - 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 +# +nrf: + sbi: + - addr: + - 172.18.3.201 + port: 7777 + +# +# upf: +# +# <PFCP Client>> +# +# o PFCP Client(127.0.0.7:8805) +# +# 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 + +# +# parameter: +# +# o Number of output streams per SCTP associations. +# sctp_streams: 30 +# +# o Disable use of IPv4 addresses (only IPv6) +# no_ipv4: true +# +# o Disable use of IPv6 addresses (only IPv4) +# no_ipv6: true +# +# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. +# prefer_ipv4: true +# +# o Disable selection of UPF PFCP in Round-Robin manner +# no_pfcp_rr_select: true +# +parameter: + +# +# max: +# +# o Maximum Number of UE per AMF/MME +# ue: 1024 +# o Maximum Number of gNB/eNB per AMF/MME +# gnb: 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 +# +# o NF Instance Heartbeat (20 seconds) +# NFs will send heart-beat timer (20 seconds) in NFProfile +# NRF can change heart-beat timer in NFProfile +# +# nf_instance: +# heartbeat: 20 +# +# o Message Wait Duration (Default : 10,000 ms = 10 seconds) +# +# o Message Wait Duration (3000 ms) +# 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) +# +# o Handover Wait Duration (500ms) +# handover: +# duration: 500 +time: diff --git a/ttcn3-ggsn-test/ogs/upfd-setup.sh b/ttcn3-ggsn-test/ogs/upfd-setup.sh new file mode 100755 index 0000000..7ab538d --- /dev/null +++ b/ttcn3-ggsn-test/ogs/upfd-setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if ! grep "ogstun" /proc/net/dev > /dev/null; then + ip tuntap add name ogstun mode tun +fi +ip addr del 176.16.222.1/16 dev ogstun 2> /dev/null +ip addr add 176.16.222.1/16 dev ogstun +#ip addr del cafe::1/64 dev ogstun 2> /dev/null +#ip addr add cafe::1/64 dev ogstun +ip link set ogstun up diff --git a/ttcn3-ggsn-test/ogs/upfd.sh b/ttcn3-ggsn-test/ogs/upfd.sh new file mode 100755 index 0000000..694df35 --- /dev/null +++ b/ttcn3-ggsn-test/ogs/upfd.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +set -x +/data/upfd-setup.sh +#du -lha / | grep freeDiameter +su - osmocom -c "open5gs-upfd $*" diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml b/ttcn3-ggsn-test/ogs/upfd.yaml new file mode 100644 index 0000000..35eeff7 --- /dev/null +++ b/ttcn3-ggsn-test/ogs/upfd.yaml @@ -0,0 +1,236 @@ +# +# 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) +# +# o Set OGS_LOG_ERROR to all domain level +# - `level` can be set with none, fatal, error, warn, info, debug, trace +# level: error +# +# o Set OGS_LOG_DEBUG to mme/emm domain level +# level: debug +# domain: mme,emm +# +# o Set OGS_LOG_TRACE to all domain level +# level: trace +# domain: core,pfcp,gtp,upf,event,tlv,mem,sock +# +logger: + file: /data/open5gs-upfd.log + level: info + +# +# upf: +# +# <PFCP Server> +# +# o PFCP Server(127.0.0.7:8805, ::1:8805) +# pfcp: +# - addr: 127.0.0.7 +# - addr: ::1 +# +# o PFCP-U Server(127.0.0.1:2152, [::1]:2152) +# pfcp: +# name: localhost +# +# <GTP-U Server>> +# +# o GTP-U Server(127.0.0.7:2152, [::1]:2152) +# gtpu: +# - addr: 127.0.0.7 +# - addr: ::1 +# +# o GTP-U Server(127.0.0.1:2152, [::1]:2152) +# gtpu: +# name: localhost +# +# o User Plane IP Resource information +# 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 +# gtpu: +# - addr: 10.4.128.21 +# advertise: 172.24.15.30 +# +# gtpu: +# - addr: 10.4.128.21 +# advertise: +# - 127.0.0.1 +# - ::1 +# +# gtpu: +# - addr: 10.4.128.21 +# advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org +# +# gtpu: +# - dev: ens3 +# advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org +# +# <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 +# +# 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 +# +# 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. +# +# 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. +# +# 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 +# +# 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 +# +upf: + pfcp: + - addr: 172.18.3.222 + gtpu: + - addr: 172.18.3.222 + port: 2152 + subnet: + - addr: 176.16.222.1/24 + dnn: internet + dev: ogstun + +# +# smf: +# +# <PFCP Client>> +# +# o PFCP Client(127.0.0.4:8805) +# +# pfcp: +# addr: 127.0.0.4 +# +smf: + pfcp: + - addr: 172.18.3.201 + +# +# parameter: +# +# o Number of output streams per SCTP associations. +# sctp_streams: 30 +# +# o Disable use of IPv4 addresses (only IPv6) +# no_ipv4: true +# +# o Disable use of IPv6 addresses (only IPv4) +# no_ipv6: true +# +# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. +# prefer_ipv4: true +# +parameter: + +# +# max: +# +# o Maximum Number of UE per AMF/MME +# ue: 1024 +# o Maximum Number of gNB/eNB per AMF/MME +# gnb: 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) +# +# o Message Wait Duration (3000 ms) +# message: +# duration: 3000 +time: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49 Gerrit-Change-Number: 27063 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: make: Add OPEN5GS_BRANCH build arg

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27062 ) Change subject: make: Add OPEN5GS_BRANCH build arg ...................................................................... make: Add OPEN5GS_BRANCH build arg Change-Id: I29f85a18f5629e50dc1db527e931a248ab69f8e4 --- M make/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/27062/1 diff --git a/make/Makefile b/make/Makefile index e314618..34d5d25 100644 --- a/make/Makefile +++ b/make/Makefile @@ -36,6 +36,7 @@ OSMO_SGSN_BRANCH?=master OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master +OPEN5GS_BRANCH?=main PULL?= UPSTREAM_DISTRO?=debian:bullseye DISTRO?=debian-bullseye @@ -112,6 +113,7 @@ --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ + --build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \ $(PULL) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ DOCKER_MINOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f2) ; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I29f85a18f5629e50dc1db527e931a248ab69f8e4 Gerrit-Change-Number: 27062 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Set up diameter for open5gs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 ) Change subject: ggsn: Set up diameter for open5gs ...................................................................... ggsn: Set up diameter for open5gs Change-Id: Iedadb98be2a2e851b75e4e67c22bca7047191fec --- M ggsn_tests/GGSN_Tests.ttcn M ggsn_tests/gen_links.sh M ggsn_tests/regen_makefile.sh 3 files changed, 77 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/27061/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 63e0696..b11e0af 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -31,9 +31,14 @@ import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; + import from DIAMETER_Types all; + import from DIAMETER_Templates all; + import from DIAMETER_Emulation all; + const integer GTP0_PORT := 3386; const integer GTP1C_PORT := 2123; const integer GTP1U_PORT := 2152; + const integer PCRF_PORT := 3868; type enumerated GGSN_Impl { GGSN_IMPL_OSMOCOM, @@ -118,6 +123,11 @@ port TELNETasp_PT GGSNVTY; var boolean use_gtpu_txseq := false; var boolean g_use_echo := false; + + /* emulated PCRF, used with m_ggsn_impl = GGSN_IMPL_OPEN5GS */ + var DIAMETER_Emulation_CT vc_DIAMETER; + port DIAMETER_PT DIAMETER_UNIT; + port DIAMETEREM_PROC_PT DIAMETER_PROC; } private function f_init_vty() runs on GT_CT { @@ -181,6 +191,36 @@ f_vty_transceive(GGSNVTY, "end"); } + friend function DiameterForwardUnitdataCallback(PDU_DIAMETER msg) + runs on DIAMETER_Emulation_CT return template PDU_DIAMETER { + DIAMETER_UNIT.send(msg); + return omit; + } + + friend function f_init_diameter(charstring id) runs on GT_CT { + var DIAMETEROps ops := { + create_cb := refers(DIAMETER_Emulation.ExpectedCreateCallback), + unitdata_cb := refers(DiameterForwardUnitdataCallback), + raw := true /* handler mode (single component for all IMSI)) */ + }; + var DIAMETER_conn_parameters pars := { + remote_ip := m_ggsn_ip_gtpc, + remote_sctp_port := -1, + local_ip := m_bind_ip_gtpc, + local_sctp_port := PCRF_PORT, + origin_host := "ttcn3ggsntest.localdomain", + origin_realm := "localdomain", + vendor_app_id := c_DIAMETER_3GPP_Gx_AID + }; + vc_DIAMETER := DIAMETER_Emulation_CT.create(id); + map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); + connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); + vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); + + f_diameter_wait_capability(DIAMETER_UNIT); + } + function f_init() runs on GT_CT { if (g_initialized == true) { return; @@ -208,6 +248,8 @@ f_init_vty(); f_vty_set_gpdu_txseq(use_gtpu_txseq); f_vty_enable_echo_interval(g_use_echo); + } else if (m_ggsn_impl == GGSN_IMPL_OPEN5GS) { + f_init_diameter(testcasename()); } } @@ -328,6 +370,28 @@ } } + private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { + var PDU_DIAMETER rx_dia; + [] DIAMETER_UNIT.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + DIAMETER_UNIT.send(ts_DIA_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + req_type, req_num)); + } + [] DIAMETER_UNIT.receive(PDU_DIAMETER:?) -> value rx_dia { + setverdict(fail, "Received unexpected DIAMETER ", rx_dia); + self.stop; + } + } + /* send a PDP context activation */ function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT { var Gtp1cUnitdata ud; @@ -339,6 +403,9 @@ g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); T_default.start; d := activate(pingpong()); + if (DIAMETER_PROC.checkstate("Connected")) { + as_DIA_CCR(INITIAL_REQUEST); + } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { f_handle_create_req(ctx, ud, exp_cause); @@ -393,6 +460,9 @@ f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx.teic_remote, ctx.nsapi, teardown_ind)); T_default.start; d := activate(pingpong()); + if (DIAMETER_PROC.checkstate("Connected")) { + as_DIA_CCR(TERMINATION_REQUEST); + } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud { if (ud.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue == expect_causevalue) { diff --git a/ggsn_tests/gen_links.sh b/ggsn_tests/gen_links.sh index f9bae1c..6626467 100755 --- a/ggsn_tests/gen_links.sh +++ b/ggsn_tests/gen_links.sh @@ -52,9 +52,14 @@ FILES="BSSGP_EncDec.cc BSSGP_Types.ttcn" gen_links $DIR $FILES +DIR=$BASEDIR/titan.ProtocolModules.DIAMETER_ProtocolModule_Generator/src +FILES="DIAMETER_EncDec.cc" +gen_links $DIR $FILES + DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn PAP_Types.ttcn " FILES+="GTP_CodecPort.ttcn GTP_CodecPort_CtrlFunct.ttcn GTP_CodecPort_CtrlFunctDef.cc GTP_Templates.ttcn Osmocom_Gb_Types.ttcn " +FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn DIAMETER_Templates.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " gen_links $DIR $FILES diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 7adbd0b..4bdc87a 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -5,6 +5,8 @@ FILES=" *.ttcn BSSGP_EncDec.cc + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iedadb98be2a2e851b75e4e67c22bca7047191fec Gerrit-Change-Number: 27061 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Add module parameter to run tests against open5gs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060 ) Change subject: ggsn: Add module parameter to run tests against open5gs ...................................................................... ggsn: Add module parameter to run tests against open5gs Change-Id: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/27060/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 634534f..63e0696 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -35,6 +35,11 @@ const integer GTP1C_PORT := 2123; const integer GTP1U_PORT := 2152; + type enumerated GGSN_Impl { + GGSN_IMPL_OSMOCOM, + GGSN_IMPL_OPEN5GS + }; + modulepar { /* Default IP addresses. May be overridden by GGSN_Tests configuration files. */ @@ -65,6 +70,8 @@ * The tests expect to be able to send ping packets between any two simulated MS within the same * address range. This requires IP forwarding to be enabled on the corresponding tun interfaces. */ + + GGSN_Impl m_ggsn_impl := GGSN_IMPL_OSMOCOM; } type set PdpContext { @@ -197,9 +204,11 @@ g_c_seq_nr := f_rnd_int(65535); g_d_seq_nr := f_rnd_int(65535); - f_init_vty(); - f_vty_set_gpdu_txseq(use_gtpu_txseq); - f_vty_enable_echo_interval(g_use_echo); + if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) { + f_init_vty(); + f_vty_set_gpdu_txseq(use_gtpu_txseq); + f_vty_enable_echo_interval(g_use_echo); + } } /* Altstep implementing responses to any incoming echo requests */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8 Gerrit-Change-Number: 27060 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in dahdi-linux[master]: contrib/jenkins.sh: new file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27059 ) Change subject: contrib/jenkins.sh: new file ...................................................................... contrib/jenkins.sh: new file Related: OS#5407 Change-Id: I904ab66a1ecd72492642ac2cc4cb102c7283c590 --- A contrib/jenkins.sh 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/59/27059/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..666a014 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,29 @@ +#!/bin/sh -ex + +DEFCONFIG="${DEFCONFIG:-x86_64_defconfig}" +TOPDIR="$(realpath "$(dirname "$(realpath "$0")")/..")" +KSRC="${KSRC:-$TOPDIR/../linux}" +JOBS="${JOBS:-9}" + +if ! [ -d "$KSRC" ]; then + set +x + echo "ERROR: KSRC does not exist: $KSRC" + echo "Let the KSRC env var point at a linux source tree and try again." + exit 1 +fi + +if ! [ -e "$KSRC/.config" ]; then + make -C "$KSRC" "$DEFCONFIG" +fi + +if [ "$KSRC/arch/x86/configs/$DEFCONFIG" -nt "$KSRC/.config" ]; then + set +x + echo "ERROR: .config inside kernel source tree is older than $DEFCONFIG" + echo "Move/delete/touch .config and try again." + exit 1 +fi + +git -C "$KSRC" log -1 --pretty="%t - %s" + +make -j "$JOBS" -C "$KSRC" modules_prepare +make -j "$JOBS" -C "$TOPDIR" KSRC="$KSRC" -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I904ab66a1ecd72492642ac2cc4cb102c7283c590 Gerrit-Change-Number: 27059 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 ) Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... PGW_Tests: f_start_prog(): redirect stdout/stderr to files This would allow us to see the output of a program being executed. Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Related: SYS#5602 --- M pgw/PGW_Tests.ttcn 1 file changed, 17 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 2bb0ddc..34090d2 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -23,6 +23,7 @@ charstring mp_local_hostname_c := "127.0.0.1"; charstring mp_local_hostname_u := "127.0.0.1"; + charstring mp_run_prog_log_path := "/tmp"; charstring mp_run_prog_as_user := "laforge"; charstring mp_ping_hostname := "10.45.0.1"; @@ -394,7 +395,8 @@ } /* start a program on the user plane side; return its PID */ -private function f_start_prog(charstring command) runs on PGW_Session_CT return integer +private function f_start_prog(charstring command, boolean redirect_output := true) +runs on PGW_Session_CT return integer { var UECUPS_StartProgram sprog := { command := command, @@ -402,6 +404,14 @@ run_as_user := mp_run_prog_as_user, tun_netns_name := g_pars.tun_netns_name }; + + /* Redirect stdout/stderr to the user-specified location */ + if (redirect_output) { + var charstring prefix := mp_run_prog_log_path & "/" & testcasename(); + sprog.command := sprog.command & " 1>>" & prefix & ".prog.stdout"; + sprog.command := sprog.command & " 2>>" & prefix & ".prog.stderr"; + } + log("Starting a program: ", command); var UECUPS_StartProgramRes res := f_gtp2_start_program(sprog); if (res.result != OK) { @@ -432,9 +442,13 @@ } /* execute a program and wait for result */ -private function f_start_prog_wait(charstring command, template integer exit_code := 0, float tout := 10.0) runs on PGW_Session_CT +private function f_start_prog_wait(charstring command, + template integer exit_code := 0, + float tout := 10.0, + boolean redirect_output := true) +runs on PGW_Session_CT { - var integer pid := f_start_prog(command); + var integer pid := f_start_prog(command, redirect_output); f_wait_term(pid, exit_code, tout); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 ) Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:07:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 ) Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... icE1usb: Move GPS-DO USB control to separate USB interface doing so significantly simplifies the development of a Linux kernel driver, as the GPS-DO only exists once (not twice, like the per-E1-line interface), and Linux kernel USB drivers typically are for an interface. There is an option to write a usb_device_driver, but doing so will exclude the per-interface drivers from still being probed in their usual fashion. While we introduce this new USB Interface for the GPS-DO, we also move the related control endpoint requests from the device level to the interface level. Finally, some naming inconsistency between "enum ice1usb_gpsdo_antenna_state" vs. the member name antenna_status is resolved. Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 --- M firmware/ice40-riscv/icE1usb/Makefile M firmware/ice40-riscv/icE1usb/fw_app.c M firmware/ice40-riscv/icE1usb/gpsdo.c M firmware/ice40-riscv/icE1usb/ice1usb_proto.h M firmware/ice40-riscv/icE1usb/usb_desc_app.c M firmware/ice40-riscv/icE1usb/usb_desc_ids.h M firmware/ice40-riscv/icE1usb/usb_dev.c A firmware/ice40-riscv/icE1usb/usb_gpsdo.c A firmware/ice40-riscv/icE1usb/usb_gpsdo.h M firmware/ice40-riscv/icE1usb/usb_str_app.txt 10 files changed, 172 insertions(+), 82 deletions(-) Approvals: Jenkins Builder: Verified tnt: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index 25c65d1..ed765f6 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -56,6 +56,7 @@ usb_dev.h \ usb_e1.h \ usb_gps.h \ + usb_gpsdo.h \ usb_str_app.gen.h \ $(NULL) @@ -69,6 +70,7 @@ usb_dev.c \ usb_e1.c \ usb_gps.c \ + usb_gpsdo.c \ $(NULL) diff --git a/firmware/ice40-riscv/icE1usb/fw_app.c b/firmware/ice40-riscv/icE1usb/fw_app.c index c1fe295..540eda2 100644 --- a/firmware/ice40-riscv/icE1usb/fw_app.c +++ b/firmware/ice40-riscv/icE1usb/fw_app.c @@ -23,6 +23,7 @@ #include "usb_dev.h" #include "usb_e1.h" #include "usb_gps.h" +#include "usb_gpsdo.h" #include "utils.h" @@ -109,6 +110,7 @@ usb_dfu_rt_init(); usb_e1_init(); usb_gps_init(); + usb_gpsdo_init(); /* Start */ led_state(true); diff --git a/firmware/ice40-riscv/icE1usb/gpsdo.c b/firmware/ice40-riscv/icE1usb/gpsdo.c index ae131d4..8e32627 100644 --- a/firmware/ice40-riscv/icE1usb/gpsdo.c +++ b/firmware/ice40-riscv/icE1usb/gpsdo.c @@ -96,7 +96,7 @@ }; status->state = state_map[g_gpsdo.state]; - status->antenna_status = ant_map[gps_antenna_status()]; + status->antenna_state = ant_map[gps_antenna_status()]; status->valid_fix = gps_has_valid_fix(); status->mode = (g_gpsdo.state == STATE_DISABLED) ? ICE1USB_GPSDO_MODE_DISABLED : ICE1USB_GPSDO_MODE_AUTO; status->tune.coarse = g_gpsdo.tune.coarse; diff --git a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h index a249537..3170d55 100644 --- a/firmware/ice40-riscv/icE1usb/ice1usb_proto.h +++ b/firmware/ice40-riscv/icE1usb/ice1usb_proto.h @@ -17,17 +17,22 @@ /*! returns a bit-mask of optional device capabilities (see enum e1usb_dev_capability) */ #define ICE1USB_DEV_GET_CAPABILITIES 0x01 #define ICE1USB_DEV_GET_FW_BUILD 0x02 -#define ICE1USB_DEV_GET_GPSDO_STATUS 0x10 -#define ICE1USB_DEV_GET_GPSDO_MODE 0x12 /*!< uint8_t */ -#define ICE1USB_DEV_SET_GPSDO_MODE 0x13 /*!< wValue = mode */ -#define ICE1USB_DEV_GET_GPSDO_TUNE 0x14 /*!< data = struct e1usb_gpsdo_tune */ -#define ICE1USB_DEV_SET_GPSDO_TUNE 0x15 /*!< data = struct e1usb_gpsdo_tune */ enum e1usb_dev_capability { /*! Does this board have a GPS-DO */ ICE1USB_DEV_CAP_GPSDO, }; +/*********************************************************************** + * Control Endpoint / GPS-DO Interface Requests + ***********************************************************************/ + +#define ICE1USB_INTF_GET_GPSDO_STATUS 0x10 +#define ICE1USB_INTF_GET_GPSDO_MODE 0x12 /*!< uint8_t */ +#define ICE1USB_INTF_SET_GPSDO_MODE 0x13 /*!< wValue = mode */ +#define ICE1USB_INTF_GET_GPSDO_TUNE 0x14 /*!< data = struct e1usb_gpsdo_tune */ +#define ICE1USB_INTF_SET_GPSDO_TUNE 0x15 /*!< data = struct e1usb_gpsdo_tune */ + enum ice1usb_gpsdo_mode { ICE1USB_GPSDO_MODE_DISABLED = 0, ICE1USB_GPSDO_MODE_AUTO = 1, @@ -55,7 +60,7 @@ struct e1usb_gpsdo_status { uint8_t state; - uint8_t antenna_status; /*!< Antenna status */ + uint8_t antenna_state; /*!< Antenna state */ uint8_t valid_fix; /*!< Valid GPS Fix (0/1) */ uint8_t mode; /*!< Current configured operating mode */ struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */ @@ -63,7 +68,9 @@ } __attribute__((packed)); -/* Interface Requests */ +/*********************************************************************** + * Control Endpoint / E1 Interface Requests + ***********************************************************************/ /*! returns a bit-mask of optional device capabilities (see enum e1usb_intf_capability) */ #define ICE1USB_INTF_GET_CAPABILITIES 0x01 diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c index e0edf80..25472e0 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c +++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c @@ -53,6 +53,11 @@ struct usb_ep_desc ep_data_in; } __attribute__ ((packed)) cdc; + /* GPS-DO (control EP only) */ + struct { + struct usb_intf_desc intf; + } __attribute__ ((packed)) gpsdo; + /* DFU Runtime */ struct { struct usb_intf_desc intf; @@ -275,6 +280,19 @@ .bInterval = 0x00, }, }, + .gpsdo = { + .intf = { + .bLength = sizeof(struct usb_intf_desc), + .bDescriptorType = USB_DT_INTF, + .bInterfaceNumber = USB_INTF_GPSDO, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = 0xff, + .bInterfaceSubClass = 0xe1, + .bInterfaceProtocol = 0xd0, + .iInterface = 11, + } + }, .dfu = { .intf = { .bLength = sizeof(struct usb_intf_desc), @@ -285,7 +303,7 @@ .bInterfaceClass = 0xfe, .bInterfaceSubClass = 0x01, .bInterfaceProtocol = 0x01, - .iInterface = 11, + .iInterface = 12, }, .func = { .bLength = sizeof(struct usb_dfu_func_desc), diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h index dadf4c6..192092e 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_ids.h +++ b/firmware/ice40-riscv/icE1usb/usb_desc_ids.h @@ -10,8 +10,9 @@ #define USB_INTF_E1(p) (0 + (p)) #define USB_INTF_GPS_CDC_CTL 2 #define USB_INTF_GPS_CDC_DATA 3 -#define USB_INTF_DFU 4 -#define USB_INTF_NUM 5 +#define USB_INTF_GPSDO 4 +#define USB_INTF_DFU 5 +#define USB_INTF_NUM 6 #define USB_EP_E1_IN(p) (0x82 + (3 * (p))) #define USB_EP_E1_OUT(p) (0x01 + (3 * (p))) diff --git a/firmware/ice40-riscv/icE1usb/usb_dev.c b/firmware/ice40-riscv/icE1usb/usb_dev.c index 2997a33..e19d9a0 100644 --- a/firmware/ice40-riscv/icE1usb/usb_dev.c +++ b/firmware/ice40-riscv/icE1usb/usb_dev.c @@ -12,7 +12,6 @@ #include <no2usb/usb_proto.h> #include "console.h" -#include "gpsdo.h" #include "misc.h" #include "ice1usb_proto.h" @@ -21,61 +20,6 @@ const char *fw_build_str = BUILD_INFO; -static void -_get_gpsdo_status(struct usb_ctrl_req *req, struct usb_xfer *xfer) -{ - struct e1usb_gpsdo_status status; - - gpsdo_get_status(&status); - - memcpy(xfer->data, &status, sizeof(struct e1usb_gpsdo_status)); - xfer->len = sizeof(struct e1usb_gpsdo_status); -} - -static void -_get_gpsdo_mode(struct usb_ctrl_req *req, struct usb_xfer *xfer) -{ - xfer->data[0] = gpsdo_enabled() ? ICE1USB_GPSDO_MODE_DISABLED : ICE1USB_GPSDO_MODE_AUTO; - xfer->len = 1; -} - -static void -_set_gpsdo_mode(struct usb_ctrl_req *req, struct usb_xfer *xfer) -{ - gpsdo_enable(req->wValue != ICE1USB_GPSDO_MODE_DISABLED); -} - -static void -_get_gpsdo_tune(struct usb_ctrl_req *req, struct usb_xfer *xfer) -{ - uint16_t coarse, fine; - struct e1usb_gpsdo_tune tune; - - gpsdo_get_tune(&coarse, &fine); - tune.coarse = coarse; - tune.fine = fine; - - memcpy(xfer->data, &tune, sizeof(struct e1usb_gpsdo_tune)); - xfer->len = sizeof(struct e1usb_gpsdo_tune); -} - -static bool -_set_gpsdo_tune_done(struct usb_xfer *xfer) -{ - const struct e1usb_gpsdo_tune *tune = (const void *) xfer->data; - gpsdo_set_tune(tune->coarse, tune->fine); - return true; -} - -static void -_set_gpsdo_tune(struct usb_ctrl_req *req, struct usb_xfer *xfer) -{ - xfer->cb_done = _set_gpsdo_tune_done; - xfer->cb_ctx = req; - xfer->len = sizeof(struct e1usb_gpsdo_tune); -} - - static enum usb_fnd_resp _usb_dev_ctrl_req(struct usb_ctrl_req *req, struct usb_xfer *xfer) { @@ -93,21 +37,6 @@ xfer->data = (void*) fw_build_str; xfer->len = strlen(fw_build_str); break; - case ICE1USB_DEV_GET_GPSDO_STATUS: - _get_gpsdo_status(req, xfer); - break; - case ICE1USB_DEV_GET_GPSDO_MODE: - _get_gpsdo_mode(req, xfer); - break; - case ICE1USB_DEV_SET_GPSDO_MODE: - _set_gpsdo_mode(req, xfer); - break; - case ICE1USB_DEV_GET_GPSDO_TUNE: - _get_gpsdo_tune(req, xfer); - break; - case ICE1USB_DEV_SET_GPSDO_TUNE: - _set_gpsdo_tune(req, xfer); - break; default: return USB_FND_ERROR; } diff --git a/firmware/ice40-riscv/icE1usb/usb_gpsdo.c b/firmware/ice40-riscv/icE1usb/usb_gpsdo.c new file mode 100644 index 0000000..4dd8913 --- /dev/null +++ b/firmware/ice40-riscv/icE1usb/usb_gpsdo.c @@ -0,0 +1,120 @@ +/* + * usb_gpsdo.c + * + * Copyright (C) 2019-2022 Sylvain Munaut <tnt(a)246tNt.com> + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#include <stdint.h> +#include <stdbool.h> +#include <string.h> + +#include <no2usb/usb.h> +#include <no2usb/usb_hw.h> +#include <no2usb/usb_priv.h> + +#include <no2usb/usb_proto.h> + +#include "usb_desc_ids.h" +#include "gpsdo.h" + +#include "ice1usb_proto.h" + +static void +_get_gpsdo_status(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + struct e1usb_gpsdo_status status; + + gpsdo_get_status(&status); + + memcpy(xfer->data, &status, sizeof(struct e1usb_gpsdo_status)); + xfer->len = sizeof(struct e1usb_gpsdo_status); +} + +static void +_get_gpsdo_mode(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + xfer->data[0] = gpsdo_enabled() ? ICE1USB_GPSDO_MODE_DISABLED : ICE1USB_GPSDO_MODE_AUTO; + xfer->len = 1; +} + +static void +_set_gpsdo_mode(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + gpsdo_enable(req->wValue != ICE1USB_GPSDO_MODE_DISABLED); +} + +static void +_get_gpsdo_tune(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + uint16_t coarse, fine; + struct e1usb_gpsdo_tune tune; + + gpsdo_get_tune(&coarse, &fine); + tune.coarse = coarse; + tune.fine = fine; + + memcpy(xfer->data, &tune, sizeof(struct e1usb_gpsdo_tune)); + xfer->len = sizeof(struct e1usb_gpsdo_tune); +} + +static bool +_set_gpsdo_tune_done(struct usb_xfer *xfer) +{ + const struct e1usb_gpsdo_tune *tune = (const void *) xfer->data; + gpsdo_set_tune(tune->coarse, tune->fine); + return true; +} + +static void +_set_gpsdo_tune(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + xfer->cb_done = _set_gpsdo_tune_done; + xfer->cb_ctx = req; + xfer->len = sizeof(struct e1usb_gpsdo_tune); +} + + +static enum usb_fnd_resp +_gpsdo_ctrl_req(struct usb_ctrl_req *req, struct usb_xfer *xfer) +{ + /* Check it's for an interface */ + if (USB_REQ_TYPE_RCPT(req) != (USB_REQ_TYPE_VENDOR | USB_REQ_RCPT_INTF)) + return USB_FND_CONTINUE; + + /* Check it's for the GPS-DO interface */ + if (req->wIndex != USB_INTF_GPSDO) + return USB_FND_CONTINUE; + + switch (req->bRequest) { + case ICE1USB_INTF_GET_GPSDO_STATUS: + _get_gpsdo_status(req, xfer); + break; + case ICE1USB_INTF_GET_GPSDO_MODE: + _get_gpsdo_mode(req, xfer); + break; + case ICE1USB_INTF_SET_GPSDO_MODE: + _set_gpsdo_mode(req, xfer); + break; + case ICE1USB_INTF_GET_GPSDO_TUNE: + _get_gpsdo_tune(req, xfer); + break; + case ICE1USB_INTF_SET_GPSDO_TUNE: + _set_gpsdo_tune(req, xfer); + break; + default: + return USB_FND_ERROR; + } + + return USB_FND_SUCCESS; +} + +static struct usb_fn_drv _gpsdo_drv = { + .ctrl_req = _gpsdo_ctrl_req, +}; + +void +usb_gpsdo_init(void) +{ + usb_register_function_driver(&_gpsdo_drv); +} diff --git a/firmware/ice40-riscv/icE1usb/usb_gpsdo.h b/firmware/ice40-riscv/icE1usb/usb_gpsdo.h new file mode 100644 index 0000000..4cf4203 --- /dev/null +++ b/firmware/ice40-riscv/icE1usb/usb_gpsdo.h @@ -0,0 +1,10 @@ +/* + * usb_gpsdo.h + * + * Copyright (C) 2022 Harald Welte <laforge(a)osmocom.org> + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#pragma once + +void usb_gpsdo_init(void); diff --git a/firmware/ice40-riscv/icE1usb/usb_str_app.txt b/firmware/ice40-riscv/icE1usb/usb_str_app.txt index 3aa6b4a..5f062d3 100644 --- a/firmware/ice40-riscv/icE1usb/usb_str_app.txt +++ b/firmware/ice40-riscv/icE1usb/usb_str_app.txt @@ -8,4 +8,5 @@ E1 port 1 GPS (CDC control) GPS (CDC data) +GPS-DO control DFU runtime -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-e1-hardware[master]: icE1usb: Move GPS-DO USB control to separate USB interface

by laforge

Attention is currently required from: roox, roh. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 ) Change subject: icE1usb: Move GPS-DO USB control to separate USB interface ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254 Gerrit-Change-Number: 27017 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: roh <jsteiger(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:04:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 ) Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:04:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: remove both setup.sh and pgw.sh

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 ) Change subject: open5gs-master: remove both setup.sh and pgw.sh ...................................................................... open5gs-master: remove both setup.sh and pgw.sh Having these scripts makes no sense anymore, because: * setup.sh was moved to ttcn3-pgw-test, * pgw.sh runs non-existing open5gs-pgwd. Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Related: SYS#5602 --- M open5gs-master/Dockerfile D open5gs-master/pgw.sh D open5gs-master/setup.sh 3 files changed, 0 insertions(+), 18 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 141f08a..35385d7 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -47,9 +47,6 @@ net-tools && \ apt-get clean -COPY setup.sh /root -COPY pgw.sh /root - # crate user ARG username=osmocom RUN useradd -m --uid=1000 ${username} && \ diff --git a/open5gs-master/pgw.sh b/open5gs-master/pgw.sh deleted file mode 100755 index 3286256..0000000 --- a/open5gs-master/pgw.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -e -set -x -/root/setup.sh -su - osmocom -c "open5gs-pgwd $*" diff --git a/open5gs-master/setup.sh b/open5gs-master/setup.sh deleted file mode 100755 index 58693fd..0000000 --- a/open5gs-master/setup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if ! grep "ogstun" /proc/net/dev > /dev/null; then - ip tuntap add name ogstun mode tun -fi -ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null -ip addr add 10.45.0.1/16 dev ogstun -ip addr del cafe::1/64 dev ogstun 2> /dev/null -ip addr add cafe::1/64 dev ogstun -ip link set ogstun up -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Gerrit-Change-Number: 27057 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 ) Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd ...................................................................... ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd Unlike osmo-ggsn, open5gs-upfd does not configure the tun interface itself. All IPv4/IPv6 addresses must be assigned manually. This is exactly why both PGW_Tests.TC_createSession_ping4[_256] fail: [sock] ERROR: ogs_write() failed (5:Input/outputerror) (../lib/tun/tunio.c:84) [upf] WARNING: ogs_tun_write() failed (../src/upf/gtp-path.c:448) Take Harald's setup.sh from open5gs-master and execute it in the container running open5gs-upfd. This fixes the ogs_write() errors. Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh A ttcn3-pgw-test/ogstun-setup.sh 2 files changed, 14 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 662e49b..bd6967c 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -16,6 +16,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ +cp ogstun-setup.sh $VOL_BASE_DIR/pgw/ SUBNET=18 network_create $SUBNET @@ -43,6 +44,9 @@ $REPO_USER/open5gs-$IMAGE_SUFFIX \ open5gs-upfd -c /data/open5gs-upf.yaml +# configure the 'ogstun' device for open5gs-upfd +docker exec ${BUILD_TAG}-upf /data/ogstun-setup.sh + # start container with open5gs-smfd in background docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ diff --git a/ttcn3-pgw-test/ogstun-setup.sh b/ttcn3-pgw-test/ogstun-setup.sh new file mode 100755 index 0000000..58693fd --- /dev/null +++ b/ttcn3-pgw-test/ogstun-setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if ! grep "ogstun" /proc/net/dev > /dev/null; then + ip tuntap add name ogstun mode tun +fi +ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null +ip addr add 10.45.0.1/16 dev ogstun +ip addr del cafe::1/64 dev ogstun 2> /dev/null +ip addr add cafe::1/64 dev ogstun +ip link set ogstun up -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Gerrit-Change-Number: 27056 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: remove both setup.sh and pgw.sh

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 ) Change subject: open5gs-master: remove both setup.sh and pgw.sh ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Gerrit-Change-Number: 27057 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:03:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 ) Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Gerrit-Change-Number: 27056 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:03:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: remove both setup.sh and pgw.sh

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 ) Change subject: open5gs-master: remove both setup.sh and pgw.sh ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Gerrit-Change-Number: 27057 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:03:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: log: socket.c: rather use the osmo_sockaddr_str _FMT

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27024 ) Change subject: log: socket.c: rather use the osmo_sockaddr_str _FMT ...................................................................... Patch Set 2: (1 comment) File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/27024/comment/28d78a66_da7bd42a PS1, Line 488: osmo_strlcpy(dest->ip, "Invalid IP", 11); \ > (dest)->ip yes, this is criticial to fix before merge. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbe7582b2b7f14540919e911dad08af6d491f68f Gerrit-Change-Number: 27024 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:03:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: add osmo_quote_str_buf3, osmo_escape_str_buf3

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27025 ) Change subject: add osmo_quote_str_buf3, osmo_escape_str_buf3 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I05d75a40599e3133da099a11e8babaaad0e9493a Gerrit-Change-Number: 27025 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:02:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: add osmo_sockaddr_from/to_octets()

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27050 ) Change subject: add osmo_sockaddr_from/to_octets() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81 Gerrit-Change-Number: 27050 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 12:01:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit RATType in CreatePDPContextReq

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 ) Change subject: ggsn: Submit RATType in CreatePDPContextReq ...................................................................... ggsn: Submit RATType in CreatePDPContextReq According to TS 29.060, sec 7.3.1 Create PDP Context Request: "The SGSN shall include the RAT Type IE during Primary PDP Context Activation procedure." Change-Id: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 26 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index a0c7b16..28e34e9 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -83,7 +83,8 @@ /* TEI (Data) remote side */ OCT4 teid_remote, /* TEI (Control) remote side */ - OCT4 teic_remote + OCT4 teic_remote, + OCT1 ratType optional } type component GT_CT { @@ -236,7 +237,7 @@ /* define an (internal) representation of a PDP context */ template PdpContext t_DefinePDP(hexstring imsi, octetstring msisdn, octetstring apn, - EndUserAddress eua) := { + EndUserAddress eua, OCT1 ratType := '02'O /* GERAN */) := { imsi := imsi, msisdn := msisdn, nsapi := f_rnd_nsapi(), @@ -244,7 +245,8 @@ pco_req := omit, eua := eua, teid := f_rnd_tei(), - teic := f_rnd_tei() + teic := f_rnd_tei(), + ratType := ratType } /* send GTP-C for a given context and increment sequence number */ @@ -316,7 +318,7 @@ log("sending CreatePDP"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, - g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req)); + g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType)); T_default.start; d := activate(pingpong()); alt { diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 9c8d1b6..94f327e 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -287,10 +287,25 @@ padding := 'F'H } + function f_ts_RATType(template (omit) OCT1 ratType := omit) return template (omit) RATType { + var template (omit) RATType rt; + if (istemplatekind(ratType, "omit")) { + rt := omit; + } else { + rt := { + type_gtpc := '97'O, + lengthf := 1, + ratTypeValue := ratType + }; + } + return rt; + } + template GTPC_PDUs ts_CreatePdpPDU(hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, - octetstring msisdn, template ProtConfigOptions pco := omit) := { + octetstring msisdn, template ProtConfigOptions pco := omit, + template (omit) OCT1 ratType := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -329,7 +344,7 @@ omcId := omit, commonFlags := omit, aPN_Restriction := omit, - ratType := omit, + ratType := f_ts_RATType(ratType), userLocationInformation := omit, mS_TimeZone := omit, imeisv := omit, @@ -351,12 +366,13 @@ OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, - template ProtConfigOptions pco := omit) := { + template ProtConfigOptions pco := omit, + template (omit) OCT1 ratType := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco)), seq) + sgsn_ip_data, msisdn, pco, ratType)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a Gerrit-Change-Number: 27051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit User Location Information in CreatePDPContextReq

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 ) Change subject: ggsn: Submit User Location Information in CreatePDPContextReq ...................................................................... ggsn: Submit User Location Information in CreatePDPContextReq According to TS 29.060, sec 7.3.1 Create PDP Context Request: """ The SGSN shall include the User Location Information IE in the PDP Context Activation procedure. The SGSN shall include the CGI or SAI in the "Geographic Location" field of the User Location Information IE depending on whether the MS is in a cell or a service area respectively. """ Change-Id: Iaea95e5779d4f878023ce3f160ac69f092452056 --- M ggsn_tests/GGSN_Tests.ttcn M library/GTP_Templates.ttcn 2 files changed, 34 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 28e34e9..634534f 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -84,7 +84,8 @@ OCT4 teid_remote, /* TEI (Control) remote side */ OCT4 teic_remote, - OCT1 ratType optional + OCT1 ratType optional, + UserLocationInformation uli optional } type component GT_CT { @@ -246,7 +247,15 @@ eua := eua, teid := f_rnd_tei(), teic := f_rnd_tei(), - ratType := ratType + ratType := ratType, + uli := { + type_gtpc := '98'O, + lengthf := 0 /* filled in by encoder */, + geographicLocationType := '00'O /* CGI */, + geographicLocation := { + geographicLocationCGI := ts_GeographicLocationCGI('262'H, '42F'H, '0001'O, '0002'O) + } + } } /* send GTP-C for a given context and increment sequence number */ @@ -318,7 +327,7 @@ log("sending CreatePDP"); f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx.imsi, g_restart_ctr, ctx.teid, ctx.teic, ctx.nsapi, ctx.eua, ctx.apn, - g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType)); + g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); T_default.start; d := activate(pingpong()); alt { diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 94f327e..8f6098a 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -301,11 +301,28 @@ return rt; } + template (value) GeographicLocationCGI + ts_GeographicLocationCGI(template (value) hexstring mcc, + template (value) hexstring mnc, + template (value) OCT2 lac, + template (value) OCT2 cI_value) := + { + mccDigit1 := mcc[0], + mccDigit2 := mcc[1], + mccDigit3 := mcc[2], + mncDigit3 := mnc[2], /* 'F'H for 2 digit MNC */ + mncDigit1 := mnc[0], + mncDigit2 := mnc[1], + lac := lac, + cI_value := cI_value + } + template GTPC_PDUs ts_CreatePdpPDU(hexstring imsi, OCT1 restart_ctr, OCT4 teid_data, OCT4 teid_ctrl, BIT4 nsapi, EndUserAddress eua, octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, - template (omit) OCT1 ratType := omit) := { + template (omit) OCT1 ratType := omit, + template (omit) UserLocationInformation uli := omit) := { createPDPContextRequest := { imsi := ts_Imsi(imsi), rai := omit, @@ -345,7 +362,7 @@ commonFlags := omit, aPN_Restriction := omit, ratType := f_ts_RATType(ratType), - userLocationInformation := omit, + userLocationInformation := uli, mS_TimeZone := omit, imeisv := omit, camelChargingInformationContainer := omit, @@ -367,12 +384,13 @@ octetstring apn, octetstring sgsn_ip_sign, octetstring sgsn_ip_data, octetstring msisdn, template ProtConfigOptions pco := omit, - template (omit) OCT1 ratType := omit) := { + template (omit) OCT1 ratType := omit, + template (omit) UserLocationInformation uli := omit) := { peer := peer, gtpc := ts_GTP1C_PDU(createPDPContextRequest, '00000000'O, valueof(ts_CreatePdpPDU(imsi, restart_ctr, teid_data, teid_ctrl, nsapi, eua, apn, sgsn_ip_sign, - sgsn_ip_data, msisdn, pco, ratType)), seq) + sgsn_ip_data, msisdn, pco, ratType, uli)), seq) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaea95e5779d4f878023ce3f160ac69f092452056 Gerrit-Change-Number: 27052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit User Location Information in CreatePDPContextReq

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 ) Change subject: ggsn: Submit User Location Information in CreatePDPContextReq ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaea95e5779d4f878023ce3f160ac69f092452056 Gerrit-Change-Number: 27052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 11:58:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit User Location Information in CreatePDPContextReq

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 ) Change subject: ggsn: Submit User Location Information in CreatePDPContextReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaea95e5779d4f878023ce3f160ac69f092452056 Gerrit-Change-Number: 27052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 11:56:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > So the linter suggests the following: […] I guess you could use the do - while loop, and add a semicolon at the end for compatibility: #define OSMO_ASSERT(exp) \ do { \ if (!OSMO_LIKELY(exp)) { \ osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \ } \ } while (0); IMHO this check is really useful in other cases (not here, because the whole macro is inside an if, thus it shouldn't lead to if-else logic defects as described here https://stackoverflow.com/a/9496007). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 2 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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 11:54:50 +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

Change in osmo-ttcn3-hacks[master]: ggsn: Submit RATType in CreatePDPContextReq

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 ) Change subject: ggsn: Submit RATType in CreatePDPContextReq ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a Gerrit-Change-Number: 27051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 11:36:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit User Location Information in CreatePDPContextReq

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 ) Change subject: ggsn: Submit User Location Information in CreatePDPContextReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaea95e5779d4f878023ce3f160ac69f092452056 Gerrit-Change-Number: 27052 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 11:27:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Submit RATType in CreatePDPContextReq

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 ) Change subject: ggsn: Submit RATType in CreatePDPContextReq ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibc57798e50ccd08ef6126f75f7c8134e56d2778a Gerrit-Change-Number: 27051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 11:26:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/registry-update-base-images: centos8 -> alma

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27058 ) Change subject: jobs/registry-update-base-images: centos8 -> alma ...................................................................... jobs/registry-update-base-images: centos8 -> alma Follow up on the change of using almalinux instead of centos8 in docker-playground, with providing the almalinux base images in the Osmocom registry. Related: SYS#5818 Related: docker-playground I30e1a773b901b1d2187214445116c7f2aecc4e36 Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a --- M jobs/registry-update-base-images.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index 1e5e423..328dbf6 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -26,7 +26,7 @@ ubuntu:zesty centos:centos7 - centos:centos8 + almalinux:8 " for i in $IMAGES; do src=$i -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a Gerrit-Change-Number: 27058 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/registry-update-base-images: centos8 -> alma

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27058 ) Change subject: jobs/registry-update-base-images: centos8 -> alma ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a Gerrit-Change-Number: 27058 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 10:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 ) Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 10:36:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by fixeria

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 to look at the new patch set (#2). Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... PGW_Tests: f_start_prog(): redirect stdout/stderr to files This would allow us to see the output of a program being executed. Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Related: SYS#5602 --- M pgw/PGW_Tests.ttcn 1 file changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/27054/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 ) Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... Patch Set 1: (1 comment) File pgw/PGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054/comment/750ea64d_f3fb… PS1, Line 408: var charstring prefix := mp_run_prog_log_path & "/" & testcasename(); > Better have this kind of modifiers to the passed command enabled conditionaly by a param passed to f […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 09:08:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/registry-update-base-images: centos8 -> alma

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27058 ) Change subject: jobs/registry-update-base-images: centos8 -> alma ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a Gerrit-Change-Number: 27058 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 08:45:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 ) Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Gerrit-Change-Number: 27056 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 08:45:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: remove both setup.sh and pgw.sh

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 ) Change subject: open5gs-master: remove both setup.sh and pgw.sh ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: ack, I also copied them & modified them in ttcn3-ggsn-test/ogs/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Gerrit-Change-Number: 27057 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 08:44:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: PGW_Tests: f_start_prog(): redirect stdout/stderr to files

by pespin

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 ) Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files ...................................................................... Patch Set 1: (1 comment) File pgw/PGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054/comment/502ad171_85db… PS1, Line 408: var charstring prefix := mp_run_prog_log_path & "/" & testcasename(); Better have this kind of modifiers to the passed command enabled conditionaly by a param passed to f_start_prog, for instance: bool redirect_output -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Gerrit-Change-Number: 27054 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Feb 2022 08:43:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ci[master]: jobs/registry-update-base-images: centos8 -> alma

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27058 ) Change subject: jobs/registry-update-base-images: centos8 -> alma ...................................................................... jobs/registry-update-base-images: centos8 -> alma Follow up on the change of using almalinux instead of centos8 in docker-playground, with providing the almalinux base images in the Osmocom registry. Related: SYS#5818 Related: docker-playground I30e1a773b901b1d2187214445116c7f2aecc4e36 Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a --- M jobs/registry-update-base-images.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/27058/1 diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index 1e5e423..328dbf6 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -26,7 +26,7 @@ ubuntu:zesty centos:centos7 - centos:centos8 + almalinux:8 " for i in $IMAGES; do src=$i -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a Gerrit-Change-Number: 27058 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/27056 ) Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd ...................................................................... ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd Unlike osmo-ggsn, open5gs-upfd does not configure the tun interface itself. All IPv4/IPv6 addresses must be assigned manually. This is exactly why both PGW_Tests.TC_createSession_ping4[_256] fail: [sock] ERROR: ogs_write() failed (5:Input/outputerror) (../lib/tun/tunio.c:84) [upf] WARNING: ogs_tun_write() failed (../src/upf/gtp-path.c:448) Take Harald's setup.sh from open5gs-master and execute it in the container running open5gs-upfd. This fixes the ogs_write() errors. Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh A ttcn3-pgw-test/ogstun-setup.sh 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/27056/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Gerrit-Change-Number: 27056 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: remove both setup.sh and pgw.sh

by fixeria

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/27057 ) Change subject: open5gs-master: remove both setup.sh and pgw.sh ...................................................................... open5gs-master: remove both setup.sh and pgw.sh Having these scripts makes no sense anymore, because: * setup.sh was moved to ttcn3-pgw-test, * pgw.sh runs non-existing open5gs-pgwd. Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Related: SYS#5602 --- M open5gs-master/Dockerfile D open5gs-master/pgw.sh D open5gs-master/setup.sh 3 files changed, 0 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/27057/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Gerrit-Change-Number: 27057 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 ) Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd ...................................................................... ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd Unlike osmo-ggsn, open5gs-upfd does not configure the tun interface itself. All IPv4/IPv6 addresses must be assigned manually. This is exactly why both PGW_Tests.TC_createSession_ping4[_256] fail: [sock] ERROR: ogs_write() failed (5:Input/outputerror) (../lib/tun/tunio.c:84) [upf] WARNING: ogs_tun_write() failed (../src/upf/gtp-path.c:448) Take Harald's setup.sh from open5gs-master and execute it in the container running open5gs-upfd. This makes both test cases pass. Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Related: SYS#5602 --- M ttcn3-pgw-test/jenkins.sh A ttcn3-pgw-test/ogstun-setup.sh 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/27056/1 diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 662e49b..bd6967c 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -16,6 +16,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ +cp ogstun-setup.sh $VOL_BASE_DIR/pgw/ SUBNET=18 network_create $SUBNET @@ -43,6 +44,9 @@ $REPO_USER/open5gs-$IMAGE_SUFFIX \ open5gs-upfd -c /data/open5gs-upf.yaml +# configure the 'ogstun' device for open5gs-upfd +docker exec ${BUILD_TAG}-upf /data/ogstun-setup.sh + # start container with open5gs-smfd in background docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ diff --git a/ttcn3-pgw-test/ogstun-setup.sh b/ttcn3-pgw-test/ogstun-setup.sh new file mode 100755 index 0000000..58693fd --- /dev/null +++ b/ttcn3-pgw-test/ogstun-setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if ! grep "ogstun" /proc/net/dev > /dev/null; then + ip tuntap add name ogstun mode tun +fi +ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null +ip addr add 10.45.0.1/16 dev ogstun +ip addr del cafe::1/64 dev ogstun 2> /dev/null +ip addr add cafe::1/64 dev ogstun +ip link set ogstun up -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f Gerrit-Change-Number: 27056 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: remove both setup.sh and pgw.sh

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 ) Change subject: open5gs-master: remove both setup.sh and pgw.sh ...................................................................... open5gs-master: remove both setup.sh and pgw.sh Having these scripts makes no sense anymore, because: * setup.sh was moved to ttcn3-pgw-test, * pgw.sh runs non-existing open5gs-pgwd. Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Related: SYS#5602 --- M open5gs-master/Dockerfile D open5gs-master/pgw.sh D open5gs-master/setup.sh 3 files changed, 0 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/27057/1 diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 141f08a..35385d7 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -47,9 +47,6 @@ net-tools && \ apt-get clean -COPY setup.sh /root -COPY pgw.sh /root - # crate user ARG username=osmocom RUN useradd -m --uid=1000 ${username} && \ diff --git a/open5gs-master/pgw.sh b/open5gs-master/pgw.sh deleted file mode 100755 index 3286256..0000000 --- a/open5gs-master/pgw.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -e -set -x -/root/setup.sh -su - osmocom -c "open5gs-pgwd $*" diff --git a/open5gs-master/setup.sh b/open5gs-master/setup.sh deleted file mode 100755 index 58693fd..0000000 --- a/open5gs-master/setup.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if ! grep "ogstun" /proc/net/dev > /dev/null; then - ip tuntap add name ogstun mode tun -fi -ip addr del 10.45.0.1/16 dev ogstun 2> /dev/null -ip addr add 10.45.0.1/16 dev ogstun -ip addr del cafe::1/64 dev ogstun 2> /dev/null -ip addr add cafe::1/64 dev ogstun -ip link set ogstun up -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7 Gerrit-Change-Number: 27057 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros

by laforge

Attention is currently required from: osmith, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27046 ) Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: no commitlog rationale. does this really make sense in our use cases? did you see any benchmark differences? curious... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 17:47:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: lua dissector: adjust usage instructions

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27053 ) Change subject: lua dissector: adjust usage instructions ...................................................................... lua dissector: adjust usage instructions ...as originally described in the first commit that added the file. Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5 --- M contrib/simtrace.lua 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua index fa477d5..fadc01a 100644 --- a/contrib/simtrace.lua +++ b/contrib/simtrace.lua @@ -2,7 +2,10 @@ -- (C) 2021 by sysmocom - s.f.m.c. GmbH, Author: Eric Wild -- SPDX-License-Identifier: GPL-2.0+ -- --- Usage: Put this into your ~/.wireshark/init.lua [or include it from there] +-- Usage: Move this file to your "personal lua plugins" folder that +-- can be found in the Wireshark Help->About Wireshark->Folders tab +-- Windows: %APPDATA%\Wireshark\plugins. +-- Unix-like systems: ~/.local/lib/wireshark/plugins. usb_simtrace_protocol = Proto("USB_simtrace", "USB simtrace protocol") -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5 Gerrit-Change-Number: 27053 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in simtrace2[master]: lua dissector: adjust usage instructions

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27053 ) Change subject: lua dissector: adjust usage instructions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27053 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5 Gerrit-Change-Number: 27053 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 17:46:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: make osmo-uecups-daemon more verbose

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27044 ) Change subject: ttcn3-pgw-test: make osmo-uecups-daemon more verbose ...................................................................... ttcn3-pgw-test: make osmo-uecups-daemon more verbose Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0 Related: SYS#5602 --- M ttcn3-pgw-test/osmo-uecups-daemon.cfg 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/ttcn3-pgw-test/osmo-uecups-daemon.cfg b/ttcn3-pgw-test/osmo-uecups-daemon.cfg index 9f63bb7..e268277 100644 --- a/ttcn3-pgw-test/osmo-uecups-daemon.cfg +++ b/ttcn3-pgw-test/osmo-uecups-daemon.cfg @@ -8,7 +8,8 @@ logging timestamp 1 logging color 0 ! - logging level set-all info + logging level set-all debug + logging level linp info line vty bind 0.0.0.0 uecups 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0 Gerrit-Change-Number: 27044 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: set PGW_Tests.mp_run_prog_log_path to '/data'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27055 ) Change subject: ttcn3-pgw-test: set PGW_Tests.mp_run_prog_log_path to '/data' ...................................................................... ttcn3-pgw-test: set PGW_Tests.mp_run_prog_log_path to '/data' Change-Id: Idd5a37e5768c400d410958149b97869db1e92fb1 Depends: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36 Related: SYS#5602 --- M ttcn3-pgw-test/PGW_Tests.cfg 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-pgw-test/PGW_Tests.cfg b/ttcn3-pgw-test/PGW_Tests.cfg index f6651c3..a68f98e 100644 --- a/ttcn3-pgw-test/PGW_Tests.cfg +++ b/ttcn3-pgw-test/PGW_Tests.cfg @@ -12,6 +12,7 @@ PGW_Tests.mp_pgw_hostname := "172.18.18.4" PGW_Tests.mp_local_hostname_c := "172.18.18.202" PGW_Tests.mp_local_hostname_u := "172.18.18.20" +PGW_Tests.mp_run_prog_log_path := "/data" PGW_Tests.mp_run_prog_as_user := "osmocom" PGW_Tests.mp_ping_hostname := "10.45.0.1" PGW_Tests.mp_pcrf_local_ip:= "172.18.18.202" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd5a37e5768c400d410958149b97869db1e92fb1 Gerrit-Change-Number: 27055 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27045 ) Change subject: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test ...................................................................... osmo-uecups-master: install iputils-ping for ttcn3-pgw-test In ttcn3-pgw-test we order osmo-uecups-daemon to execute `ping`, which is not available in Debian images. Install it. Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8 Related: SYS#5602 --- M osmo-uecups-master/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index e8767d1..74469e5 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -11,6 +11,7 @@ libosmocore-dev \ libosmo-netif-dev \ libsctp-dev \ + iputils-ping \ strace && \ apt-get clean -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8 Gerrit-Change-Number: 27045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: set PGW_Tests.mp_run_prog_log_path to '/data'

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27055 ) Change subject: ttcn3-pgw-test: set PGW_Tests.mp_run_prog_log_path to '/data' ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27055 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd5a37e5768c400d410958149b97869db1e92fb1 Gerrit-Change-Number: 27055 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 17:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-pgw-test: make osmo-uecups-daemon more verbose

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27044 ) Change subject: ttcn3-pgw-test: make osmo-uecups-daemon more verbose ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0 Gerrit-Change-Number: 27044 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 17:45:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in docker-playground[master]: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27045 ) Change subject: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8 Gerrit-Change-Number: 27045 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 02 Feb 2022 17:45:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log