September 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: Move HTTP2_Msg to its own file
by osmith 21 Sep '26

21 Sep '26

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43674?usp=email ) Change subject: Move HTTP2_Msg to its own file ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43674?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib5ec7c2bb6882b2359c6b98836c01f70b1c28585 Gerrit-Change-Number: 43674 Gerrit-PatchSet: 3 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Sep 2026 09:57:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP2_Adapter: Support multiple concurrent open client connections
by osmith 21 Sep '26

21 Sep '26

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43673?usp=email ) Change subject: HTTP2_Adapter: Support multiple concurrent open client connections ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43673?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I194ba7d5ad72363a0e398847360e985e7f7ec6cb Gerrit-Change-Number: 43673 Gerrit-PatchSet: 2 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: Mon, 21 Sep 2026 09:57:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: smf: Expect 201 Created response to our Nsmf sm-contexts creation req
by osmith 21 Sep '26

21 Sep '26

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43672?usp=email ) Change subject: smf: Expect 201 Created response to our Nsmf sm-contexts creation req ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43672?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2cae1b956f9fa6421543e542823e77cf236f0bb4 Gerrit-Change-Number: 43672 Gerrit-PatchSet: 2 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Sep 2026 09:56:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: bts: testenv: fake_trx.py -> osmo-trx-proxy
by osmith 21 Sep '26

21 Sep '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43668?usp=email ) Change subject: bts: testenv: fake_trx.py -> osmo-trx-proxy ...................................................................... bts: testenv: fake_trx.py -> osmo-trx-proxy Use the new osmo-trx-proxy instead of fake_trx.py. Change-Id: I8eadd99f3263fde08b31dc228dddfc87a38dba52 Depends: osmo-trx.git I995b44bf9a884cf5ba6db8333e6f08c9604a58a5 Related: OS#6638, OS#6672 --- M _testenv/data/osmo-dev/testenv.opts A bts/osmo-trx-proxy.cfg M bts/testenv_generic.cfg M bts/testenv_hopping.cfg M bts/testenv_oml.cfg 5 files changed, 68 insertions(+), 12 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/data/osmo-dev/testenv.opts b/_testenv/data/osmo-dev/testenv.opts index 4ee524b..371c722 100644 --- a/_testenv/data/osmo-dev/testenv.opts +++ b/_testenv/data/osmo-dev/testenv.opts @@ -1,3 +1,4 @@ osmo-bts --enable-trx osmo-remsim --disable-remsim-client-ifdhandler onomondo-ipa -DMEM_EMIT_DEBUG=ON +osmo-trx --disable-multi-arfcn --with-proxy diff --git a/bts/osmo-trx-proxy.cfg b/bts/osmo-trx-proxy.cfg new file mode 100644 index 0000000..6fa8f06 --- /dev/null +++ b/bts/osmo-trx-proxy.cfg @@ -0,0 +1,37 @@ +log stderr + logging filter all 1 + logging color 1 + logging print category-hex 0 + logging print category 1 + logging print thread-id 0 + logging print extended-timestamp 1 + logging print level 1 + logging print file basename last + logging level set-all notice + logging level proxy info + logging level trxc info + logging level trxd notice + logging level lglobal notice +! +cpu-sched + policy rr 32 +! +proxy + bind-addr 127.0.0.1 + clck-gen start-fn random + clck-gen ind-period 102 + pm-rssi-noise -110 + path-loss 110 + nominal-toa256 0 + nominal-ci 90 + ep bts + remote-addr 127.0.0.1 + base-port 5700 + num-chans 4 + tx-power 50 + ep ms + remote-addr 127.0.0.1 + base-port 6700 + num-chans 1 + tx-power 50 + no clock-socket diff --git a/bts/testenv_generic.cfg b/bts/testenv_generic.cfg index 5094177..87831cd 100644 --- a/bts/testenv_generic.cfg +++ b/bts/testenv_generic.cfg @@ -8,10 +8,16 @@ package=osmo-bsc copy=osmo-bsc.cfg -[fake-trx] -program=run_fake_trx.sh -make=.make.osmocom-bb.clone -package=osmocom-bb-trx-toolkit +[trx-proxy] +prepare=require_ulimit_r.sh 32 +program=osmo-trx-proxy +make=osmo-trx +package=osmo-trx-proxy +copy=osmo-trx-proxy.cfg +# TODO: Remove *_latest after osmo-trx >= 1.9.0 was released +program_latest=run_fake_trx.sh +make_latest=.make.osmocom-bb.clone +package_latest=osmocom-bb-trx-toolkit [trxcon] program=trxcon diff --git a/bts/testenv_hopping.cfg b/bts/testenv_hopping.cfg index 99943f1..b9fadc3 100644 --- a/bts/testenv_hopping.cfg +++ b/bts/testenv_hopping.cfg @@ -11,10 +11,16 @@ package=osmo-bsc libosmocore-utils copy=osmo-bsc.cfg osmo-bsc-fh.confmerge -[fake-trx] -program=run_fake_trx.sh -make=.make.osmocom-bb.clone -package=osmocom-bb-trx-toolkit +[trx-proxy] +prepare=require_ulimit_r.sh 32 +program=osmo-trx-proxy +make=osmo-trx +package=osmo-trx-proxy +copy=osmo-trx-proxy.cfg +# TODO: Remove *_latest after osmo-trx >= 1.9.0 was released +program_latest=run_fake_trx.sh +make_latest=.make.osmocom-bb.clone +package_latest=osmocom-bb-trx-toolkit [trxcon] program=trxcon diff --git a/bts/testenv_oml.cfg b/bts/testenv_oml.cfg index 7b7651e..a7f561d 100644 --- a/bts/testenv_oml.cfg +++ b/bts/testenv_oml.cfg @@ -2,10 +2,16 @@ program=BTS_Tests config=BTS_Tests_OML.cfg -[fake-trx] -program=run_fake_trx.sh -make=.make.osmocom-bb.clone -package=osmocom-bb-trx-toolkit +[trx-proxy] +prepare=require_ulimit_r.sh 32 +program=osmo-trx-proxy +make=osmo-trx +package=osmo-trx-proxy +copy=osmo-trx-proxy.cfg +# TODO: Remove *_latest after osmo-trx >= 1.9.0 was released +program_latest=run_fake_trx.sh +make_latest=.make.osmocom-bb.clone +package_latest=osmocom-bb-trx-toolkit [trxcon] program=trxcon -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eadd99f3263fde08b31dc228dddfc87a38dba52 Gerrit-Change-Number: 43668 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: bts: testenv: fake_trx.py -> osmo-trx-proxy
by osmith 21 Sep '26

