- gerrit-log - lists.osmocom.org

Change in osmo-gsm-manuals[master]: osmux: Use local/remote CID terminology
by pespin 14 Sep '22

14 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 ) Change subject: osmux: Use local/remote CID terminology ...................................................................... osmux: Use local/remote CID terminology This terminology is much more common and used in other protocols, like PFCP. Related: SYS#5987 Change-Id: Ia5eb833c296c504555f273a7fc3af5d746af19c0 --- M common/chapters/osmux/mgcp_extension_osmux.adoc M common/chapters/osmux/mo_call_osmux_aoip.msc M common/chapters/osmux/mo_call_osmux_sccplite.msc M common/chapters/osmux/mo_call_osmux_sccplite_nat.msc M common/chapters/osmux/osmux.adoc 5 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/53/29353/1 diff --git a/common/chapters/osmux/mgcp_extension_osmux.adoc b/common/chapters/osmux/mgcp_extension_osmux.adoc index e2b0947..59c1dcf 100644 --- a/common/chapters/osmux/mgcp_extension_osmux.adoc +++ b/common/chapters/osmux/mgcp_extension_osmux.adoc @@ -19,11 +19,11 @@ In request messages, the value part of `X-Osmux` specifies the CID to be used by OsmoMGW to _send_ Osmux frames to the remote peer for that connection, also -known as _sendCID_. +known as the MGW's _remote CID_ or the peer's _local CID_. In response messages, the value part of `X-Osmux` specifies the CID where OsmoMGW expect to _receive_ Osmux frames from the remote peer for that -connection, also known as _recvCID_. +connection, also known as the MGW's _local CID_ or the peer's _remote CID_. .Example: `X-Osmux` format with a known CID 3. ---- @@ -39,12 +39,12 @@ If the MGCP client is willing to use Osmux for a given connection, it shall specify so during `CRCX` time, and not later. If at `CRCX` time the MGCP client -doesn't yet know the _sendCID_, it can use an astersik (*) and provide -_sendCID_ later within `MDCX` messages. +doesn't yet know the MGW's _remote CID_, it can use an astersik (*) and provide +_remote CID_ later within `MDCX` messages. All subsequent `MDCX` messages sent towards an Osmux connection must contain the -original _sendCID_ sent during `CRCX`. The same way, all `MDCX` response shall -contain the _recvCID_ sent during `CRCX`. +original _remote CID_ sent during `CRCX`. The same way, all `MDCX` response shall +contain the _local CID_ sent during `CRCX`. The other required connection address parameters, such as IP address, port, and codecs, are negotiated through MGCP and SDP as usual, but in this case the IP @@ -72,7 +72,7 @@ a=ptime:20 ---- -.Example: response to `CRCX` containing the <<recvCID>> +.Example: response to `CRCX` containing the MGW's <<remote CID>> ---- 200 189 OK I: 07E41584 diff --git a/common/chapters/osmux/mo_call_osmux_aoip.msc b/common/chapters/osmux/mo_call_osmux_aoip.msc index 9cb2e50..27e79ba 100644 --- a/common/chapters/osmux/mo_call_osmux_aoip.msc +++ b/common/chapters/osmux/mo_call_osmux_aoip.msc @@ -14,7 +14,7 @@ # Allocate MGW/MSC Osmux endpoint m_sc -> mgw_msc [label="MGCP CRCX rtpbridge/*@mgw, X-Osmux: *"]; - mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, recvCID 5"]; + mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, MGW's local CID 5"]; mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:1984, X-Osmux: 5)"]; bsc <- m_sc [label="BSSAP ASSGN REQ (3GPP AoIP, extension IE: Osmux CID 5)"]; @@ -37,7 +37,7 @@ ...; mgw_bsc <- bsc [label="MGCP CRCX rtpbridge/2@mgw (MSC:1984, X-Osmux: 5)"]; - mgw_bsc box mgw_bsc [label="Bind to MGW-local Osmux Port (1985)\nConnect to MSC:1984\nAllocate new recvCID 7"]; + mgw_bsc box mgw_bsc [label="Bind to MGW-local Osmux Port (1985)\nConnect to MSC:1984\nAllocate new MGW's local CID 7"]; mgw_bsc -> bsc [label="MGCP CRCX rtpbridge/2@mgw OK (MGW:1985, X-Osmux: 7)"]; ...; diff --git a/common/chapters/osmux/mo_call_osmux_sccplite.msc b/common/chapters/osmux/mo_call_osmux_sccplite.msc index 903da46..037805b 100644 --- a/common/chapters/osmux/mo_call_osmux_sccplite.msc +++ b/common/chapters/osmux/mo_call_osmux_sccplite.msc @@ -12,7 +12,7 @@ # Allocate MGW/MSC Osmux endpoint m_sc -> mgw_msc [label="MGCP CRCX *@mgw, X-Osmux: *"]; - mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, recvCID 5"]; + mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 1, MGW's local CID 5"]; mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:1984, X-Osmux: 5)"]; bsc <- m_sc [label="BSSAP ASSGN REQ (CIC:1)"]; @@ -39,7 +39,7 @@ # MSC configures BSC-MGW MSC-side of the endpoint through MGCP UDP forwarding mgw_bsc <- m_sc [label="MGCP CRCX 1@mgw (MSC:1984, X-Osmux: 5)"]; - mgw_bsc box mgw_bsc [label="Bind to BTS-local Osmux Port (1985)\nAllocate new recvCID 7"]; + mgw_bsc box mgw_bsc [label="Bind to BTS-local Osmux Port (1985)\nAllocate new MGW's local CID 7"]; mgw_bsc -> m_sc [label="MGCP CRCX 1@mgw OK (MGW:1985, X-Osmux: 7)"]; mgw_bsc <- m_sc [label="MGCP MDCX 1@mgw (recvonly) "]; mgw_bsc box mgw_bsc [label="Connect Osmux socket to remote (MSC) Osmux Port"]; diff --git a/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc b/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc index 2aa8105..d309ebb 100644 --- a/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc +++ b/common/chapters/osmux/mo_call_osmux_sccplite_nat.msc @@ -18,7 +18,7 @@ # NAT: MGW/MSC Osmux endpoint #bscnat -> bscnat [label="MGCP CRCX *@mgw, X-Osmux: *"]; - mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 2, recvCID 5"]; + mgw_msc box mgw_msc [label="Bind to MGW-local Osmux Port (1984)\nAllocate new endpoint 2, MGW's local CID 5"]; #mgw_msc -> m_sc [label="MGCP CRCX rtpbridge/1@mgw OK (MGW:1984, X-Osmux: 5)"]; bsc <- bscnat [label="BSSAP ASSGN REQ (CIC:2)"]; @@ -48,7 +48,7 @@ # MSC configures BSC-MGW MSC-side of the endpoint through MGCP UDP forwarding bscnat <- m_sc [label="MGCP CRCX 1@mgw (MSC:3000)"]; - bscnat box bscnat [label="Allocate new endpoint 2\nAllocate new recvCID 5\nBind to local Osmux Port (1984)\nBind to local RTP port 4000"]; + bscnat box bscnat [label="Allocate new endpoint 2\nAllocate new MGW's local CID 5\nBind to local Osmux Port (1984)\nBind to local RTP port 4000"]; mgw_bsc <- bscnat [label="MGCP CRCX 2@mgw (MSC:1984, X-Osmux: 5)"]; mgw_bsc -> bscnat [label="MGCP CRCX 2@mgw OK (MGW:1985, X-Osmux: 7)"]; bscnat -> m_sc [label="MGCP CRCX 1@mgw OK (MGW:4000)"]; diff --git a/common/chapters/osmux/osmux.adoc b/common/chapters/osmux/osmux.adoc index 5e53b60..68d628f 100644 --- a/common/chapters/osmux/osmux.adoc +++ b/common/chapters/osmux/osmux.adoc @@ -50,13 +50,13 @@ === CID allocation -Each peer (BSC/MGW and MSC/MGW) allocates its own _recvCID_, and receives from -the peer through the used GSM protocol the peer's _recvCID_, which becomes -the local _sendCID_ for that connection. +Each peer (BSC/MGW and MSC/MGW) allocates its own _local CID_, and receives from +the peer through the used GSM protocol a _remote CID_ (aka the peer's _local +CID_), which is then used to send Osmux frames the local for that connection. ---- -BSC/MGW(recvCID=Y,sendCID=?)<-X--MSC/MGW(recvCID=X,sendCID=?) -BSC/MGW(recvCID=Y,sendCID=X)--Y->MSC/MGW(recvCID=X,sendCID=Y) +BSC/MGW(localCID=Y,remoteCID=?)<-X--MSC/MGW(localCID=X,remoteCID=?) +BSC/MGW(localCID=Y,remoteCID=X)--Y->MSC/MGW(localCID=X,remoteCID=Y) ---- This way each peer is responsible for allocating and managing their own local @@ -75,13 +75,13 @@ BSC. Each of the peers could actually have more than one Osmux socket towards the other peer, by using a pool of ports or IP addresses, so there's really not limit if required as long as there's a way to infer the initially negotiated -`<srcIP, srcPort, dstIP, dstPort, sendCID>` tuple from the received audio +`<srcIP, srcPort, dstIP, dstPort, remoteCID>` tuple from the received audio packets. However, due to some constrains from in between NATs explained in section above, BSC/MGW IP address and port are not a priory known, and could change between different connections coming from it. As a result, it is difficult to infer the -entire tuple, so for now MGW needs to allocate its Osmux _recvCID_ in a clever +entire tuple, so for now MGW needs to allocate its Osmux _local CID_ in a clever way, in order to be able to identify the full tuple from it. Hence, currently OsmoMGW CID allocation implementation shares CID between all -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia5eb833c296c504555f273a7fc3af5d746af19c0 Gerrit-Change-Number: 29353 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-hnbgw[master]: do not depend on libosmo-gtlv
by pespin 14 Sep '22

