October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-gbproxy[master]: Fix obsolete documentation of function

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29719 ) Change subject: Fix obsolete documentation of function ...................................................................... Fix obsolete documentation of function Change-Id: I9588b237f1ee2979fe4ac7c802f1ff6300573e0a --- M src/gb_proxy_peer.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/gb_proxy_peer.c b/src/gb_proxy_peer.c index 1e300ad..e4cb49f 100644 --- a/src/gb_proxy_peer.c +++ b/src/gb_proxy_peer.c @@ -137,8 +137,7 @@ } /*! remove BVCs on NSE specified by NSEI. - * \param[in] cfg proxy in which we operate - * \param[in] nsei NS entity in which we should clean up + * \param[in] nse NS entity in which we should clean up * \param[in] bvci if 0: remove all PTP BVCs; if != 0: BVCI of the single BVC to clean up */ int gbproxy_cleanup_bvcs(struct gbproxy_nse *nse, uint16_t bvci) { 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/osmo-gbproxy/+/29719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I9588b237f1ee2979fe4ac7c802f1ff6300573e0a Gerrit-Change-Number: 29719 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: doc: Generalize mgwpool.adoc and move BSC-specific sections to runnni...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29818 ) Change subject: doc: Generalize mgwpool.adoc and move BSC-specific sections to runnning.adoc ...................................................................... doc: Generalize mgwpool.adoc and move BSC-specific sections to runnning.adoc This is a preparation commit before moving mgwpool.adoc to a share place (osmo-gsm-manuals.adoc) so that other apps like osmo-msc and osmo-hnbgw can also include this section. Related: SYS#5987 Change-Id: Id0d292506e8b2a888c8d7a682a38db80e9d0933a --- M doc/manuals/chapters/mgwpool.adoc M doc/manuals/chapters/running.adoc 2 files changed, 79 insertions(+), 82 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/18/29818/1 diff --git a/doc/manuals/chapters/mgwpool.adoc b/doc/manuals/chapters/mgwpool.adoc index 8904bad..c429159 100644 --- a/doc/manuals/chapters/mgwpool.adoc +++ b/doc/manuals/chapters/mgwpool.adoc @@ -1,7 +1,7 @@ [[mgw_pooling]] == MGW Pooling -OsmoBSC is able to use a pool of media gateway (MGW) instances since mid 2021. +{program-name} is able to use a pool of media gateway (MGW) instances. The aim of MGW pooling is to evenly distribute the RTP voice stream load across multiple MGW instances. This can help to scale out over multiple VMs or physical machines. Until osmo-mgw includes multithreading support, it may also be used to @@ -10,39 +10,23 @@ The load distribution is managed in such a way that when a new call is placed, the pool will automatically assign the call to the MGW with the lowest load. -MGW pooling is recommended for larger RAN installations. For small networks and -lab installations the classic method with one MGW per BSC offers sufficient +MGW pooling is recommended for larger RAN or CN installations. For small networks +and lab installations the classic method with one MGW per BSC offers sufficient performance. -=== VTY configuration +=== MGW pool VTY configuration -In OsmoBSC the MGW is controlled via an MGCP-Client. The VTY commands to -configure the MGCP-Client are part of the 'msc' node due to historical reasons. -Unfortunately this concept does not allow to configure multiple MGCP-Client -instances as required by MGW pooling. In order to support MGW pooling a new -'mgw' node has been added under the 'network' node. - -=== Existing configuration files - -Existing OsmoBSC configuration files will continue to work, but as soon as an -MGW pool is configured the 'mgw' settings under the 'msc' node will be ignored. - -Example configuration with only one MGCP-Client under the 'msc' node: ----- -msc 0 - mgw remote-ip 127.0.0.1 - mgw remote-port 2428 ----- - -=== MGW pool configuration +In {program-name} the MGW is controlled via an MGCP-Client. The VTY commands to +configure the MGCP-Client are part of the several 'mgw' nodes, one per +MGCP-Client to set up. To setup an MGW pool, the user must first install multiple OsmoMGW instances, so that they won’t interfere with each other. This can be done using different local host IP addresses or different ports. When OsmoMGW is installed from packages, the systemd configuration may also require adjustment. -The VTY settings under the 'mgw' node works the same way as the VTY settings for -the MGW under the 'msc' node. +By default, MGCP-Client will use whatever source IP address is resolved by the +kernel routing subsystem, and will also ask the kernel to pick a free UDP port. Example configuration with two MGCP-Client instances in a pool: ---- @@ -73,15 +57,16 @@ === MGW pool management -While it was not possible to change the MGCP-Client configuration under the -“msc” node at runtime, the pool is fully runtime-manageable. The only limitation +The MNGW pool is fully runtime-manageable. The only limitation is that an MGCP-Client can not be restarted or removed as long as it is serving calls (see also: <<mgw_pooling_blocking>>). ==== MGW pool status The VTY implements a 'show mgw-pool' command that lists the currently configured -MGW pool members, their status and call utilization. +MGW pool members, their status and call utilization. The following snippet shows +an output example run on OsmoBSC, but it should be also available on other +applications supporting the MGW pooling VTY featues: ---- OsmoBSC> show mgw-pool @@ -101,14 +86,16 @@ To add a new MGCP-Client to the pool, the 'mgw' node is used. Like with the 'bts' or the 'msc' node a reference number is used that usually starts at 0. However it is still possible to assign any number from 0-255. The enumeration -also may contain gaps. +also may contain gaps. The following snippet shows an output example run on +OsmoBSC, but it should be also available on other applications supporting the +MGW pooling VTY featues: ---- OsmoBSC> enable OsmoBSC# configure terminal OsmoBSC(config)# network OsmoBSC(config-net)# mgw 2 -OsmoBSC(config-mgw)# mgw +OsmoBSC(config-mgw)# ? local-ip local bind to connect to MGW from local-port local port to connect to MGW from remote-ip remote IP address to reach the MGW at @@ -184,7 +171,7 @@ ---- It is strongly advised to check the activity on the related MGW and to follow -the log in order to see that the communication between OsmoBSC and the MGW is +the log in order to see that the communication between {program-name} and the MGW is working correctly. [[mgw_pooling_blocking]] @@ -250,52 +237,3 @@ OsmoBSC(config)# network OsmoBSC(config-net)# no mgw 2 ---- - -==== Pinning a BTS to a specific MGW - -It is sometimes desirable to assign a specific MGW to a given BTS, so that all -calls where the BTS is involved use the assigned MGW with a higher precedence if -possible. - -This is specially important if the BTS is configured to serve calls using Osmux -instead of RTP. Osmux features trunking optimizations, which allow transmission -of audio payload from different concurrent calls inside the same underlaying UDP -packet, hence reducing the total required throughput and saving costs on the -required link. - -In order for Osmux trunking optimization to work, the source and destination IP -address of uderlaying UDP packet must be of course the same for all the calls -involved. That essentially boils down to having all the concurrent calls of the -BTS be connected to the same MGW so that they can be trunked over the same UDP -connection. - -The pinning to a specific MGW can be configured per BTS, and hence it is -configured under the `bts` VTY node: - ----- -OsmoBSC> enable -OsmoBSC# configure terminal -OsmoBSC(config)# network -OsmoBSC(config-net)# bts 1 -OsmoBSC(config-bts)# mgw pool-target 1 <1> -OsmoBSC(config-bts)# exit -OsmoBSC(config-net)# bts 2 -OsmoBSC(config-mgw)# mgw pool-target 7 strict <2> -OsmoBSC(config-net)# bts 3 -OsmoBSC(config-mgw)# no mgw pool-target <3> ----- - -<1> Pin BTS1 to prefer MGW1 (node `mgw 1`). If MGW1 is not configured, -administrateivly blocked or not connected at the time a new call is to be -established, then another MGW from the pool is selected following the usual -procedures. This allows applying pinning in the usual scenario while still -keeping call service ongoing against another MGW if the preferred MGW is not -available at a given time. - -<2> Pin BTS2 to prefer MGW3 (node `mgw 7`). If MGW7 is not configured, -administrateivly blocked or not connected at the time a new call is to be -established, then the MGW assignment will fail and ultimately the call will be -terminated during establishment. - -<3> Apply no pinning at all (default). The MGW with the lowest load is the one -being selected for each new call. diff --git a/doc/manuals/chapters/running.adoc b/doc/manuals/chapters/running.adoc index 930682d..e338dee 100644 --- a/doc/manuals/chapters/running.adoc +++ b/doc/manuals/chapters/running.adoc @@ -144,9 +144,68 @@ DLCX to the media gateway. This helps to clear lingering calls from the media gateway when the OsmoBSC is restarted. -NOTE: OsmoBSC is also able to handle a pool of media gateways for load -distribution. See also <<mgw_pooling>>. +OsmoBSC is also able to handle a pool of media gateways for load +distribution since mid 2021. See also <<mgw_pooling>>. +[NOTE] +==== +Previous versions of OsmoBSC didn't have the 'mgw' VTY node and +hence didn't support the MGW pooling feature. Therefore, historically the MGW +related commands where placed under the `msc` VTY node. The MGW related commands +under the `msc` VTY are still parsed and used but its use is deprecated and +hence discouraged in favour of the new `mgw` node. Writing the config to a file +from within OsmoBSC will automatically convert the config to use the new `mgw` +node. +==== + +===== Pinning a BTS to a specific MGW + +It is sometimes desirable to assign a specific MGW to a given BTS, so that all +calls where the BTS is involved use the assigned MGW with a higher precedence if +possible. + +This is specially important if the BTS is configured to serve calls using Osmux +instead of RTP. Osmux features trunking optimizations, which allow transmission +of audio payload from different concurrent calls inside the same underlaying UDP +packet, hence reducing the total required throughput and saving costs on the +required link. + +In order for Osmux trunking optimization to work, the source and destination IP +address of uderlaying UDP packet must be of course the same for all the calls +involved. That essentially boils down to having all the concurrent calls of the +BTS be connected to the same MGW so that they can be trunked over the same UDP +connection. + +The pinning to a specific MGW can be configured per BTS, and hence it is +configured under the `bts` VTY node: + +---- +OsmoBSC> enable +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 1 +OsmoBSC(config-bts)# mgw pool-target 1 <1> +OsmoBSC(config-bts)# exit +OsmoBSC(config-net)# bts 2 +OsmoBSC(config-mgw)# mgw pool-target 7 strict <2> +OsmoBSC(config-net)# bts 3 +OsmoBSC(config-mgw)# no mgw pool-target <3> +---- + +<1> Pin BTS1 to prefer MGW1 (node `mgw 1`). If MGW1 is not configured, +administrateivly blocked or not connected at the time a new call is to be +established, then another MGW from the pool is selected following the usual +procedures. This allows applying pinning in the usual scenario while still +keeping call service ongoing against another MGW if the preferred MGW is not +available at a given time. + +<2> Pin BTS2 to prefer MGW3 (node `mgw 7`). If MGW7 is not configured, +administrateivly blocked or not connected at the time a new call is to be +established, then the MGW assignment will fail and ultimately the call will be +terminated during establishment. + +<3> Apply no pinning at all (default). The MGW with the lowest load is the one +being selected for each new call. ==== Configure Lb to connect to an SMLC -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id0d292506e8b2a888c8d7a682a38db80e9d0933a Gerrit-Change-Number: 29818 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_vty: Add commands to list Cell/BVC of an NSE

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 ) Change subject: gbproxy_vty: Add commands to list Cell/BVC of an NSE ...................................................................... gbproxy_vty: Add commands to list Cell/BVC of an NSE Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 --- M src/gb_proxy_vty.c 1 file changed, 50 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved diff --git a/src/gb_proxy_vty.c b/src/gb_proxy_vty.c index 906beff..e5f53e2 100644 --- a/src/gb_proxy_vty.c +++ b/src/gb_proxy_vty.c @@ -529,6 +529,34 @@ return CMD_SUCCESS; } +DEFUN(show_gbproxy_bvc_nsei, show_gbproxy_bvc_nsei_cmd, "show gbproxy bvc (bss|sgsn) nsei <0-65535> [stats]", + SHOW_STR GBPROXY_STR + "Show BSSGP Virtual Connections\n" + "Display BSS-side BVCs\n" + "Display SGSN-side BVCs\n" + "Limit display to cells from an NSE\n" + "NSEI to use\n" + "Show statistics\n") +{ + struct gbproxy_nse *nse; + bool show_stats = argc >= 3; + int i; + uint16_t nsei = atoi(argv[1]); + + if (!strcmp(argv[0], "bss")) { + hash_for_each(g_cfg->bss_nses, i, nse, list) { + if (nse->nsei == nsei) + gbproxy_vty_print_nse(vty, nse, show_stats); + } + } else { + hash_for_each(g_cfg->sgsn_nses, i, nse, list) { + if (nse->nsei == nsei) + gbproxy_vty_print_nse(vty, nse, show_stats); + } + } + return CMD_SUCCESS; +} + DEFUN(show_gbproxy_cell, show_gbproxy_cell_cmd, "show gbproxy cell [stats]", SHOW_STR GBPROXY_STR "Show GPRS Cell Information\n" @@ -544,6 +572,26 @@ return CMD_SUCCESS; } +DEFUN(show_gbproxy_cell_nsei, show_gbproxy_cell_nsei_cmd, "show gbproxy cell nsei <0-65535> [stats]", + SHOW_STR GBPROXY_STR + "Show GPRS Cell Information\n" + "Limit display to cells from an NSE\n" + "NSEI to use\n" + "Show statistics\n") +{ + struct gbproxy_cell *cell; + bool show_stats = argc >= 2; + int i; + uint16_t nsei = atoi(argv[0]); + + hash_for_each(g_cfg->cells, i, cell, list) { + if (cell->bss_bvc->nse->nsei == nsei) + gbproxy_vty_print_cell(vty, cell, show_stats); + } + + return CMD_SUCCESS; +} + DEFUN(show_gbproxy_tlli_cache, show_gbproxy_tlli_cache_cmd, "show gbproxy tlli-cache", SHOW_STR GBPROXY_STR "Show TLLI cache entries\n") @@ -722,7 +770,9 @@ int gbproxy_vty_init(void) { install_element_ve(&show_gbproxy_bvc_cmd); + install_element_ve(&show_gbproxy_bvc_nsei_cmd); install_element_ve(&show_gbproxy_cell_cmd); + install_element_ve(&show_gbproxy_cell_nsei_cmd); install_element_ve(&show_gbproxy_tlli_cache_cmd); install_element_ve(&show_gbproxy_imsi_cache_cmd); install_element_ve(&show_nri_all_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 Gerrit-Change-Number: 29714 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_vty: Add commands to list Cell/BVC of an NSE

by daniel

Attention is currently required from: lynxis lazus, msuraev. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 ) Change subject: gbproxy_vty: Add commands to list Cell/BVC of an NSE ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 Gerrit-Change-Number: 29714 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Oct 2022 14:10:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_vty: Add commands to list Cell/BVC of an NSE

by daniel

Attention is currently required from: lynxis lazus, msuraev. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 ) Change subject: gbproxy_vty: Add commands to list Cell/BVC of an NSE ...................................................................... Patch Set 3: (3 comments) Patchset: PS3: Re-adding +2 from before File src/gb_proxy_vty.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714/comment/d367e82b_d0b85d46 PS2, Line 543: int i; > I don't completely disagree, but in the macro bkt is initialized to 0 and checked against ARRAY_SIZE […] Done https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714/comment/a3aaa1df_e993d9d5 PS2, Line 587: int i; > Same as above. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 Gerrit-Change-Number: 29714 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Oct 2022 14:10:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_vty: Add commands to list Cell/BVC of an NSE