21 Sep '26

Attention is currently required from: fixeria. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43668?usp=email ) Change subject: bts: testenv: fake_trx.py -> osmo-trx-proxy ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8eadd99f3263fde08b31dc228dddfc87a38dba52 Gerrit-Change-Number: 43668 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Sep 2026 09:52:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmocore[master]: Add new VTY node for QoS class configuration in libosmo-sigtran
by jolly 21 Sep '26

21 Sep '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/43669?usp=email ) Change subject: Add new VTY node for QoS class configuration in libosmo-sigtran ...................................................................... Add new VTY node for QoS class configuration in libosmo-sigtran Related: OS#6753 Change-Id: I06927855a173c5b6dbf5c93aa08ea75e1d9d5f37 --- M TODO-RELEASE M include/osmocom/vty/command.h 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..94320ff 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +vty added VTY node for libsosmo-sigtran L_CS7_QOS_CLASS_NODE diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h index 667e9ab..7e2d9c2 100644 --- a/include/osmocom/vty/command.h +++ b/include/osmocom/vty/command.h @@ -102,11 +102,13 @@ L_CPU_SCHED_NODE, /*!< CPU Sched related options node */ L_NS_BIND_NODE, /*!< NS bind node */ L_NS_NSE_NODE, /*!< NS NSE node */ + + L_CS7_QOS_CLASS_NODE, /*!< SS7 QoS Class */ + /* * When adding new nodes to the libosmocore project, these nodes can be * used to avoid ABI changes for unrelated projects. */ - RESERVED1_NODE, /*!< Reserved for later extensions */ RESERVED2_NODE, /*!< Reserved for later extensions */ RESERVED3_NODE, /*!< Reserved for later extensions */ RESERVED4_NODE, /*!< Reserved for later extensions */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43669?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06927855a173c5b6dbf5c93aa08ea75e1d9d5f37 Gerrit-Change-Number: 43669 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-sigtran[master]: Add Cisco like DSCP configuration support
by jolly 21 Sep '26