14 Sep '22

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29352 ) Change subject: do not depend on libosmo-gtlv ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: That's because osmo-hnbgw doesn't really use any libosmo-gtlv stuff directly, correct? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I39eb59520231bcfed724060d3fda4ba919f2199d Gerrit-Change-Number: 29352 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 11:30:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-hnbgw[master]: do not depend on libosmo-gtlv
by neels 14 Sep '22

14 Sep '22

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29352 ) Change subject: do not depend on libosmo-gtlv ...................................................................... do not depend on libosmo-gtlv Depending on libosmo-pfcp implies libosmo-gtlv, no need to explicitly add this dependency. Change-Id: I39eb59520231bcfed724060d3fda4ba919f2199d --- M configure.ac 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/52/29352/1 diff --git a/configure.ac b/configure.ac index 1a73496..290a939 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,6 @@ AC_ARG_ENABLE([pfcp], [AS_HELP_STRING([--enable-pfcp], [Build with PFCP support, for GTP tunnel mapping via UPF])], [osmo_ac_pfcp="$enableval"],[osmo_ac_pfcp="no"]) if test "x$osmo_ac_pfcp" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOGTLV, libosmo-gtlv >= 0.1.0) PKG_CHECK_MODULES(LIBOSMOPFCP, libosmo-pfcp >= 0.1.0) AC_DEFINE(ENABLE_PFCP, 1, [Define to build with PFCP support]) fi -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I39eb59520231bcfed724060d3fda4ba919f2199d Gerrit-Change-Number: 29352 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE
by fixeria 14 Sep '22