by daniel

Attention is currently required from: lynxis lazus, msuraev. Hello Jenkins Builder, laforge, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 to look at the new patch set (#3). Change subject: gbproxy_vty: Add commands to list Cell/BVC of an NSE ...................................................................... gbproxy_vty: Add commands to list Cell/BVC of an NSE Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 --- M src/gb_proxy_vty.c 1 file changed, 50 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/14/29714/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 Gerrit-Change-Number: 29714 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-gbproxy[master]: gbproxy_vty: Add commands to list Cell/BVC of an NSE

by daniel

Attention is currently required from: lynxis lazus, msuraev. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 ) Change subject: gbproxy_vty: Add commands to list Cell/BVC of an NSE ...................................................................... Patch Set 3: (1 comment) File src/gb_proxy_vty.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714/comment/6e808811_1c798ef7 PS2, Line 547: vty_out_rate_ctr_group(vty, "", g_cfg->ctrg); > This isn't filtered for a specific NSEI, right? Right, it's a global group. I'll just remove it here, doesn't make much sense -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 Gerrit-Change-Number: 29714 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Oct 2022 13:50:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 to look at the new patch set (#3). Change subject: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn ...................................................................... library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn Change-Id: Icd96fc461e37d1346950a4fa158e0421bd7330c5 --- M gbproxy/gen_links.sh M library/GSM_RR_Types.ttcn M library/GSM_RestOctets.ttcn M library/L1CTL_PortType.ttcn M library/LAPDm_RAW_PT.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn M pcu/gen_links.sh M selftest/gen_links.sh M sgsn/gen_links.sh 10 files changed, 273 insertions(+), 250 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/29817/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 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: Icd96fc461e37d1346950a4fa158e0421bd7330c5 Gerrit-Change-Number: 29817 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 ) Change subject: library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn ...................................................................... library: move IA/IAR Rest Octets to GSM_RestOctets.ttcn Change-Id: Icd96fc461e37d1346950a4fa158e0421bd7330c5 --- M library/GSM_RR_Types.ttcn M library/GSM_RestOctets.ttcn M library/L1CTL_PortType.ttcn M library/LAPDm_RAW_PT.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn M pcu/gen_links.sh 7 files changed, 270 insertions(+), 247 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/29817/1 diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 335e290..b62dcb9 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -15,6 +15,7 @@ import from General_Types all; import from Osmocom_Types all; import from GSM_Types all; + import from GSM_RestOctets all; import from RLCMAC_CSN1_Types all; import from MobileL3_CommonIE_Types all; import from MobileL3_RRM_Types all; @@ -421,224 +422,6 @@ uint3_t non_drx_timer } with { variant "" }; - /* 44.018 10.5.2.16 */ - type record IaRestOctHL { - uint6_t freq_par_len, - BIT2 padding ('00'B) optional, - uint6_t maio optional, - octetstring mobile_allocation optional - } with { - variant (freq_par_len) "LENGTHTO(mobile_allocation,maio,padding)" -/* - variant (padding) "PRESENCE(freq_par_len != 0)" - variant (maio) "PRESENCE(freq_par_len != 0)" - variant (mobile_allocation) "PRESENCE(freq_par_len != 0)" -*/ - }; - type record SecondPartAssign { - BIT1 r99, /* L / H */ - BIT1 presence optional, - BIT5 ext_ra optional - } with { - variant (r99) "CSN.1 L/H" - variant (presence) "PRESENCE(r99 = '1'B)" /* H */ - variant (ext_ra) "PRESENCE(presence = '1'B)" - /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ - variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first - }; - type union PacketUlDlAssignUnion { - PacketUlAssign ul, - PacketDlAssign dl - }; - type record PacketUlDlAssign { - BIT1 ass_disc, - PacketUlDlAssignUnion ass - } with { - variant (ass) "CROSSTAG(dl, ass_disc = '1'B; ul, ass_disc = '0'B)" - }; - type union PacketAssignUnion { - SecondPartAssign spa, - PacketUlDlAssign uldl - }; - type record IaRestOctHH { - /* Packet Assignment discriminator: - * Packet Uplink / Downlink Assignment (0) - * Second Part Packet Assignment (1) */ - BIT1 pa_disc, - PacketAssignUnion pa - } with { - variant (pa) "CROSSTAG(spa, pa_disc = '1'B; uldl, pa_disc = '0'B)" - }; - type record TbfStartingTime { - uint5_t t1, - uint6_t t3, - uint5_t t2 - }; - type record PacketUlAssignDyn { - uint5_t tfi_assignment, - BIT1 polling, - BIT1 spare ('0'B), - uint3_t usf, - BIT1 usf_granularity, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 pr_mode optional, - ChCodingCommand ch_coding_cmd, - BIT1 tlli_block_chan_coding, - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT1 ta_index_present, - uint4_t ta_index optional, - BIT1 tbf_starting_time_present, - TbfStartingTime tbf_starting_time optional - } with { - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - variant (alpha) "PRESENCE(alpha_present = '1'B)" - variant (ta_index) "PRESENCE(ta_index_present = '1'B)" - variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - }; - type record PacketUlAssignSgl { - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT2 padding ('01'B), - TbfStartingTime tbf_starting_time - /* TODO: P0 / PR_MODE */ - } with { - variant (alpha) "PRESENCE(alpha_present = '1'B)" - }; - type record PacketUlAssign { - BIT1 presence, - PacketUlAssignDyn dynamic optional, - PacketUlAssignSgl single optional - /* TODO: Estended RA, PFI */ - } with { - variant (dynamic) "PRESENCE(presence = '1'B)" - variant (single) "PRESENCE(presence = '0'B)" - }; - type record PacketDlAssG1 { - uint5_t tfi_assignment, - BIT1 rlc_mode, - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT1 polling, - BIT1 ta_valid - } with { variant "" }; - type record PacketDlAssign { - GprsTlli tlli, - BIT1 group1_present, - PacketDlAssG1 group1 optional, - BIT1 ta_index_present, - uint4_t ta_index optional, - BIT1 tbf_starting_time_present, - TbfStartingTime tbf_starting_time optional, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 pr_mode optional - /* TODO: EGPRS window size, etc. */ - } with { - variant (group1) "PRESENCE(group1_present = '1'B)" - variant (ta_index) "PRESENCE(ta_index_present = '1'B)" - variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - }; - type record IaRestOctLL { - BIT1 compressed_irat_ho_info_ind - } with { - variant (compressed_irat_ho_info_ind) "CSN.1 L/H" - }; - type record EgprsUlAssignDyn { - uint5_t tfi_assignment, - BIT1 polling, - BIT1 spare ('0'B), - uint3_t usf, - BIT1 usf_granularity, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 pr_mode optional, - EgprsChCodingCommand egprs_ch_coding_cmd, - BIT1 tlli_block_chan_coding, - BIT1 bep_period2_present, - BIT4 bep_period2 optional, - BIT1 resegment, - EgprsWindowSize egprs_window_size, - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - BIT1 ta_index_present, - uint4_t ta_index optional, - BIT1 tbf_starting_time_present, - TbfStartingTime tbf_starting_time optional - /* TODO: Additions for Rel-7 */ - } with { - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" - variant (alpha) "PRESENCE(alpha_present = '1'B)" - variant (ta_index) "PRESENCE(ta_index_present = '1'B)" - variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" - }; - type record EgprsUlAssignMultiblock { - BIT1 alpha_present, - uint4_t alpha optional, - uint5_t gamma, - TbfStartingTime tbf_starting_time, - BIT2 nr_radio_blocks_allocated, - BIT1 p0_present, - uint4_t p0 optional, - BIT1 spare ('0'B) optional, - BIT1 pr_mode optional - /* TDO: Additions for Rel-6 */ - } with { - variant (alpha) "PRESENCE(alpha_present = '1'B)" - variant (p0) "PRESENCE(p0_present = '1'B)" - variant (spare) "PRESENCE(p0_present = '1'B)" - variant (pr_mode) "PRESENCE(p0_present = '1'B)" - }; - /* 3GPP TS 44.018 version 13.3.2 10.5.2.16, "EGPRS Packet Uplink Assignment" */ - type record EgprsUlAss { - BIT5 ext_ra, - BIT1 ats_present, - AccessTechnologiesRequestRepetition ats optional, - BIT1 presence, - EgprsUlAssignDyn dynamic optional, - EgprsUlAssignMultiblock multiblock optional - } with { - variant (ats) "PRESENCE(ats_present = '1'B)" - variant (dynamic) "PRESENCE(presence = '1'B)" - variant (multiblock) "PRESENCE(presence = '0'B)" - /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ - variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first - }; - - type octetstring MblkDlAss; /* TODO */ - type record IaRestOctLH { - BIT2 presence, - EgprsUlAss egprs_ul optional, - MblkDlAss multiblock_dl_ass optional - } with { - variant (egprs_ul) "PRESENCE(presence = '00'B)" - variant (multiblock_dl_ass) "PRESENCE(presence = '01'B)" - }; - type record IaRestOctets { - BIT2 presence, - IaRestOctLL ll optional, - IaRestOctLH lh optional, - IaRestOctHL hl optional, - IaRestOctHH hh optional - } with { - variant (presence) "CSN.1 L/H" - variant (ll) "PRESENCE(presence = '00'B)" - variant (lh) "PRESENCE(presence = '01'B)" - variant (hl) "PRESENCE(presence = '10'B)" - variant (hh) "PRESENCE(presence = '11'B)" - variant "PADDING(yes), PADDING_PATTERN('00101011'B)" - }; - type record MeasurementResults { BIT1 ba_used, BIT1 dtx_used, @@ -744,34 +527,6 @@ IARRestOctets rest_octets } with { variant "" }; - /* 10.5.2.17 IAR (Immediate Assignment Reject) Rest Octets */ - type record IARRestOctets { - ExtRAList ext_ra_list, - BIT1 rel13_ind, // L/H - uint3_t rcc optional - /* Addition in Rel-15: PEO IMM Cell Group Details struct */ - } with { - variant (rel13_ind) "CSN.1 L/H" - variant (rcc) "PRESENCE(rel13_ind = '1'B)" - - /* The TITAN's RAW encoder generates an octet-aligned octetstring, - * so we should make sure that unused bits contain proper padding. */ - variant "PADDING(yes), PADDING_PATTERN('00101011'B)" - }; - - /* Optional extended RA: 0 | 1 < Extended RA 1 : bit (5) > */ - type record ExtRAOpt { - BIT1 presence, // L/H - BIT5 ext_ra optional - } with { - variant (presence) "CSN.1 L/H" - variant (ext_ra) "PRESENCE(presence = '1'B)" - /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ - variant (ext_ra) "BYTEORDER(last)" - }; - - type record length(4) of ExtRAOpt ExtRAList; - /* 9.1.21 */ type record MeasurementReport { MeasurementResults meas_res diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn index 94dce04..2be96a4 100644 --- a/library/GSM_RestOctets.ttcn +++ b/library/GSM_RestOctets.ttcn @@ -16,6 +16,270 @@ import from General_Types all; import from Osmocom_Types all; import from RLCMAC_CSN1_Types all; +import from GSM_Types all; + +/* 10.5.2.16 IA (Immediate Assignment) Rest Octets */ +type record IaRestOctets { + BIT2 presence, + IaRestOctLL ll optional, + IaRestOctLH lh optional, + IaRestOctHL hl optional, + IaRestOctHH hh optional +} with { + variant (presence) "CSN.1 L/H" + variant (ll) "PRESENCE(presence = '00'B)" + variant (lh) "PRESENCE(presence = '01'B)" + variant (hl) "PRESENCE(presence = '10'B)" + variant (hh) "PRESENCE(presence = '11'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + +type record IaRestOctLL { + BIT1 compressed_irat_ho_info_ind +} with { + variant (compressed_irat_ho_info_ind) "CSN.1 L/H" +}; + +type record IaRestOctLH { + BIT2 presence, + EgprsUlAss egprs_ul optional, + octetstring multiblock_dl_ass optional /* TODO */ +} with { + variant (egprs_ul) "PRESENCE(presence = '00'B)" + variant (multiblock_dl_ass) "PRESENCE(presence = '01'B)" +}; + +/* EGPRS Packet Uplink Assignment */ +type record EgprsUlAss { + BIT5 ext_ra, + BIT1 ats_present, + AccessTechnologiesRequestRepetition ats optional, + BIT1 presence, + EgprsUlAssignDyn dynamic optional, + EgprsUlAssignMultiblock multiblock optional +} with { + variant (ats) "PRESENCE(ats_present = '1'B)" + variant (dynamic) "PRESENCE(presence = '1'B)" + variant (multiblock) "PRESENCE(presence = '0'B)" + /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ + variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first +}; + +type record EgprsUlAssignDyn { + uint5_t tfi_assignment, + BIT1 polling, + BIT1 spare ('0'B), + uint3_t usf, + BIT1 usf_granularity, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional, + EgprsChCodingCommand egprs_ch_coding_cmd, + BIT1 tlli_block_chan_coding, + BIT1 bep_period2_present, + BIT4 bep_period2 optional, + BIT1 resegment, + EgprsWindowSize egprs_window_size, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + TbfStartingTime tbf_starting_time optional + /* TODO: Additions for Rel-7 */ +} with { + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + variant (bep_period2) "PRESENCE(bep_period2_present = '1'B)" + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" +}; + +type record EgprsUlAssignMultiblock { + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + TbfStartingTime tbf_starting_time, + BIT2 nr_radio_blocks_allocated, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 spare ('0'B) optional, + BIT1 pr_mode optional + /* TDO: Additions for Rel-6 */ +} with { + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (spare) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" +}; + +type record IaRestOctHL { + uint6_t freq_par_len, + BIT2 padding ('00'B) optional, + uint6_t maio optional, + octetstring mobile_allocation optional +} with { + variant (freq_par_len) "LENGTHTO(mobile_allocation,maio,padding)" +/* + variant (padding) "PRESENCE(freq_par_len != 0)" + variant (maio) "PRESENCE(freq_par_len != 0)" + variant (mobile_allocation) "PRESENCE(freq_par_len != 0)" +*/ +}; + +type record IaRestOctHH { + /* Packet Assignment discriminator: + * Packet Uplink / Downlink Assignment (0) + * Second Part Packet Assignment (1) */ + BIT1 pa_disc, + PacketAssignUnion pa +} with { + variant (pa) "CROSSTAG(spa, pa_disc = '1'B; uldl, pa_disc = '0'B)" +}; + +type union PacketAssignUnion { + SecondPartAssign spa, + PacketUlDlAssign uldl +}; + +type record SecondPartAssign { + BIT1 r99, /* L / H */ + BIT1 presence optional, + BIT5 ext_ra optional +} with { + variant (r99) "CSN.1 L/H" + variant (presence) "PRESENCE(r99 = '1'B)" /* H */ + variant (ext_ra) "PRESENCE(presence = '1'B)" + /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ + variant (ext_ra) "BYTEORDER(last)" // FIXME: should be first +}; + +type record PacketUlDlAssign { + BIT1 ass_disc, + PacketUlDlAssignUnion ass +} with { + variant (ass) "CROSSTAG(dl, ass_disc = '1'B; ul, ass_disc = '0'B)" +}; + +type union PacketUlDlAssignUnion { + PacketUlAssign ul, + PacketDlAssign dl +}; + +type record PacketUlAssign { + BIT1 presence, + PacketUlAssignDyn dynamic optional, + PacketUlAssignSgl single optional + /* TODO: Estended RA, PFI */ +} with { + variant (dynamic) "PRESENCE(presence = '1'B)" + variant (single) "PRESENCE(presence = '0'B)" +}; + +type record PacketUlAssignDyn { + uint5_t tfi_assignment, + BIT1 polling, + BIT1 spare ('0'B), + uint3_t usf, + BIT1 usf_granularity, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional, + ChCodingCommand ch_coding_cmd, + BIT1 tlli_block_chan_coding, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + TbfStartingTime tbf_starting_time optional +} with { + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" + variant (alpha) "PRESENCE(alpha_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" +}; + +type record PacketUlAssignSgl { + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT2 padding ('01'B), + TbfStartingTime tbf_starting_time + /* TODO: P0 / PR_MODE */ +} with { + variant (alpha) "PRESENCE(alpha_present = '1'B)" +}; + +type record PacketDlAssign { + GprsTlli tlli, + BIT1 group1_present, + PacketDlAssG1 group1 optional, + BIT1 ta_index_present, + uint4_t ta_index optional, + BIT1 tbf_starting_time_present, + TbfStartingTime tbf_starting_time optional, + BIT1 p0_present, + uint4_t p0 optional, + BIT1 pr_mode optional + /* TODO: EGPRS window size, etc. */ +} with { + variant (group1) "PRESENCE(group1_present = '1'B)" + variant (ta_index) "PRESENCE(ta_index_present = '1'B)" + variant (tbf_starting_time) "PRESENCE(tbf_starting_time_present = '1'B)" + variant (p0) "PRESENCE(p0_present = '1'B)" + variant (pr_mode) "PRESENCE(p0_present = '1'B)" +}; + +type record PacketDlAssG1 { + uint5_t tfi_assignment, + BIT1 rlc_mode, + BIT1 alpha_present, + uint4_t alpha optional, + uint5_t gamma, + BIT1 polling, + BIT1 ta_valid +} with { variant "" }; + +type record TbfStartingTime { + uint5_t t1, + uint6_t t3, + uint5_t t2 +}; + +/* 10.5.2.17 IAR (Immediate Assignment Reject) Rest Octets */ +type record IARRestOctets { + ExtRAList ext_ra_list, + BIT1 rel13_ind, // L/H + uint3_t rcc optional + /* Addition in Rel-15: PEO IMM Cell Group Details struct */ +} with { + variant (rel13_ind) "CSN.1 L/H" + variant (rcc) "PRESENCE(rel13_ind = '1'B)" + + /* The TITAN's RAW encoder generates an octet-aligned octetstring, + * so we should make sure that unused bits contain proper padding. */ + variant "PADDING(yes), PADDING_PATTERN('00101011'B)" +}; + +/* Optional extended RA: 0 | 1 < Extended RA 1 : bit (5) > */ +type record length(4) of ExtRAOpt ExtRAList; +type record ExtRAOpt { + BIT1 presence, // L/H + BIT5 ext_ra optional +} with { + variant (presence) "CSN.1 L/H" + variant (ext_ra) "PRESENCE(presence = '1'B)" + /* See https://bugs.eclipse.org/bugs/show_bug.cgi?id=562488 */ + variant (ext_ra) "BYTEORDER(last)" +}; /* 10.5.2.33b SI 2quater Rest Octets */ type record SI2quaterRestOctets { diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index 80fa074..e521730 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -17,6 +17,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from L1CTL_PortType_CtrlFunct all; type record L1CTL_connect { diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 946da67..9630df0 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -14,6 +14,7 @@ module LAPDm_RAW_PT { import from GSM_Types all; import from GSM_RR_Types all; + import from GSM_RestOctets all; import from Osmocom_Types all; import from L1CTL_Types all; import from L1CTL_PortType all; diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index eb29787..f9a39a6 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -16,6 +16,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; +import from GSM_RestOctets all; import from RLCMAC_CSN1_Types all; import from RLCMAC_CSN1_Templates all; diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 611ca23..1648a92 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -22,6 +22,7 @@ import from Osmocom_Types all; import from GSM_Types all; import from GSM_RR_Types all; +import from GSM_RestOctets all; import from Osmocom_VTY_Functions all; import from TELNETasp_PortType all; diff --git a/pcu/gen_links.sh b/pcu/gen_links.sh index d0f3ace..556f02a 100755 --- a/pcu/gen_links.sh +++ b/pcu/gen_links.sh @@ -49,7 +49,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc GSM_Types.ttcn GSM_RR_Types.ttcn GSM_RestOctets.ttcn Osmocom_Types.ttcn RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="RAW_NS.ttcnpp NS_Provider_IPL4.ttcn NS_Emulation.ttcnpp " FILES+="BSSGP_Emulation.ttcnpp Osmocom_Gb_Types.ttcn " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29817 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: Icd96fc461e37d1346950a4fa158e0421bd7330c5 Gerrit-Change-Number: 29817 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: gprs-modem: initial testsuite skeleton for GPRS modem

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29816 ) Change subject: gprs-modem: initial testsuite skeleton for GPRS modem ...................................................................... gprs-modem: initial testsuite skeleton for GPRS modem Change-Id: I6dddcfe836555b8d205780efd8371c569531c7a2 --- A gprs-modem/GPRSModem_Tests.cfg A gprs-modem/GPRSModem_Tests.default A gprs-modem/gen_links.sh A gprs-modem/regen_makefile.sh 4 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/29816/1 diff --git a/gprs-modem/GPRSModem_Tests.cfg b/gprs-modem/GPRSModem_Tests.cfg new file mode 100644 index 0000000..bc3031a --- /dev/null +++ b/gprs-modem/GPRSModem_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./GPRSModem_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +GPRSModem_Tests.control diff --git a/gprs-modem/GPRSModem_Tests.default b/gprs-modem/GPRSModem_Tests.default new file mode 100644 index 0000000..02c3a6a --- /dev/null +++ b/gprs-modem/GPRSModem_Tests.default @@ -0,0 +1,10 @@ +[LOGGING] +mtc.FileMask := LOG_ALL | TTCN_DEBUG | TTCN_MATCHING | DEBUG_ENCDEC; +mtc.ConsoleMask := ERROR | WARNING | TESTCASE | USER | VERDICTOP; + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +L1CTL_PortType.m_l1ctl_sock_path := "/tmp/osmocom_l2"; + +[EXECUTE] diff --git a/gprs-modem/gen_links.sh b/gprs-modem/gen_links.sh new file mode 100755 index 0000000..20076c7 --- /dev/null +++ b/gprs-modem/gen_links.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src +FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.MobileL3_v13.4.0/src +FILES="MobileL3_CC_Types.ttcn MobileL3_CommonIE_Types.ttcn MobileL3_GMM_SM_Types.ttcn MobileL3_MM_Types.ttcn MobileL3_RRM_Types.ttcn MobileL3_SMS_Types.ttcn MobileL3_SS_Types.ttcn MobileL3_Types.ttcn" +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn " +FILES+="GSM_Types.ttcn GSM_RR_Types.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " +FILES+="RLCMAC_Templates.ttcn RLCMAC_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn RLCMAC_EncDec.cc " +FILES+="L1CTL_Types.ttcn L1CTL_PortType.ttcn L1CTL_PortType_CtrlFunct.ttcn L1CTL_PortType_CtrlFunctDef.cc " +FILES+="LAPDm_RAW_PT.ttcn LAPDm_Types.ttcn " +FILES+="L3_Templates.ttcn L3_Common.ttcn " +FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/gprs-modem/regen_makefile.sh b/gprs-modem/regen_makefile.sh new file mode 100755 index 0000000..38eab61 --- /dev/null +++ b/gprs-modem/regen_makefile.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +NAME=GPRSModem_Tests + +FILES=" + *.ttcn + IPL4asp_PT.cc + IPL4asp_discovery.cc + L1CTL_PortType_CtrlFunctDef.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + TCCConversion.cc + TCCInterface.cc + UD_PT.cc +" + +../regen-makefile.sh -e $NAME $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29816 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: I6dddcfe836555b8d205780efd8371c569531c7a2 Gerrit-Change-Number: 29816 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022