21 Sep '26

Attention is currently required from: pespin. jolly has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email ) Change subject: Add Cisco like DSCP configuration support ...................................................................... Patch Set 3: (8 comments) File src/ss7_asp_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/050d452a_69d7f… : PS1, Line 423: asp->cfg.ip_dscp = 0; > Ok fine, but since here you are resetting ip_dscp, I think it's a good idea to if (asp->cfg. […] Done File src/ss7_asp_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/7fac4c0f_00029… : PS3, Line 440: ss7_asp_apply_ip_dscp(asp); > btw, it may make sense to rename this "ss7_asp_apply_ip_dscp" into "ss7_asp_apply_qos_class()" Done https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/236829c3_818e4… : PS3, Line 467: > Better keep the qos-class commands in this place rather than above, to follow the order in ss7_vty_i […] Done https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/82a15355_d77d1… : PS3, Line 1458: if (asp->cfg.ip_dscp != 0) > you can use "else if" here, to denote explicitly that ip-dscp can only be >0 if qos_class is not set […] Done File src/ss7_xua_srv.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/e4ca32d2_6389f… : PS3, Line 417: else > logic changed here, missing "if (xs->cfg.ip_dscp != 0)". […] Done File src/ss7_xua_srv_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/f30af080_16522… : PS3, Line 152: DEFUN_ATTR(xua_qos_class, xua_qos_class_cmd, > Move these further below to match ss7_vty_init_node_oxs() order. Done https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/482d898f_2f41d… : PS3, Line 289: if (xs->cfg.ip_dscp) > else if Done https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/b977587b_b3385… : PS3, Line 407: install_lib_element(L_CS7_XUA_NODE, &xua_qos_class_cmd); > Move this below init_ip_dscp, as in the asp vty case. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic346698fc63771d95e474aec53ffb6c776636b3b Gerrit-Change-Number: 43667 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Sep 2026 09:23:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: Update VTY tests to Cisco like DSCP configuration
by jolly 21 Sep '26