14 Sep '22

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 ) Change subject: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 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: I40dab41d5dc5d14e358ba5a070ce174e7d8d4a4b Gerrit-Change-Number: 29350 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 14 Sep 2022 11:19:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: f_assignment_codec(): log the actual value on mismatch
by pespin 14 Sep '22

14 Sep '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29349 ) Change subject: BSC_Tests: f_assignment_codec(): log the actual value on mismatch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29349 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: I437c1e796b00bfae41620f05ef8f15c8db8ca3d9 Gerrit-Change-Number: 29349 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 11:14:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg
by pespin 14 Sep '22

14 Sep '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29348 ) Change subject: library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29348 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: I595be86d69913ba25e965a5a5c6977e00c342e60 Gerrit-Change-Number: 29348 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Sep 2022 11:14:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: doc: Document use of Osmux in IPA Abis against OsmoBTS
by pespin 14 Sep '22

14 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29351 ) Change subject: doc: Document use of Osmux in IPA Abis against OsmoBTS ...................................................................... doc: Document use of Osmux in IPA Abis against OsmoBTS Related: SYS#5987 Change-Id: I41788f8d3bc29735cc30516f429311b73ba71910 --- M doc/manuals/chapters/osmux_bsc.adoc 1 file changed, 47 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/51/29351/1 diff --git a/doc/manuals/chapters/osmux_bsc.adoc b/doc/manuals/chapters/osmux_bsc.adoc index 0a11d17..268ffdf 100644 --- a/doc/manuals/chapters/osmux_bsc.adoc +++ b/doc/manuals/chapters/osmux_bsc.adoc @@ -14,14 +14,14 @@ ==== {program-name} in a 3GPP AoIP network setup Osmux usage in {program-name} in managed through the VTY command `osmux -(on|off|only)`. Once enabled (`on` or `only`), {program-name} will start -appending the vendor specific _Osmux Support_ IE in _BSSMAP RESET_ and _BSSMAP -RESET-ACK_ message towards the MSC in order to announce it supports Osmux. This -way, the MSC can decide whether to use Osmux or not based on this information -when setting up a call (this time using _Osmux CID_ IE). It should be noted that -this option should not be enabled unless MSC managing {program-name} supports -handling this extension IE (like OsmoMSC), a 3rd-party MSC might otherwise -refuse the related _RESET_/_RESET-ACK_ messages. +(on|off|only)` under the `msc` node. Once enabled (`on` or `only`), +{program-name} will start appending the vendor specific _Osmux Support_ IE in +_BSSMAP RESET_ and _BSSMAP RESET-ACK_ message towards the MSC in order to +announce it supports Osmux. This way, the MSC can decide whether to use Osmux or +not based on this information when setting up a call (this time using _Osmux +CID_ IE). It should be noted that this option should not be enabled unless MSC +managing {program-name} supports handling this extension IE (like OsmoMSC), a +3rd-party MSC might otherwise refuse the related _RESET_/_RESET-ACK_ messages. {program-name} will behave differently during call set up based on the VTY command presented above: @@ -41,3 +41,42 @@ calls on the CN-side, this is, if _BSSMAP Assign Request_ from MSC doesn't contain an _Osmux CID_ IE, it will reject the assignment and the call set up will fail. + +==== Osmux in the ip.access Abis interface + +{program-name} can also talk Osmux instead of RTP to an OsmoBTS which supports +the feature. Osmux usage agains the BTS in {program-name} in managed through the +VTY command `osmux (on|off|only)` under the `bts` node. + +If a BTS supports Osmux, it may announce the _OSMUX_ BTS feature towards the BSC +over OML. This way, the {program-name} becomes aware that this BTS supports +using Osmux to transfer voice call user data when the AMR codec is selected. + +It is then up to {program-name} to decide whether to use Osmux or not when +establishing a new call. If {program-name} decides to use Osmux for a given +call, it will instruct its co-located MGW to set up an Osmux connection in the +endpoint (using the `X-Osmux extension`) and then it will forward the received +Osmux CID to the BTS in the the _IPACC CRCX/MDCX_ messages by means of an extra _Osmux +CID_ IE appended to it. +The IP address and port provided in the same messages refer to the +address and port where Osmux frames with the provided CID are expected to be +received. Similarly, the BTS appends an _Osmux CID_ IE to the _IPACC +CRCX/MDCX ACK_ message it generates, this time with its own local Osmux CID, +which {program-name} will in turn forward back to the co-located MGW. +Same goes for the BTS' local IP address and port where Osmux frames are expected +to be received. + +{program-name} will behave differently during call set up based on the VTY +command `use (on|off|only)` under each `bts` node presented above: + +* `off`: {program-name} will never attempt use of Osmux against this BTS (default). +* `on`: {program-name} will use Osmux against the BTS if the BTS announced Osmux + support during OML bringup, and if MGW provided a valid Osmux CID during _MGCP + CRCX_. Otherwise BSC will simply automatically fall back to using RTP for each + call. For non-AMR calls, RTP will always be used. +* `only`: Same as per `on`, except that {program-name} will accept only Osmux + calls on the BTS-side. This is, if _MGCP CRCX ACK_ from MGW doesn't + contain an _Osmux CID_ IE or _IPACC CRCX ACK_ from BSC doesn't + contain an _Osmux CID_ IE, it will reject the assignment and the call set up + will fail. This means also that only AMR calls (`Channel Mode GSM3`) are + allowed. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29351 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I41788f8d3bc29735cc30516f429311b73ba71910 Gerrit-Change-Number: 29351 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: f_assignment_codec(): log the actual value on mismatch
by fixeria 14 Sep '22