21 Sep '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43684?usp=email ) Change subject: Update VTY tests to Cisco like DSCP configuration ...................................................................... Update VTY tests to Cisco like DSCP configuration Related: OS#6753 Change-Id: If4f96e27861428bec183e93b765f7f0185d8fc54 --- M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty M tests/vty/vty_test_runner.py 3 files changed, 53 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/84/43684/1 diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 01cad83..7fd498a 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -125,6 +125,8 @@ xua rkm routing-key-allocation (static-only|dynamic-permitted) sls-opc-dpc [opc-shift] [<0-8>] [dpc-shift] [<0-8>] sls-shift <0-6> + qos class <1-255> + no qos class <1-255> asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) (sctp|tcp) no asp NAME @@ -148,8 +150,9 @@ xua SIGTRAN xxxUA related sls-opc-dpc Shift OPC and DPC bits used during routing decision sls-shift Shift SLS bits used during routing decision - asp Configure Application Server Process + qos QoS definition no Negate a command or set its defaults + asp Configure Application Server Process as Configure an Application Server sccp-address Create/Modify an SCCP addressbook entry timer Configure CS7 Instance default timer values @@ -218,6 +221,7 @@ NAME Name of the SCCP Address OsmoSTP(config-cs7)# no ? + qos QoS definition asp Disable Application Server Process as Disable Application Server sccp-address Delete an SCCP addressbook entry @@ -285,9 +289,8 @@ no remote-ip (A.B.C.D|X:X::X:X) local-ip (A.B.C.D|X:X::X:X) [primary] no local-ip (A.B.C.D|X:X::X:X) - ip-dscp <0-63> - no ip-dscp - qos-class <0-7> + qos-class <1-255> + no qos-class role (sg|asp|ipsp) transport-role (client|server) sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> @@ -317,8 +320,7 @@ no Negate a command or set its defaults remote-ip Specify Remote IP Address of ASP local-ip Specify Local IP Address from which to contact ASP - ip-dscp Specify IP DSCP of ASP - qos-class Specify QoS Class of ASP + qos-class QoS class role Specify the xUA role for this ASP transport-role Specify the transport layer role for this ASP sctp-param Configure SCTP parameters @@ -332,7 +334,7 @@ OsmoSTP(config-cs7-asp)# no ? ... - ip-dscp Reset IP DSCP of ASP to default + qos-class QoS class sctp-param Configure SCTP parameters tcp-param Configure TCP parameters destination-audit Configure ASP Auditing (xUA DAUD) @@ -428,8 +430,8 @@ ... local-ip (A.B.C.D|X:X::X:X) no local-ip (A.B.C.D|X:X::X:X) - init-ip-dscp <0-63> - no init-ip-dscp + qos-class <1-255> + no qos-class accept-asp-connections (pre-configured|dynamic-permitted) sctp-param init (num-ostreams|max-instreams) <0-65535> no sctp-param init (num-ostreams|max-instreams) @@ -439,16 +441,16 @@ ... local-ip Configure the Local IP Address for xUA no Negate a command or set its defaults - init-ip-dscp Specify IP DSCP of Listener + qos-class QoS class accept-asp-connections Define what kind of ASP connections to accept sctp-param Configure SCTP parameters ... OsmoSTP(config-cs7-listen)# no ? ... - local-ip Configure the Local IP Address for xUA - init-ip-dscp Specify IP DSCP of Listener - sctp-param Configure SCTP parameters + local-ip Configure the Local IP Address for xUA + qos-class QoS class + sctp-param Configure SCTP parameters ... OsmoSTP(config-cs7-listen)# exit diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 5ea965b..04a29cc 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -123,6 +123,8 @@ xua rkm routing-key-allocation (static-only|dynamic-permitted) sls-opc-dpc [opc-shift] [<0-8>] [dpc-shift] [<0-8>] sls-shift <0-6> + qos class <1-255> + no qos class <1-255> asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) asp NAME <0-65535> <0-65535> (sua|m3ua|ipa) (sctp|tcp) no asp NAME @@ -145,8 +147,9 @@ xua SIGTRAN xxxUA related sls-opc-dpc Shift OPC and DPC bits used during routing decision sls-shift Shift SLS bits used during routing decision - asp Configure Application Server Process + qos QoS definition no Negate a command or set its defaults + asp Configure Application Server Process as Configure an Application Server sccp-address Create/Modify an SCCP addressbook entry timer Configure CS7 Instance default timer values @@ -214,6 +217,7 @@ NAME Name of the SCCP Address ss7_asp_vty_test(config-cs7)# no ? + qos QoS definition asp Disable Application Server Process as Disable Application Server sccp-address Delete an SCCP addressbook entry @@ -281,9 +285,8 @@ no remote-ip (A.B.C.D|X:X::X:X) local-ip (A.B.C.D|X:X::X:X) [primary] no local-ip (A.B.C.D|X:X::X:X) - ip-dscp <0-63> - no ip-dscp - qos-class <0-7> + qos-class <1-255> + no qos-class role (sg|asp|ipsp) transport-role (client|server) sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> @@ -313,8 +316,7 @@ no Negate a command or set its defaults remote-ip Specify Remote IP Address of ASP local-ip Specify Local IP Address from which to contact ASP - ip-dscp Specify IP DSCP of ASP - qos-class Specify QoS Class of ASP + qos-class QoS class role Specify the xUA role for this ASP transport-role Specify the transport layer role for this ASP sctp-param Configure SCTP parameters @@ -330,7 +332,7 @@ ... remote-ip Specify Remote IP Address of ASP local-ip Specify Local IP Address from which to contact ASP - ip-dscp Reset IP DSCP of ASP to default + qos-class QoS class sctp-param Configure SCTP parameters tcp-param Configure TCP parameters destination-audit Configure ASP Auditing (xUA DAUD) diff --git a/tests/vty/vty_test_runner.py b/tests/vty/vty_test_runner.py index a01f193..21c9ad5 100755 --- a/tests/vty/vty_test_runner.py +++ b/tests/vty/vty_test_runner.py @@ -235,20 +235,36 @@ def vty_app(self): return (4239, "./stp/osmo-stp", "OsmoSTP", "stp") - def testDSCPSettings(self): + def _run_test_dscp_settings(self, qos_class): self.vty.enable() self.assertTrue(self.vty.verify("configure terminal",[''])) self.assertTrue(self.vty.verify("cs7 instance 0",[''])) + if qos_class: + self.assertTrue(self.vty.verify("qos class 5",[''])) + self.assertTrue(self.vty.verify("qos-ip-dscp 23",[''])) + self.assertTrue(self.vty.verify("exit",[''])) + self.assertTrue(self.vty.verify("qos class 6",[''])) + self.assertTrue(self.vty.verify("qos-ip-dscp 42",[''])) + self.assertTrue(self.vty.verify("exit",[''])) + self.assertTrue(self.vty.verify("qos class 7",[''])) + self.assertTrue(self.vty.verify("qos-ip-dscp 8",[''])) + self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.verify("no listen m3ua 2905",[''])) self.assertTrue(self.vty.verify("listen m3ua 2905",[''])) self.assertTrue(self.vty.verify("accept-asp-connections dynamic-permitted",[''])) self.assertTrue(self.vty.verify("local-ip 127.0.0.1",[''])) - self.assertTrue(self.vty.verify("init-ip-dscp 23",[''])) + if qos_class: + self.assertTrue(self.vty.verify("qos-class 5",[''])) + else: + self.assertTrue(self.vty.verify("init-ip-dscp 23",[''])) self.assertTrue(self.vty.verify("exit",[''])) self.assertTrue(self.vty.verify("asp asp-srv-m3ua 2906 2905 m3ua",[''])) self.assertTrue(self.vty.verify("local-ip 127.0.0.1",[''])) self.assertTrue(self.vty.verify("remote-ip 127.0.0.2",[''])) - self.assertTrue(self.vty.verify("ip-dscp 8",[''])) + if qos_class: + self.assertTrue(self.vty.verify("qos-class 7",[''])) + else: + self.assertTrue(self.vty.verify("ip-dscp 8",[''])) self.assertTrue(self.vty.verify("role asp",[''])) self.assertTrue(self.vty.verify("sctp-role server",[''])) self.assertTrue(self.vty.verify("no shutdown",[''])) @@ -256,7 +272,10 @@ self.assertTrue(self.vty.verify("asp asp-clnt-m3ua 2905 2906 m3ua",[''])) self.assertTrue(self.vty.verify("local-ip 127.0.0.2",[''])) self.assertTrue(self.vty.verify("remote-ip 127.0.0.1",[''])) - self.assertTrue(self.vty.verify("ip-dscp 42",[''])) + if qos_class: + self.assertTrue(self.vty.verify("qos-class 6",[''])) + else: + self.assertTrue(self.vty.verify("ip-dscp 42",[''])) self.assertTrue(self.vty.verify("role asp",[''])) self.assertTrue(self.vty.verify("sctp-role client",[''])) self.assertTrue(self.vty.verify("no shutdown",[''])) @@ -368,6 +387,12 @@ sorted_output = "\n".join(sorted(output.splitlines())) self.assertEqual(sorted_output, expected_output) + def testDSCPSettings_without_QoSClass(self): + self._run_test_dscp_settings(qos_class = False) + + def testDSCPSettings_with_QoSClass(self): + self._run_test_dscp_settings(qos_class = True) + if __name__ == '__main__': import argparse import sys -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If4f96e27861428bec183e93b765f7f0185d8fc54 Gerrit-Change-Number: 43684 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[L] Change in libosmo-sigtran[master]: Add Cisco like DSCP configuration support
by jolly 21 Sep '26

21 Sep '26

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Add Cisco like DSCP configuration support ...................................................................... Add Cisco like DSCP configuration support Add Cisco like VTY configuration support for DSCP. QoS classes can be defined and configured per SS7 instance and the classes can be assigned to listener and connections like this: cs7 instance 0 qos class 3 qos-ip-dscp 36 ... asp myasp 2905 2905 m3ua qos-class 3 ... asp asp-srv-m3ua 2906 2905 m3ua qos-class 3 ... asp asp-clnt-m3ua 2905 2906 m3ua qos-class 3 ... Ensure that the ongoing listener or connection socket is updated whenever the QoS class is changed or deleted or its DSCP value is changed. Deprecated "ip-dscp" and "init-ip-dscp" configuration is still supported. When QoS class is assigned, the deprecated configuration is removed and vice versa. Related: OS#6753 Depends-on: I06927855a173c5b6dbf5c93aa08ea75e1d9d5f37 (libosmocore) Change-Id: Ic346698fc63771d95e474aec53ffb6c776636b3b --- M TODO-RELEASE M src/Makefile.am M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/ss7_instance.c M src/ss7_instance.h A src/ss7_qos_class.c A src/ss7_qos_class.h A src/ss7_qos_class_vty.c M src/ss7_vty.c M src/ss7_vty.h M src/ss7_xua_srv.c M src/ss7_xua_srv.h M src/ss7_xua_srv_vty.c 15 files changed, 413 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/67/43667/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic346698fc63771d95e474aec53ffb6c776636b3b Gerrit-Change-Number: 43667 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-ttcn3-hacks[master]: smf: Clean up code building SBI URIs
by pespin 21 Sep '26