14 Sep '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29349 ) Change subject: BSC_Tests: f_assignment_codec(): log the actual value on mismatch ...................................................................... BSC_Tests: f_assignment_codec(): log the actual value on mismatch Change-Id: I437c1e796b00bfae41620f05ef8f15c8db8ca3d9 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/29349/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cd9514e..4d7717e 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -4354,8 +4354,8 @@ log("found RSL MR CONFIG IE: ", mr_conf); if (not match(mr_conf, g_pars.expect_mr_conf_ie)) { - setverdict(fail, "RSL MR CONFIG IE does not match expectation. Expected: ", - g_pars.expect_mr_conf_ie); + setverdict(fail, "RSL MR CONFIG IE does not match expectation. ", + "Expected: ", g_pars.expect_mr_conf_ie, ", got: ", mr_conf); } } else { if (f_rsl_find_ie(rsl, RSL_IE_MR_CONFIG, mr_conf) == true) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29349 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: I437c1e796b00bfae41620f05ef8f15c8db8ca3d9 Gerrit-Change-Number: 29349 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE
by fixeria 14 Sep '22

14 Sep '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 ) Change subject: BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE ...................................................................... BSC_Tests: fix AMR tests matching RSL MultiRate configuration IE The RSL_IE_MultirateCfg was implemented in [1] ... FIXME! Change-Id: I40dab41d5dc5d14e358ba5a070ce174e7d8d4a4b Fixes: [1] I0a5ddce570c0fd70f096d897b0b609d20b552ff7 --- M bsc/BSC_Tests.ttcn 1 file changed, 60 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/29350/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4d7717e..6d4bd82 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -4632,21 +4632,14 @@ f_shutdown_helper(); } -function f_TC_assignment_codec_amr(boolean fr, octetstring mrconf, bitstring s8_s0, bitstring exp_s8_s0, - charstring start_mode := "1") +function f_TC_assignment_codec_amr(boolean fr, RSL_IE_MultirateCfg mr_cfg, + bitstring s8_s0, bitstring exp_s8_s0, + charstring start_mode := "1") runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; - /* See note above */ - var RSL_IE_Body mr_conf := { - other := { - len := lengthof(mrconf), - payload := mrconf - } - }; - if (fr) { pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); } else { @@ -4654,7 +4647,7 @@ } pars.ass_codec_list.codecElements[0].s0_7 := s8_s0; pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; - pars.expect_mr_conf_ie := mr_conf; + pars.expect_mr_conf_ie := { multirate_cfg := mr_cfg }; pars.expect_mr_s0_s7 := exp_s8_s0; f_init(1, true); @@ -4693,71 +4686,90 @@ f_vty_amr_start_mode_restore(fr); } - /* Set S1, we expect an AMR multirate configuration IE with all four rates * set. */ testcase TC_assignment_codec_amr_f_S1() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00000010'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00000011'B, '00000010'B); f_shutdown_helper(); } /* Set S1, we expect an AMR multirate configuration IE with the lower three * rates set. */ testcase TC_assignment_codec_amr_h_S1() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00000010'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00000010'B, '00000010'B); f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_f_S124() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '00010110'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00010110'B, '00000010'B); f_shutdown_helper(); } /* Set S1 and two other rates, we expect an AMR MULTIRATE CONFIGURATION IE with * all four rates (and only S1 set in the ASSIGNMENT COMPLETE) */ testcase TC_assignment_codec_amr_h_S124() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010110'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00010110'B, '00000010'B); f_shutdown_helper(); } /* The following block of tests selects more and more rates until all four * possible rates are in the active set (full rate) */ testcase TC_assignment_codec_amr_f_S0() runs on test_CT { - f_TC_assignment_codec_amr(true, '2801'O, '00000001'B, '00000001'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000001'B)); + f_TC_assignment_codec_amr(true, mr_cfg, '00000001'B, '00000001'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S02() runs on test_CT { - f_TC_assignment_codec_amr(true, '28052080'O, '00000101'B, '00000101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000101'B, + params := '2080'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00000101'B, '00000101'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S024() runs on test_CT { - f_TC_assignment_codec_amr(true, '2815208820'O, '00010101'B, '00010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '00010101'B, '00010101'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_S0247() runs on test_CT { - f_TC_assignment_codec_amr(true, '289520882208'O, '10010101'B, '10010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '10010101'B, '10010101'B); f_shutdown_helper(); } /* The following block of tests selects more and more rates until all three * possible rates are in the active set (half rate) */ testcase TC_assignment_codec_amr_h_S0() runs on test_CT { - f_TC_assignment_codec_amr(false, '2801'O, '00000001'B, '00000001'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000001'B)); + f_TC_assignment_codec_amr(false, mr_cfg, '00000001'B, '00000001'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S02() runs on test_CT { - f_TC_assignment_codec_amr(false, '28052080'O, '00000101'B, '00000101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00000101'B, + params := '2080'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00000101'B, '00000101'B); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_S024() runs on test_CT { - f_TC_assignment_codec_amr(false, '2815208820'O, '00010101'B, '00010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '00010101'B, '00010101'B); f_shutdown_helper(); } @@ -4770,7 +4782,9 @@ testcase TC_assignment_codec_amr_h_S0247() runs on test_CT { /* Try to include 12,2k in into the active set even though the channel * is half rate only. The BSC is expected to remove the 12,0k */ - f_TC_assignment_codec_amr(false, '2815208820'O, '10010101'B, '00010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '10010101'B, '00010101'B); f_shutdown_helper(); } @@ -4778,7 +4792,9 @@ /* See what happens when all rates are selected at once. Since then * Also S1 is selected, this setting will be prefered and we should * get 12.2k, 7,40k, 5,90k, and 4,75k in the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111111'B, '00000010'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111111'B, '00000010'B); f_shutdown_helper(); } @@ -4786,7 +4802,9 @@ /* Same as above, but with S1 missing, the MSC is then expected to * select the currently supported rates, which are also 12.2k, 7,40k, * 5,90k, and 4,75k, into the active set. */ - f_TC_assignment_codec_amr(true, '289520882208'O, '11111101'B, '10010101'B); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111101'B, '10010101'B); f_shutdown_helper(); } @@ -4809,28 +4827,37 @@ } testcase TC_assignment_codec_amr_f_start_mode_auto() runs on test_CT { - f_TC_assignment_codec_amr(true, '209520882208'O, '11111111'B, '00000010'B, - start_mode := "auto"); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(icmi := false, + codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111111'B, '00000010'B, start_mode := "auto"); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_start_mode_auto() runs on test_CT { - f_TC_assignment_codec_amr(false, '2015208820'O, '10010101'B, '00010101'B, + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(icmi := false, + codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '10010101'B, '00010101'B, start_mode := "auto"); f_shutdown_helper(); } testcase TC_assignment_codec_amr_f_start_mode_4() runs on test_CT { /* "amr tch-f modes 0 2 4 7" => total 4 modes and start mode 4 => '11'B on the wire */ - f_TC_assignment_codec_amr(true, '2b9520882208'O, '11111111'B, '00000010'B, - start_mode := "4"); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(start_mode := 3, + codec_modes := '10010101'B, + params := '20882208'O)); + f_TC_assignment_codec_amr(true, mr_cfg, '11111111'B, '00000010'B, start_mode := "4"); f_shutdown_helper(); } testcase TC_assignment_codec_amr_h_start_mode_4() runs on test_CT { /* "amr tch-h modes 0 2 4" => total 3 modes and start mode 4 => '10'B on the wire */ - f_TC_assignment_codec_amr(false, '2a15208820'O, '10010101'B, '00010101'B, - start_mode := "4"); + var RSL_IE_MultirateCfg mr_cfg := valueof(ts_RSL_MultirateCfg(start_mode := 2, + codec_modes := '00010101'B, + params := '208820'O)); + f_TC_assignment_codec_amr(false, mr_cfg, '10010101'B, '00010101'B, start_mode := "4"); f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29350 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: I40dab41d5dc5d14e358ba5a070ce174e7d8d4a4b Gerrit-Change-Number: 29350 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg
by fixeria 14 Sep '22

14 Sep '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29348 ) Change subject: library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg ...................................................................... library/RSL_Types: account lengthof params in ts_RSL_MultirateCfg In TTCN-3 it's not possible to store templates in records, so in f_assignment_codec() we match received RSL_IE_MR_CONFIG against the value (not template!) stored in g_pars.expect_mr_conf_ie. Because of that, the length field is not being calculated by TITAN for us, so we need to calculate it in ts_RSL_MultirateCfg ourselves. Automatic length calculation only works during encoding/decoding and when matching against a receive template. Change-Id: I595be86d69913ba25e965a5a5c6977e00c342e60 --- M library/RSL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/48/29348/1 diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index acf7d40..cad8a34 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -832,7 +832,7 @@ template (value) RSL_IE_MultirateCfg ts_RSL_MultirateCfg(boolean icmi := true, uint2_t start_mode := 0, BIT8 codec_modes := '00000100'B /* 5,90k */, octetstring params := ''O) := { - len := 2, + len := 2 + lengthof(params), mr_speech_ver := 1, nscb := false, icmi := icmi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29348 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: I595be86d69913ba25e965a5a5c6977e00c342e60 Gerrit-Change-Number: 29348 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log