21 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43671?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: smf: Clean up code building SBI URIs ...................................................................... smf: Clean up code building SBI URIs There's in general no need to use functions, constants and templates can be used most of the time. Also clean up namings, order of definitions, make them look more or less similar in all interfaces, etc. Change-Id: I1bdc87adecc47a96221e4566f4a575d64dfab7d3 --- M smf/SMF_Session_CT_5G.ttcn M smf/SMF_Tests.ttcn 2 files changed, 60 insertions(+), 40 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index b9d060a..70c029a 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -46,9 +46,26 @@ } /******************************************** - * N11 Nsmf (SBI): Requests towards IUT SMF + * SCP +/*******************************************/ +const charstring SCP_uri_hostport := mp_scp_local_ip & ":" & int2str(mp_scp_local_port); +const charstring SCP_uri_prefix := "http://" & SCP_uri_hostport; + +/******************************************** + * N11 Nsmf (SBI): Requests towards IUT SMFs ********************************************/ +const charstring Nsmf_uri_hostport := mp_smf_hostname & ":" & int2str(mp_smf_sbi_port); +const charstring Nsmf_uri_prefix := "http://" & Nsmf_uri_hostport; +const charstring Nsmf_PDUSession_path_api_prefix := "/nsmf-pdusession/v1" +const charstring Nsmf_PDUSession_path_sm_contexts := Nsmf_PDUSession_path_api_prefix & "/sm-contexts"; + +template (value) charstring ts_Nsmf_PDUSession_path_sm_contexts(template (value) charstring pdu_sess_id) := + Nsmf_PDUSession_path_sm_contexts & "/" & valueof(pdu_sess_id); + +template (present) charstring tr_Nsmf_PDUSession_uri_sm_contexts(template charstring pdu_sess_id := pattern "\d+") := + pattern Nsmf_uri_prefix & Nsmf_PDUSession_path_sm_contexts & "/" & pdu_sess_id; + function f_n11_init() runs on SMF_Session_CT { f_http2_adapter_init(); f_http2_adapter_connect(mp_smf_hostname, mp_smf_sbi_port, mp_amf_local_ip, -1); @@ -110,7 +127,7 @@ ratType := ts_RatType(NR), ueLocation := ts_UserLocation(nrLocation := ts_NrLocation(tai := ts_Tai(plmn_id, "000001"), ncgi := ts_Ncgi(plmn_id, "000000000"))), - smContextStatusUri := f_amf_callback_uri(g_pars.imsi_str, "sm-context-status", pdu_sess_id)); + smContextStatusUri := ts_Namf_Callback_uri_imsi_sm_context_status_id(g_pars.imsi_str, int2str(pdu_sess_id))); sm_contexts_enc := f_enc_SmContextCreateData(valueof(sm_contexts)); var charstring boundary := "=-0EVVjxcWWFYNd1JXh1OQEg==" @@ -125,8 +142,8 @@ pseudo_hdr := ts_HTTP2_pseudo_headers_Req(method := "POST", scheme := "http", - authority := mp_smf_hostname & ":" & int2str(mp_smf_sbi_port), - path := "/nsmf-pdusession/v1/sm-contexts"); + authority := Nsmf_uri_hostport, + path := Nsmf_PDUSession_path_sm_contexts); hdr_li := { ts_HTTP2_Hdr_content_type("multipart/related; boundary=\"" & boundary & "\""), ts_HTTP2_Hdr_accept("application/json,application/vnd.3gpp.ngap,application/problem+json"), @@ -192,12 +209,22 @@ * N11 Namf (SBI): Emulated AMF **************************************/ -const charstring Namf_Communication_API_PREFIX := "/namf-comm/v1" +const charstring Namf_uri_prefix := SCP_uri_prefix; -function f_namf_comm_uri_imsi_prefix(charstring imsi) -return charstring { - return Namf_Communication_API_PREFIX & "/ue-contexts" & "/imsi-" & imsi -} +const charstring Namf_Callback_path_api_prefix := "/namf-callback/v1"; + +template (value) charstring ts_Namf_Callback_uri_imsi_sm_context_status_id(template (value) charstring imsi, template (value) charstring id) := + Namf_uri_prefix & Namf_Communication_path_ue_contexts & "/imsi-" & valueof(imsi) & "/sm-context-status/" & valueof(id); + + +const charstring Namf_Communication_path_api_prefix := "/namf-comm/v1"; +const charstring Namf_Communication_path_ue_contexts := Namf_Communication_path_api_prefix & "/ue-contexts"; + +template (value) charstring ts_Namf_Communication_path_ue_contexts(template (value) charstring imsi) := + Namf_Communication_path_ue_contexts & "/imsi-" & valueof(imsi); + +template (value) charstring ts_Namf_Communication_path_ue_contexts_n1_n2_messages(template (value) charstring imsi) := + Namf_Communication_path_ue_contexts & "/imsi-" & valueof(imsi) & "/n1-n2-messages"; /* 3GPP TS 29.518: * 6.1.3.5 Resource: N1N2 Messages Collection */ @@ -209,7 +236,7 @@ var template HTTP2_header_list headers := *; pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "POST", - path := f_namf_comm_uri_imsi_prefix(g_pars.imsi_str) & "/n1-n2-messages"); + path := ts_Namf_Communication_path_ue_contexts_n1_n2_messages(g_pars.imsi_str)); hb := tr_HTTP2_header_block(pseudo_headers, headers); http2_msg := tr_HTTP2_Msg(?, ?, hb := hb, @@ -270,17 +297,23 @@ * N10 Nudm (SBI): Emulated UDM *************************************/ -const charstring Nudm_SDM_API_PREFIX := "/nudm-sdm/v2" +const charstring Nudm_uri_prefix := SCP_uri_prefix; +const charstring Nudm_SDM_path_api_prefix := "/nudm-sdm/v2" -function f_nudm_sdm_uri_imsi_prefix(charstring imsi) -return charstring { - return Nudm_SDM_API_PREFIX & "/imsi-" & imsi -} -function f_nudm_sdm_uri_imsi_subscr_prefix(charstring imsi, charstring opcode, integer pduSessionId) -return charstring { - return f_nudm_sdm_uri_imsi_prefix(imsi) & "/" & opcode & "/" & int2str(pduSessionId); -} +template (value) charstring ts_Nudm_SDM_path_sdm_imsi(template (value) charstring imsi) := + Nudm_SDM_path_api_prefix & "/imsi-" & valueof(imsi); + +template (value) charstring ts_Nudm_SDM_path_sdm_imsi_sdm_subscriptions(template (value) charstring imsi) := + Nudm_SDM_path_api_prefix & "/imsi-" & valueof(imsi) & "/sdm-subscriptions"; + +template (value) charstring ts_Nudm_SDM_path_sdm_imsi_sdm_subscriptions_id(template (value) charstring imsi, template (value) charstring subscr_id) := + Nudm_SDM_path_api_prefix & "/imsi-" & valueof(imsi) & "/sdm-subscriptions/" & valueof(subscr_id); + +template (value) charstring ts_Nudm_SDM_uri_sdm_imsi_sdm_subscriptions_id(template (value) charstring imsi, template (value) charstring subscr_id) := + Nudm_uri_prefix & Nudm_SDM_path_api_prefix & "/imsi-" & valueof(imsi) & "/sdm-subscriptions/" & valueof(subscr_id); + + /* 3GPP TS 29.503: * 5.2.2.2.5 Session Management Subscription Data Retrieval @@ -293,7 +326,7 @@ var template HTTP2_header_list headers := *; pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "GET", - path := pattern Nudm_SDM_API_PREFIX & "/imsi-" & g_pars.imsi_str & "/sm-data*"); + path := pattern Nudm_SDM_path_api_prefix & "/imsi-" & g_pars.imsi_str & "/sm-data*"); hb := tr_HTTP2_header_block(pseudo_headers, headers); http2_msg := tr_HTTP2_Msg(?, ?, hb := hb, body := omit); return http2_msg; @@ -354,7 +387,7 @@ var template HTTP2_header_list headers := *; pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "POST", - path := f_nudm_sdm_uri_imsi_prefix(g_pars.imsi_str) & "/sdm-subscriptions"); + path := ts_Nudm_SDM_path_sdm_imsi_sdm_subscriptions(g_pars.imsi_str)); hb := tr_HTTP2_header_block(pseudo_headers, headers); http2_msg := tr_HTTP2_Msg(?, ?, hb := hb, @@ -381,7 +414,7 @@ http2_rx.stream_id, headers := { ts_HTTP2_Hdr_content_type("application/json; charset=utf-8"), - ts_HTTP2_Hdr_location(f_scp_uri_prefix() & f_nudm_sdm_uri_imsi_subscr_prefix(g_pars.imsi_str, "sdm-subscriptions", 1)) + ts_HTTP2_Hdr_location(ts_Nudm_SDM_uri_sdm_imsi_sdm_subscriptions_id(g_pars.imsi_str, int2str(1))) }, body := ts_HTTP2_Data_frame(http2_rx.stream_id, end_stream_flag := true, @@ -395,12 +428,9 @@ * N8 NPcf (SBI): Emulated PCF *************************************/ -const charstring Npcf_SMPolicyControl_API_PREFIX := "/npcf-smpolicycontrol/v1" - -function f_npcf_smpolicycontrol_uri_imsi_prefix(charstring imsi) -return charstring { - return Npcf_SMPolicyControl_API_PREFIX & "/imsi-" & imsi -} +const charstring Npcf_uri_prefix := SCP_uri_prefix; +const charstring Npcf_SMPolicyControl_path_api_prefix := "/npcf-smpolicycontrol/v1" +const charstring Npcf_SMPolicyControl_path__sm_policies := Npcf_SMPolicyControl_path_api_prefix & "/sm-policies"; /* 3GPP TS 29.512: * 5.3.2 Resource: SM Policies */ @@ -412,7 +442,7 @@ var template HTTP2_header_list headers := *; pseudo_headers := tr_HTTP2_pseudo_headers_Req(method := "POST", - path := Npcf_SMPolicyControl_API_PREFIX & "/sm-policies"); + path := Npcf_SMPolicyControl_path__sm_policies); hb := tr_HTTP2_header_block(pseudo_headers, headers); http2_msg := tr_HTTP2_Msg(?, ?, hb := hb, @@ -440,7 +470,7 @@ http2_rx.stream_id, headers := { ts_HTTP2_Hdr_content_type("application/json; charset=utf-8"), - ts_HTTP2_Hdr_location(f_scp_uri_prefix() & Npcf_SMPolicyControl_API_PREFIX & "/sm-policies/imsi-" & g_pars.imsi_str & "-" & int2str(sessRuleId)) + ts_HTTP2_Hdr_location(Npcf_uri_prefix & Npcf_SMPolicyControl_path_api_prefix & "/sm-policies/imsi-" & g_pars.imsi_str & "-" & int2str(sessRuleId)) }, body := ts_HTTP2_Data_frame(http2_rx.stream_id, end_stream_flag := true, diff --git a/smf/SMF_Tests.ttcn b/smf/SMF_Tests.ttcn index 2becc57..97afed9 100644 --- a/smf/SMF_Tests.ttcn +++ b/smf/SMF_Tests.ttcn @@ -315,16 +315,6 @@ return vc_conn; } -function f_scp_uri_prefix() return charstring -{ - return "http://" & mp_scp_local_ip & ":" & int2str(mp_scp_local_port); -} -function f_amf_callback_uri(charstring imsi, charstring opcode, integer pduSessionId) return charstring -{ - return f_scp_uri_prefix() & - "/namf-callback/v1/imsi-" & imsi & "/" & opcode & "/" & int2str(pduSessionId); -} - /* send echo request; expect response */ testcase TC_tx_echo() runs on SMF_Test_CT { timer T := 5.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1bdc87adecc47a96221e4566f4a575d64dfab7d3 Gerrit-Change-Number: 43671 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log September 2026