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

Change in osmo-gsm-manuals[master]: merge gb-ns2 "chapters" in one

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30357 ) Change subject: merge gb-ns2 "chapters" in one ...................................................................... merge gb-ns2 "chapters" in one The files gb-nsw-{configuration-timer,configuration,maintenance} were not actually chapters, but sub-chapters or sub-sub-chapters. This breaks our general idea that all of those files are top-level chapters. It also breaks asciidoc validation on Debian 11: asciidoc: WARNING: gb-ns2-configuration.adoc: line 1: section title out of sequence: expected level 1, got level 2 asciidoc: WARNING: gb-ns2-maintenance.adoc: line 6: section title out of sequence: expected level 2, got level 3 the only place where they were used was the osmo-gbproxy manual, and there in the exact sequenc in which I now merged them over here. Change-Id: I3c618e5af61b376435f400ef9c64245cec2f9b73 --- D common/chapters/gb-ns2-configuration-timer.adoc D common/chapters/gb-ns2-configuration.adoc D common/chapters/gb-ns2-maintenance.adoc M common/chapters/gb-ns2.adoc 4 files changed, 317 insertions(+), 314 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/57/30357/1 diff --git a/common/chapters/gb-ns2-configuration-timer.adoc b/common/chapters/gb-ns2-configuration-timer.adoc deleted file mode 100644 index ab8585f..0000000 --- a/common/chapters/gb-ns2-configuration-timer.adoc +++ /dev/null @@ -1,36 +0,0 @@ -==== Gb/NS Timer configuration - -The NS protocol features a number of configurable timers. - -.List of configurable NS timers -|=== -|tns-block|(un)blocking timer timeout (secs) -|tns-block-retries|(un)blocking timer; number of retries -|tns-reset|reset timer timeout (secs) -|tns-reset-retries|reset timer; number of retries -|tns-test|test timer timeout (secs) -|tns-alive|alive timer timeout (secs) -|tns-alive-retries|alive timer; number of retries -|tsns-prov|SNS provision timeout (secs) used by all SNS auto configuration procedures. -|tsns-size-retries|SNS Size procedure; number of retries -|tsns-config-retries|SNS Config procedure; number of retries -|=== - -All timer can be configured by vty configuration - -.Example of timeouts ----- -ns - timer tns-block 3 - timer tns-block-retries 3 - timer tns-reset 3 - timer tns-reset-retries 3 - timer tns-test 30 - timer tns-alive 3 - timer tns-alive-retries 10 - timer tsns-prov 10 - timer tsns-size-retries 3 - timer tsns-config-retries 3 ----- - -// FIXME: ladder diagrams for every timer diff --git a/common/chapters/gb-ns2-configuration.adoc b/common/chapters/gb-ns2-configuration.adoc deleted file mode 100644 index 4397cf4..0000000 --- a/common/chapters/gb-ns2-configuration.adoc +++ /dev/null @@ -1,163 +0,0 @@ -=== Gb/NS configuration - -This section describes the configuration that libosmogb exposes via the -VTY and is valid for OsmoSGSN and OsmoGbProxy. - -==== Gb over Frame Relay over E1/T1 - -The Gb over Frame Relay over E1/T1 requires: - -* a hdlc interface -* a frame relay role (fr or frnet) -* the DLCI - -.Example: Gb over Frame Relay configuration #1 ----- -ns - bind fr sitea1 <1> - fr hdlc1 frnet <2> - nse 2001 <3> - nsvci fr sitea1 dlci 16 nsvci 11 ----- -<1> a Gb-over-FR bind with the name sitea1 -<2> connect the hdlc1 device with the role frnet to sitea1 -<3> one NSE (2001) with a single NS-VCI 11 on sitea1 with DLCI 16 - -.Example: Gb over Frame Relay configuration #2 ----- -ns - bind fr sitea1 <1> - fr hdlc1 frnet <2> - bind fr sitea2 - fr hdlc2 frnet - bind fr sitea3 - fr hdlc3 frnet - bind fr sitea4 - fr hdlc4 frnet - bind fr siteb1 - fr hdlc5 frnet - bind fr siteb2 - fr hdlc6 frnet - bind fr sitec1 - fr hdlc7 frnet - bind fr sitec2 - fr hdlc8 frnet - nse 2001 <3> - nsvci fr sitea1 dlci 16 nsvci 11 - nsvci fr sitea2 dlci 17 nsvci 12 - nsvci fr sitea3 dlci 18 nsvci 13 - nsvci fr sitea4 dlci 19 nsvci 14 - nse 2002 <4> - nsvci fr siteb5 dlci 20 nsvci 15 - nsvci fr siteb6 dlci 21 nsvci 16 - nse 2003 <5> - nsvc fr sitec7 dlci 22 nsvci 17 - nsvc fr sitec8 dlci 23 nsvci 18 ----- -<1> a Gb-over-FR bind with the name sitea1 -<2> connect the hdlc1 device with the role frnet to sitea1 -<3> one NSE (2001) with four NS-VCI (11..14) on sitea1..4 with their respective DLCI -<4> another NSE (2002) with two NS-VCI (15..16) on siteb1..2 with their respective DLCI -<5> another NSE (2003) with two NS-VCI (17..18) on sitec1..2 with their respective DLCI - - -==== Gb over IP "ip.access style" - -The Gb over IP "ip.access style" can be used with a dynamic configuration or with a -static configuration - -The static configuration requires to configure all endpoints on the BSS and SGSN. -In constrast the dynamic configuration allows the SGSN to have only a reduced configuration. - -===== Gb over IP "ip.access style" dynamic configuration - -.Example: Gb over IP/UDP ip.access style dynamic configuration (SGSN) ----- -ns - bind udp ran1 <1> - listen 10.100.1.1 23000 <2> - accept-ipaccess <3> ----- -<1> create a IP/UDP bind with name ran1 -<2> bind to 10.100.1.1:23000 -<3> accept unknown BSS of ip.access style - -.Example: Gb over IP/UDP "ip.access style" dynamic configuration (GbProxy as BSS) ----- -ns - bind udp ran1 <1> - listen 10.100.0.1 23000 <2> - nse 1001 <3> - nsvc ipa ran1 10.100.1.1 23000 nsvci 1001 ----- -<1> create a IP/UDP bind with name ran1 -<2> bind to 10.100.1.1:23000 -<3> accept unknown BSS of ip.access style - -NOTE: The OsmoPCU supports ip.access style Gb/NS but doesn't support this vty configuration because -it's receiving the configuration from the BTS/BSC. - -===== Gb over IP "ip.access style" static configuration - -.Example: Gb over IP/UDP "ip.access style" static configuration (BSS & SGSN) ----- -ns - bind udp ran1 <1> - listen 10.100.0.1 23000 <2> - nse 1001 <3> - nsvc ipa ran1 10.100.1.1 23000 nsvci 1001 ----- -<1> create a IP/UDP bind with name ran1 -<2> bind to 10.100.0.1:23000 -<3> NSE 1001 with nsvc 1001 as ip.access style - -NOTE: The OsmoPCU supports "ip.access style" Gb/NS but doesn't support this vty configuration because -it's receiving the configuration from the BTS/BSC. - - -==== Gb over IP 3GPP static configuration - -A static IP/UDP configuration without SNS as specified by 3GPP 48.016. - -.Example: Gb over IP/UDP static configuration BSS/SGSN ----- -ns - bind udp ran1 <1> - listen 10.100.0.1 23000 <2> - nse 1001 <3> - nsvc udp ran1 10.100.1.1 23000 signalling-weight 2 data-weight 2 - nsvc udp ran1 10.100.1.2 23000 <4> ----- -<1> create a IP/UDP bind with name ran1 -<2> bind to 10.100.0.1:23000 -<3> add NSE 1001 with 2 NSVC -<4> short configuration with default signalling and data weight of 1 - -==== Gb over IP 3GPP auto configuration as BSS - -IP/UDP auto-configuration with initial endpoints to an SGSN. -The auto-configuration will use the first bind to connect to the -first endpoint. If this fails Osmocom will iterate over all endpoints and binds to find -a working combination. - -.Example: Gb over IP/UDP auto-configuration as BSS ----- -ns - bind udp ran1 <1> - listen 10.100.0.1 23000 <2> - bind udp ran2 - listen 10.100.0.2 23000 - bind udp ran3 - listen 10.100.0.3 23000 - nse 1001 <3> - ip-sns-bind ran1 <4> - ip-sns-bind ran2 - ip-sns-remote 10.100.1.1 23000 <5> - ip-sns-remote 10.100.1.2 23000 ----- -<1> create a IP/UDP bind with name ran1 -<2> bind to 10.100.0.1:23000 -<3> add NSE 1001 with 2 initial SNS endpoints -<4> add ran1 to the list of available endpoints -<5> add 10.100.1.1 as initial endpoint - diff --git a/common/chapters/gb-ns2-maintenance.adoc b/common/chapters/gb-ns2-maintenance.adoc deleted file mode 100644 index ea99532..0000000 --- a/common/chapters/gb-ns2-maintenance.adoc +++ /dev/null @@ -1,115 +0,0 @@ -=== Gb/NS maintenance - -This section describes common maintenance procedures. - -[[ns2-nse-states]] -==== NSE states - -A NSE can have the following states: - -.NSE states -* ALIVE -* DEAD - -For FR, IPA: The NSE is ALIVE if there is at least one NSVC in state UNBLOCKED. -For IP-SNS/UDP: The NSE is ALIVE if there is at least one NSVC ALIVE and the sum of all ALIVE NSVCs signalling weights > 0 and data weights > 0. - -The state of the NSE is shown by vty. - -.show ns ----- -GbProxy# show ns nsei 1234 -NSEI 01234: UDP, DEAD <1> - FSM Instance Name: 'GPRS-NS2-SNS-BSS(NSE01234-SNS)[0x6120000012a0]', ID: 'NSE01234-SNS' - Log-Level: 'DEBUG', State: 'BSS_SIZE' - Timer: 1 - Maximum number of remote NS-VCs: 8192, IPv4 Endpoints: 8192, IPv6 Endpoints: 8192 - 1 NS-VC: - NSVCI none: DISABLED DYNAMIC data_weight=1 sig_weight=1 udp)[127.0.0.1]:23000<>[127.0.0.1]:22000 ----- -<1> NSE state - -==== NSVC states - -A NSVC can have the following states: - -.nsvc states -[options="header"] -|========================================================= -| State | transport UNITDATA | Description - -| DISABLED | No | Either the transport layer is unavailable (FR) or this NSVC is currently used by IP-SNS dynamic configuration. -| RESET | No | Sending out RESET PDU and awaiting data. -| BLOCKED | No* | The NSVC has been BLOCKED. * see 3GPP TS 48.016 § 7.2 exception -| UNBLOCKED/ALIVE | Yes | The NSVC transport UNITDATA. -| RECOVERING | No | The NSVC test procedure timed out. NSVC type is a IP-SNS which don't use RESET/BLOCK/UNBLOCK. - -|========================================================= - -[[fig-nsvc-states-reset-block]] -.Simplified state diagram for RESET BLOCK UNBLOCK NSVCs -[graphviz] ----- -include::gb-ns2-nsvc-states-reset-block.dot[] ----- - -[[fig-nsvc-states-alive]] -.Simplified state diagram for IP-SNS/UDP -[graphviz] ----- -include::gb-ns2-nsvc-states-alive.dot[] ----- - -==== Show information of a specific NSE - -The NSE 1234 has been configured for as BSS with IP-SNS configuration. - -.show ns on a dynamic configured IP-SNS NSE ----- -GbProxy# show ns nsei 1234 -NSEI 01234: UDP, DEAD <1> - FSM Instance Name: 'GPRS-NS2-SNS-BSS(NSE01234-SNS)[0x6120000012a0]', ID: 'NSE01234-SNS' - Log-Level: 'DEBUG', State: 'BSS_SIZE' <2> - Timer: 1 - Maximum number of remote NS-VCs: 8192, IPv4 Endpoints: 8192, IPv6 Endpoints: 8192 - 1 NS-VC: - NSVCI none: DISABLED DYNAMIC data_weight=1 sig_weight=1 udp)[127.0.0.1]:23000<>[127.0.0.1]:22000 ----- -<1> A UDP NSE. A NSE can be ALIVE or DEAD -<2> The SNS state. CONFIGURED and LOCAL_PROCEDURE are ALIVE states - -For description of NSE states see <<ns2-nse-states>>. - -.show ns on a frame relay NSE ----- -OsmoNSdummy# show ns nsei 02001 -NSEI 02001: FR, ALIVE <1> - 4 NS-VC: - NSVCI 00001: DISABLED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlcnet1 dlci: 16 <2> - NSVCI 00002: DISABLED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlcnet2 dlci: 17 <3> - NSVCI 00003: DISABLED PERSIST <4> data_weight=1 sig_weight=1 fr)netif: hdlcnet3 dlci: 18 - NSVCI 00004: DISABLED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlcnet4 dlci: 19 ----- -<1> A FR NSE. A NSE can be ALIVE or DEAD -<2> An unblocked NS-VC will be used for data and signalling. data and signalling weight are only relevant for UDP NSVC. -<3> NSVC is still blocked. -<4> A PERSIST NSVC is a configured via VTY. - -==== Blocking a NSVC - -.how to block a single NSVC ----- -OsmoNSdummy# show ns nsei 01234 -NSEI 01234: UDP, ALIVE since 0d 0h 41m 6s - 2 NS-VC: - NSVCI 01234: UNBLOCKED PERSIST udp)[127.0.0.1]:23000\<1234>[127.0.0.1]:22000 ALIVE since 0d 0h 2m 36s - NSVCI 01235: UNBLOCKED PERSIST udp)[127.0.0.1]:23001\<1235>[127.0.0.1]:22001 ALIVE since 0d 0h 41m 6s - -OsmoNSdummy# nsvc 1234 block -The NS-VC 01234 will be blocked. -OsmoNSdummy# show ns nsei 01234 -NSEI 01234: UDP, ALIVE since 0d 0h 42m 7s - 2 NS-VC: - NSVCI 01234: BLOCKED PERSIST udp)[127.0.0.1]:23000\<1234>[127.0.0.1]:22000 DEAD since 0d 0h 3m 37s - NSVCI 01235: UNBLOCKED PERSIST udp)[127.0.0.1]:23001\<1235>[127.0.0.1]:22001 ALIVE since 0d 0h 42m 7s ----- diff --git a/common/chapters/gb-ns2.adoc b/common/chapters/gb-ns2.adoc index 34943d3..925f515 100644 --- a/common/chapters/gb-ns2.adoc +++ b/common/chapters/gb-ns2.adoc @@ -179,3 +179,320 @@ A NS-VC is always bound to a NSE and the bind (NS-VL). The NSVC can be either persistent or dynamic. + +=== Gb/NS configuration + +This section describes the configuration that libosmogb exposes via the +VTY and is valid for OsmoSGSN and OsmoGbProxy. + +==== Gb over Frame Relay over E1/T1 + +The Gb over Frame Relay over E1/T1 requires: + +* a hdlc interface +* a frame relay role (fr or frnet) +* the DLCI + +.Example: Gb over Frame Relay configuration #1 +---- +ns + bind fr sitea1 <1> + fr hdlc1 frnet <2> + nse 2001 <3> + nsvci fr sitea1 dlci 16 nsvci 11 +---- +<1> a Gb-over-FR bind with the name sitea1 +<2> connect the hdlc1 device with the role frnet to sitea1 +<3> one NSE (2001) with a single NS-VCI 11 on sitea1 with DLCI 16 + +.Example: Gb over Frame Relay configuration #2 +---- +ns + bind fr sitea1 <1> + fr hdlc1 frnet <2> + bind fr sitea2 + fr hdlc2 frnet + bind fr sitea3 + fr hdlc3 frnet + bind fr sitea4 + fr hdlc4 frnet + bind fr siteb1 + fr hdlc5 frnet + bind fr siteb2 + fr hdlc6 frnet + bind fr sitec1 + fr hdlc7 frnet + bind fr sitec2 + fr hdlc8 frnet + nse 2001 <3> + nsvci fr sitea1 dlci 16 nsvci 11 + nsvci fr sitea2 dlci 17 nsvci 12 + nsvci fr sitea3 dlci 18 nsvci 13 + nsvci fr sitea4 dlci 19 nsvci 14 + nse 2002 <4> + nsvci fr siteb5 dlci 20 nsvci 15 + nsvci fr siteb6 dlci 21 nsvci 16 + nse 2003 <5> + nsvc fr sitec7 dlci 22 nsvci 17 + nsvc fr sitec8 dlci 23 nsvci 18 +---- +<1> a Gb-over-FR bind with the name sitea1 +<2> connect the hdlc1 device with the role frnet to sitea1 +<3> one NSE (2001) with four NS-VCI (11..14) on sitea1..4 with their respective DLCI +<4> another NSE (2002) with two NS-VCI (15..16) on siteb1..2 with their respective DLCI +<5> another NSE (2003) with two NS-VCI (17..18) on sitec1..2 with their respective DLCI + + +==== Gb over IP "ip.access style" + +The Gb over IP "ip.access style" can be used with a dynamic configuration or with a +static configuration + +The static configuration requires to configure all endpoints on the BSS and SGSN. +In constrast the dynamic configuration allows the SGSN to have only a reduced configuration. + +===== Gb over IP "ip.access style" dynamic configuration + +.Example: Gb over IP/UDP ip.access style dynamic configuration (SGSN) +---- +ns + bind udp ran1 <1> + listen 10.100.1.1 23000 <2> + accept-ipaccess <3> +---- +<1> create a IP/UDP bind with name ran1 +<2> bind to 10.100.1.1:23000 +<3> accept unknown BSS of ip.access style + +.Example: Gb over IP/UDP "ip.access style" dynamic configuration (GbProxy as BSS) +---- +ns + bind udp ran1 <1> + listen 10.100.0.1 23000 <2> + nse 1001 <3> + nsvc ipa ran1 10.100.1.1 23000 nsvci 1001 +---- +<1> create a IP/UDP bind with name ran1 +<2> bind to 10.100.1.1:23000 +<3> accept unknown BSS of ip.access style + +NOTE: The OsmoPCU supports ip.access style Gb/NS but doesn't support this vty configuration because +it's receiving the configuration from the BTS/BSC. + +===== Gb over IP "ip.access style" static configuration + +.Example: Gb over IP/UDP "ip.access style" static configuration (BSS & SGSN) +---- +ns + bind udp ran1 <1> + listen 10.100.0.1 23000 <2> + nse 1001 <3> + nsvc ipa ran1 10.100.1.1 23000 nsvci 1001 +---- +<1> create a IP/UDP bind with name ran1 +<2> bind to 10.100.0.1:23000 +<3> NSE 1001 with nsvc 1001 as ip.access style + +NOTE: The OsmoPCU supports "ip.access style" Gb/NS but doesn't support this vty configuration because +it's receiving the configuration from the BTS/BSC. + + +==== Gb over IP 3GPP static configuration + +A static IP/UDP configuration without SNS as specified by 3GPP 48.016. + +.Example: Gb over IP/UDP static configuration BSS/SGSN +---- +ns + bind udp ran1 <1> + listen 10.100.0.1 23000 <2> + nse 1001 <3> + nsvc udp ran1 10.100.1.1 23000 signalling-weight 2 data-weight 2 + nsvc udp ran1 10.100.1.2 23000 <4> +---- +<1> create a IP/UDP bind with name ran1 +<2> bind to 10.100.0.1:23000 +<3> add NSE 1001 with 2 NSVC +<4> short configuration with default signalling and data weight of 1 + +==== Gb over IP 3GPP auto configuration as BSS + +IP/UDP auto-configuration with initial endpoints to an SGSN. +The auto-configuration will use the first bind to connect to the +first endpoint. If this fails Osmocom will iterate over all endpoints and binds to find +a working combination. + +.Example: Gb over IP/UDP auto-configuration as BSS +---- +ns + bind udp ran1 <1> + listen 10.100.0.1 23000 <2> + bind udp ran2 + listen 10.100.0.2 23000 + bind udp ran3 + listen 10.100.0.3 23000 + nse 1001 <3> + ip-sns-bind ran1 <4> + ip-sns-bind ran2 + ip-sns-remote 10.100.1.1 23000 <5> + ip-sns-remote 10.100.1.2 23000 +---- +<1> create a IP/UDP bind with name ran1 +<2> bind to 10.100.0.1:23000 +<3> add NSE 1001 with 2 initial SNS endpoints +<4> add ran1 to the list of available endpoints +<5> add 10.100.1.1 as initial endpoint + + +==== Gb/NS Timer configuration + +The NS protocol features a number of configurable timers. + +.List of configurable NS timers +|=== +|tns-block|(un)blocking timer timeout (secs) +|tns-block-retries|(un)blocking timer; number of retries +|tns-reset|reset timer timeout (secs) +|tns-reset-retries|reset timer; number of retries +|tns-test|test timer timeout (secs) +|tns-alive|alive timer timeout (secs) +|tns-alive-retries|alive timer; number of retries +|tsns-prov|SNS provision timeout (secs) used by all SNS auto configuration procedures. +|tsns-size-retries|SNS Size procedure; number of retries +|tsns-config-retries|SNS Config procedure; number of retries +|=== + +All timer can be configured by vty configuration + +.Example of timeouts +---- +ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 30 + timer tns-alive 3 + timer tns-alive-retries 10 + timer tsns-prov 10 + timer tsns-size-retries 3 + timer tsns-config-retries 3 +---- + +// FIXME: ladder diagrams for every timer + +=== Gb/NS maintenance + +This section describes common maintenance procedures. + +[[ns2-nse-states]] +==== NSE states + +A NSE can have the following states: + +.NSE states +* ALIVE +* DEAD + +For FR, IPA: The NSE is ALIVE if there is at least one NSVC in state UNBLOCKED. +For IP-SNS/UDP: The NSE is ALIVE if there is at least one NSVC ALIVE and the sum of all ALIVE NSVCs signalling weights > 0 and data weights > 0. + +The state of the NSE is shown by vty. + +.show ns +---- +GbProxy# show ns nsei 1234 +NSEI 01234: UDP, DEAD <1> + FSM Instance Name: 'GPRS-NS2-SNS-BSS(NSE01234-SNS)[0x6120000012a0]', ID: 'NSE01234-SNS' + Log-Level: 'DEBUG', State: 'BSS_SIZE' + Timer: 1 + Maximum number of remote NS-VCs: 8192, IPv4 Endpoints: 8192, IPv6 Endpoints: 8192 + 1 NS-VC: + NSVCI none: DISABLED DYNAMIC data_weight=1 sig_weight=1 udp)[127.0.0.1]:23000<>[127.0.0.1]:22000 +---- +<1> NSE state + +==== NSVC states + +A NSVC can have the following states: + +.nsvc states +[options="header"] +|========================================================= +| State | transport UNITDATA | Description + +| DISABLED | No | Either the transport layer is unavailable (FR) or this NSVC is currently used by IP-SNS dynamic configuration. +| RESET | No | Sending out RESET PDU and awaiting data. +| BLOCKED | No* | The NSVC has been BLOCKED. * see 3GPP TS 48.016 § 7.2 exception +| UNBLOCKED/ALIVE | Yes | The NSVC transport UNITDATA. +| RECOVERING | No | The NSVC test procedure timed out. NSVC type is a IP-SNS which don't use RESET/BLOCK/UNBLOCK. + +|========================================================= + +[[fig-nsvc-states-reset-block]] +.Simplified state diagram for RESET BLOCK UNBLOCK NSVCs +[graphviz] +---- +include::gb-ns2-nsvc-states-reset-block.dot[] +---- + +[[fig-nsvc-states-alive]] +.Simplified state diagram for IP-SNS/UDP +[graphviz] +---- +include::gb-ns2-nsvc-states-alive.dot[] +---- + +==== Show information of a specific NSE + +The NSE 1234 has been configured for as BSS with IP-SNS configuration. + +.show ns on a dynamic configured IP-SNS NSE +---- +GbProxy# show ns nsei 1234 +NSEI 01234: UDP, DEAD <1> + FSM Instance Name: 'GPRS-NS2-SNS-BSS(NSE01234-SNS)[0x6120000012a0]', ID: 'NSE01234-SNS' + Log-Level: 'DEBUG', State: 'BSS_SIZE' <2> + Timer: 1 + Maximum number of remote NS-VCs: 8192, IPv4 Endpoints: 8192, IPv6 Endpoints: 8192 + 1 NS-VC: + NSVCI none: DISABLED DYNAMIC data_weight=1 sig_weight=1 udp)[127.0.0.1]:23000<>[127.0.0.1]:22000 +---- +<1> A UDP NSE. A NSE can be ALIVE or DEAD +<2> The SNS state. CONFIGURED and LOCAL_PROCEDURE are ALIVE states + +For description of NSE states see <<ns2-nse-states>>. + +.show ns on a frame relay NSE +---- +OsmoNSdummy# show ns nsei 02001 +NSEI 02001: FR, ALIVE <1> + 4 NS-VC: + NSVCI 00001: DISABLED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlcnet1 dlci: 16 <2> + NSVCI 00002: DISABLED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlcnet2 dlci: 17 <3> + NSVCI 00003: DISABLED PERSIST <4> data_weight=1 sig_weight=1 fr)netif: hdlcnet3 dlci: 18 + NSVCI 00004: DISABLED PERSIST data_weight=1 sig_weight=1 fr)netif: hdlcnet4 dlci: 19 +---- +<1> A FR NSE. A NSE can be ALIVE or DEAD +<2> An unblocked NS-VC will be used for data and signalling. data and signalling weight are only relevant for UDP NSVC. +<3> NSVC is still blocked. +<4> A PERSIST NSVC is a configured via VTY. + +==== Blocking a NSVC + +.how to block a single NSVC +---- +OsmoNSdummy# show ns nsei 01234 +NSEI 01234: UDP, ALIVE since 0d 0h 41m 6s + 2 NS-VC: + NSVCI 01234: UNBLOCKED PERSIST udp)[127.0.0.1]:23000\<1234>[127.0.0.1]:22000 ALIVE since 0d 0h 2m 36s + NSVCI 01235: UNBLOCKED PERSIST udp)[127.0.0.1]:23001\<1235>[127.0.0.1]:22001 ALIVE since 0d 0h 41m 6s + +OsmoNSdummy# nsvc 1234 block +The NS-VC 01234 will be blocked. +OsmoNSdummy# show ns nsei 01234 +NSEI 01234: UDP, ALIVE since 0d 0h 42m 7s + 2 NS-VC: + NSVCI 01234: BLOCKED PERSIST udp)[127.0.0.1]:23000\<1234>[127.0.0.1]:22000 DEAD since 0d 0h 3m 37s + NSVCI 01235: UNBLOCKED PERSIST udp)[127.0.0.1]:23001\<1235>[127.0.0.1]:22001 ALIVE since 0d 0h 42m 7s +---- -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30357 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: I3c618e5af61b376435f400ef9c64245cec2f9b73 Gerrit-Change-Number: 30357 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add MNCC handler selection to settings

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30326 ) Change subject: mobile: add MNCC handler selection to settings ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: > Typo in commit message: extarnal Done. Also fixed s/potentionally/potentially/. File src/host/layer23/src/mobile/app_mobile.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30326/comment/50b67a02_8a8bb98a PS1, Line 249: ms->mncc_entity.sock_state = mncc_sock_init(ms, ms->settings.mncc_socket_path); > So sock_state is used only if mncc_handler is "EXTERNAL"? Then better put it under ms->mncc_entity. […] There is a big room for improvements here, given that this project is not actively maintained since... idk how many years ago. I am not going to rework the existing mobile's structures unless it's really necessary. Feel free to submit a patch. File src/host/layer23/src/mobile/vty_interface.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30326/comment/34677460_cbf31875 PS1, Line 1665: DEFUN(cfg_ms_no_mncc_handler, cfg_ms_no_mncc_handler_cmd, > ACK, specifying the default above in the description (like you did) should be enough for the user to […] To stay consistent with the existing 'io-handler', which has both variants. I can remove the no-command if you guys insist, but honestly I see nothing wrong in having two variants. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2df91c7a79ba5c39bc6ceae900ef649129dd0346 Gerrit-Change-Number: 30326 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Nov 2022 16:49:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add OML tests for bts_setup_ramp

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30356 ) Change subject: BSC_Tests: add OML tests for bts_setup_ramp ...................................................................... BSC_Tests: add OML tests for bts_setup_ramp The current BSC_Tests are using osmo-bts-omldummy to keep OML out of the test context. Add a new test file and component for OML tests. Change-Id: I0934ea26db359b0a6649c613f01de134a3a372ee --- M bsc/BSC_Tests.cfg A bsc/BSC_Tests_OML.ttcn M bsc/gen_links.sh M bsc/regen_makefile.sh 4 files changed, 377 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/30356/1 diff --git a/bsc/BSC_Tests.cfg b/bsc/BSC_Tests.cfg index 5765846..5ac91b6 100644 --- a/bsc/BSC_Tests.cfg +++ b/bsc/BSC_Tests.cfg @@ -18,6 +18,7 @@ BSC_Tests.control BSC_Tests_LCLS.control BSC_Tests_CBSP.control +#BSC_Tests_OML.control #BSC_Tests.TC_chan_act_noreply #BSC_Tests.TC_chan_act_ack_noest #BSC_Tests.TC_chan_act_ack_est_ind_noreply diff --git a/bsc/BSC_Tests_OML.ttcn b/bsc/BSC_Tests_OML.ttcn new file mode 100644 index 0000000..06bff9f --- /dev/null +++ b/bsc/BSC_Tests_OML.ttcn @@ -0,0 +1,374 @@ +module BSC_Tests_OML { + +/* Integration Tests for OsmoBTS A-bis OML (Organization & Maintenance Link) + * + * (C) 2019 by Harald Welte <laforge(a)gnumonks.org> + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Alexander Couzens <acouzens(a)sysmocom.de> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +/* The tests only require a BSC with VTY and OML to be present. */ + +import from General_Types all; +import from Osmocom_Types all; +import from AbisOML_Types all; +import from IPA_Emulation all; +import from IPA_Types all; +import from Misc_Helpers all; +import from Osmocom_VTY_Functions all; +import from TELNETasp_PortType all; + +import from BSC_Tests all; + +const integer NUM_TRX := 8; + +type record of uint16_t ArfcnList; +type record length(3) of IPA_CCM_Parameters IPA_CCM_Parameters_multiple; + +modulepar { + charstring mp_oml_ip := "127.0.0.1"; + integer mp_oml_port := 3002; + ArfcnList mp_arfcn := { 100, 101, 102, 103, 104, 105, 106, 107 }; + OML_FOM_T200 mp_t200 := { + sdcch_5ms := 30, + facch_f_5ms := 36, + facch_h_5ms := 36, + sacch_tch_sapi0_10ms := 168, + sacch_sdcch_10ms := 52, + sdcch_sapi3_5ms := 33, + sacch_rch_sapi3_10ms := 168 + }; + uint8_t mp_max_ta := 63; + uint8_t mp_load_threshold := 10; + uint8_t mp_load_ind_period := 1; + uint8_t mp_rach_b_thresh := 90; + uint16_t mp_loadavg_slots := 1000; + uint8_t mp_air_timer := 100; + uint8_t mp_ny1 := 10; + uint8_t mp_bsic := 63; + + IPA_CCM_Parameters_multiple mp_ccm_pars := { + { + ser_nr := "", + name := "", + location1 := "", + location2 := "", + equip_version := "", + sw_version := "", + ip_addr := "", + mac_addr := "", + unit_id := "1234/0/0", + osmo_rand := "" + }, + { + ser_nr := "", + name := "", + location1 := "", + location2 := "", + equip_version := "", + sw_version := "", + ip_addr := "", + mac_addr := "", + unit_id := "1235/0/0", + osmo_rand := "" + }, + { + ser_nr := "", + name := "", + location1 := "", + location2 := "", + equip_version := "", + sw_version := "", + ip_addr := "", + mac_addr := "", + unit_id := "1236/0/0", + osmo_rand := "" + } + }; +}; + +/* BSC side OML component */ +type component BTS_OML_CT { + /* IPA client */ + var IPA_Client client[3]; + + /* Port for OML */ + port IPA_OML_PT OML[3]; + + /* VTY */ + port TELNETasp_PT BSCVTY; + + /* As rxed by Get Attributes Response NM_ATT_MANUF_ID IE, see f_oml_getattr() */ + var bitstring g_bts_features[3]; + + /* global test case guard timer */ + timer T_oml_guard := 60.0; +}; + +private altstep as_Tguard() runs on BTS_OML_CT { + [] T_oml_guard.timeout { + setverdict(fail, "Timeout of T_guard"); + mtc.stop; + } +} + +private altstep as_IPA_evt(integer idx := 0) runs on BTS_OML_CT { + var ASP_IPA_Event evt; + [] OML[idx].receive(ASP_IPA_Event:?) -> value evt { + log("Ignoring ", evt); + repeat; + } +} + +function f_init_vty() runs on BTS_OML_CT { + if (BSCVTY.checkstate("Mapped")) { + /* skip initialization if already executed once */ + return; + } + map(self:BSCVTY, system:BSCVTY); + f_vty_set_prompts(BSCVTY); + f_vty_transceive(BSCVTY, "enable"); + + f_vty_enter_config(BSCVTY); + f_vty_transceive(BSCVTY, "bsc"); + f_vty_transceive(BSCVTY, "no bts-setup-ramping"); + f_vty_transceive(BSCVTY, "end"); +} + +function f_init_oml(charstring id, integer num_instance := 1) runs on BTS_OML_CT { + activate(as_Tguard()); + for (var uint8_t idx := 0; idx < num_instance; idx := idx + 1) { + client[idx].id := id & "-" & int2str(idx); + client[idx].vc_IPA := IPA_Emulation_CT.create(id & "-IPA-" & int2str(idx)) alive; + client[idx].ccm_pars := mp_ccm_pars[idx]; + + map(client[idx].vc_IPA:IPA_PORT, system:IPA); + connect(client[idx].vc_IPA:IPA_OML_PORT, self:OML[idx]); + client[idx].vc_IPA.start(IPA_Emulation.main_client(mp_oml_ip, mp_oml_port, "", 10000 + idx, client[idx].ccm_pars)); + + T_oml_guard.start; + + OML[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)); + OML[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)); + + activate(as_IPA_evt(idx)); + } +} + +function f_oml_send_swact(integer idx := 0) runs on BTS_OML_CT +{ + OML[idx].send(ts_OML_SwActivatedRep(NM_OC_SITE_MANAGER, {255, 255, 255})); + OML[idx].send(ts_OML_SwActivatedRep(NM_OC_BTS, {0, 255, 255})); + OML[idx].send(ts_OML_SwActivatedRep(NM_OC_BASEB_TRANSC, {0, 0, 255})); + OML[idx].send(ts_OML_SwActivatedRep(NM_OC_RADIO_CARRIER, {0, 0, 255})); + for (var uint8_t i := 0; i < 8; i := i + 1) { + OML[idx].send(ts_OML_SwActivatedRep(NM_OC_CHANNEL, {0, 0, i})); + } +} + +function f_oml_send_state_chg_evt_rep( + integer idx, + template (value) OML_FOM_OperationalState opstate, + template (value) OML_FOM_AvailabilityStatus avstate) runs on BTS_OML_CT +{ + OML[idx].send(ts_OML_StateChgEvtRep(NM_OC_SITE_MANAGER, {255, 255, 255}, opstate, avstate)); + OML[idx].send(ts_OML_StateChgEvtRep(NM_OC_BTS, {0, 255, 255}, opstate, avstate)); + OML[idx].send(ts_OML_StateChgEvtRep(NM_OC_BASEB_TRANSC, {0, 0, 255}, opstate, avstate)); + OML[idx].send(ts_OML_StateChgEvtRep(NM_OC_RADIO_CARRIER, {0, 0, 255}, opstate, avstate)); + for (var uint8_t i := 0; i < 8; i := i + 1) { + OML[idx].send(ts_OML_StateChgEvtRep(NM_OC_CHANNEL, {0, 0, i}, opstate, avstate)); + } +} + + +/* Send an OML message and expect no response at all */ +private function f_oml_send_exp_no_resp(template (value) OML_PDU tx, charstring err_msg, + float tout := 5.0, integer idx := 0) runs on BTS_OML_CT +{ + timer T := tout; + + OML[idx].send(tx); + T.start; + alt { + [] OML[idx].receive { + setverdict(fail, err_msg); + } + [] T.timeout { + setverdict(pass); + } + } +} + +private function f_oml_exp_rx(template OML_PDU exp_rx, charstring err_msg, integer idx := 0) + runs on BTS_OML_CT return OML_PDU +{ + var OML_PDU rx; + timer T := 5.0; + + T.start; + alt { + [] OML[idx].receive(exp_rx) -> value rx { + setverdict(pass); + } + [] OML[idx].receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for ", err_msg); + } + } + return rx; +} + +/* Send an OML message and expect a failure event report in response */ +private function f_oml_send_exp_fail_rep(template (value) OML_PDU tx, charstring err_msg, + template OML_FOM_EventType evt := ?, + template OML_FOM_Severity severity := ?, + template OML_FOM_ProbableCause cause := ?, + float tout := 5.0, integer idx := 0) runs on BTS_OML_CT +{ + var template OML_FOM_ObjectClass obj_class := ?; + var template OML_FOM_ObjectInstance obj_inst := ?; + if (ischosen(tx.u.fom)) { + obj_class := tx.u.fom.hdr.obj_class; + obj_inst := tx.u.fom.hdr.obj_inst; + } + var template OML_PDU exp_fail := tr_OML_FailureEvtRep(obj_class,obj_inst, evt, severity, cause); + + OML[idx].send(tx); + f_oml_exp_rx(exp_fail, "Failure Event Report"); +} + +/* Send an OML message and expect it to be NACKed with specified cause */ +private function f_oml_send_exp_nack(template (value) OML_PDU tx, template OML_FOM_NackCause exp_cause, + float tout := 5.0, integer idx := 0) runs on BTS_OML_CT +{ + timer T := 5.0; + + var template OML_PDU exp_nack := f_OML_make_nack_exp(valueof(tx), exp_cause); + var template OML_PDU exp_ack := f_OML_make_ack_exp(valueof(tx)); + var OML_PDU rx; + + OML[idx].send(tx); + T.start; + alt { + [] OML[idx].receive(exp_ack) -> value rx { + setverdict(fail, "Unexpected ACK ", rx); + } + [] OML[idx].receive(exp_nack) -> value rx { + setverdict(pass); + } + [] OML[idx].receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for NACK ", exp_nack); + } + } +} + +testcase TC_oml_nothing() runs on BTS_OML_CT { + f_init_oml(testcasename()); + f_sleep(40.0); + setverdict(pass); +} + +/* Test bts setup ramping. + * Enable bts setup ramping (limit how many BTS will be setuped within a time interval. + * 1. Send 3x BTS to configure + * 2. Wait until BTS0 and BTS1 is configured (need both to be sure, when the bts setup ramp interval got restartet). + * 3. BTS2 must setup within a time window (it should be 10 seconds, but have -+ 3 seconds to be on the save side). + */ +testcase TC_oml_bts_setup_ramp() runs on BTS_OML_CT { + var template (value) OML_PDU ts_nm_site_change_event := ts_OML_StateChgEvtRep(NM_OC_SITE_MANAGER, {255, 255, 255}, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + var template OML_PDU tr_nm_site_op_start := tr_OML_Opstart(NM_OC_SITE_MANAGER, {255, 255, 255}); + + f_init_vty(); + + f_vty_enter_config(BSCVTY); + f_vty_transceive(BSCVTY, "bsc"); + f_vty_transceive(BSCVTY, "bts-setup-ramping"); + f_vty_transceive(BSCVTY, "bts-setup-ramping-step-size 1"); + f_vty_transceive(BSCVTY, "bts-setup-ramping-step-interval 10"); + f_vty_transceive(BSCVTY, "end"); + + f_init_oml(testcasename(), 3); + + f_oml_send_swact(0); + f_oml_send_swact(1); + f_oml_send_swact(2); + f_sleep(1.0); + OML[0].send(ts_nm_site_change_event); + OML[1].send(ts_nm_site_change_event); + OML[2].send(ts_nm_site_change_event); + OML[0].receive(tr_nm_site_op_start); + + /* OML[2]: we expect at least no OP start for 7 seconds */ + timer T_no_op := 7.0; + /* OML[2] we expect at least the OP start within 13 seconds */ + timer T_op := 13.0; + alt { + [] OML[1].receive(tr_nm_site_op_start) { T_no_op.start; T_op.start; repeat; } + [] OML[2].receive(tr_nm_site_op_start) { + if (T_no_op.running) { + setverdict(fail, "OP Start came to early. T_no_op is still running"); + } else if (T_op.running) { + setverdict(pass); + } else { + setverdict(fail, "OP Start came far too early."); + } + } + [] T_op.timeout { setverdict(fail, "Timeout. No OP Start PDU for OML[2]."); } + } +} + +control { + /* execute( TC_oml_nothing() ); */ + execute( TC_oml_bts_setup_ramp() ); +} + +/* BTS: + * - Evt: Disabled/Locked + * - SW ACT + * - Evt: Disabled/Dependency + * - SET BTS ATTR + * - Opstart + * - Chg Adm State Unlocked + * - Evt: Disabled/Dependency/Unlocked + * - Evt: Enabled/0 (after last channel unlocked?) + */ + +/* Radio Carrier: + * - Evt: Disabled/Offline after SW ACT + * - Set Radio Carrier Attributes ? (->NACL) + * - Evt: Disabled/Dependency + * - Set Radio Carrier Attributes ? + * - Opstart + * - Chg Adm State Unlocked + * - Evt: + */ + +/* Baseband Transceiver: + * - Evt: Disabled/Locked + * - SW Activation + * - Evt: Disabled/Dependency after SW ACT + * - IPA RSL Connect + * - Opstart + * - Chg Admin Unlocked + * - Evt: Disabled/Dependency/Unlocked + */ + +/* Channel: + * - Evt: Not Installed/Locked + * - Evt: Disabled/Dependency (after SW ACT Rep on BB Transc) + * - Set Channel Attr + * - Opstart + * - Evt: Disabled/Offline + * - Chg Admin Unlocked + * - Evt: Disabled/OK/Unlocked + * - Evt: Enabled/OK (after BB TRANSC Opstart) + */ + +}; diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index f316509..538824d 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -72,6 +72,7 @@ FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " FILES+="BSSAP_LE_CodecPort.ttcn BSSAP_LE_Emulation.ttcn BSSAP_LE_Types.ttcn BSSAP_LE_Adapter.ttcn BSSLAP_Types.ttcn BSSMAP_LE_Templates.ttcn " +FILES+="AbisOML_Types.ttcn" gen_links $DIR $FILES diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index 9e69bef..fc53e30 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -27,6 +27,7 @@ -DIPA_EMULATION_CTRL -DIPA_EMULATION_MGCP -DIPA_EMULATION_RSL + -DIPA_EMULATION_OML -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_CTRL -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30356 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: I0934ea26db359b0a6649c613f01de134a3a372ee Gerrit-Change-Number: 30356 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: implement Ready-to-Receive PHYIF API

by Hoernchen

Attention is currently required from: fixeria, msuraev. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30262 ) Change subject: trxcon: implement Ready-to-Receive PHYIF API ...................................................................... Patch Set 2: (1 comment) File src/host/trxcon/src/sched_trx.c: https://gerrit.osmocom.org/c/osmocom-bb/+/30262/comment/f1cb3baa_aad3999c PS2, Line 832: probe->flags |= L1SCHED_PROBE_F_ACTIVE; The unexpected part here is that is ors the flags. I as the caller know this is the passed _output_ arg, so I expect the function to set it. Right now the caller needs to initialize the output arg so random crap does not get "or"ed, which is unexpected... -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30262 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9a71b8a59733f4dd908b760c5e23ea3d624afb1a Gerrit-Change-Number: 30262 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Nov 2022 16:35:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: layer23: l1ctl_tx_traffic_req(): cosmetic: drop dead code

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30324 ) Change subject: layer23: l1ctl_tx_traffic_req(): cosmetic: drop dead code ...................................................................... layer23: l1ctl_tx_traffic_req(): cosmetic: drop dead code Change-Id: I941899ab27282a495f965ae9a0f41076dceef953 Related: OS#5599 --- M src/host/layer23/src/common/l1ctl.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index d520403..ae7be6e 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -910,8 +910,6 @@ DEBUGP(DL1C, "TRAFFIC REQ len=%zu (%s)\n", frame_len, osmo_hexdump(frame, frame_len)); -// printf("TX %s\n", osmo_hexdump(frame, frame_len)); - /* prepend uplink info header */ l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I941899ab27282a495f965ae9a0f41076dceef953 Gerrit-Change-Number: 30324 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add MNCC socket path to settings

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30325 ) Change subject: mobile: add MNCC socket path to settings ...................................................................... mobile: add MNCC socket path to settings Previously the MNCC socket path was generated automatically, using concatenation of the '/tmp/ms_mncc_' prefix and MS name. Let's allow the user to specify this manually, keeping the same naming generation method for default value. Change-Id: I643356ac579bc5e765f668265ec803b22a73739c Related: OS#3400 --- M doc/examples/mobile/default.cfg M doc/examples/mobile/multi_ms.cfg M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/vty_interface.c 6 files changed, 33 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/doc/examples/mobile/default.cfg b/doc/examples/mobile/default.cfg index f14e900..d78bef5 100644 --- a/doc/examples/mobile/default.cfg +++ b/doc/examples/mobile/default.cfg @@ -14,6 +14,7 @@ ms 1 layer2-socket /tmp/osmocom_l2 sap-socket /tmp/osmocom_sap + mncc-socket /tmp/ms_mncc_1 sim reader network-selection-mode auto imei 000000000000000 0 diff --git a/doc/examples/mobile/multi_ms.cfg b/doc/examples/mobile/multi_ms.cfg index c72817f..4ccdb10 100644 --- a/doc/examples/mobile/multi_ms.cfg +++ b/doc/examples/mobile/multi_ms.cfg @@ -14,6 +14,7 @@ ms one layer2-socket /tmp/osmocom_l2.one sap-socket /tmp/osmocom_sap.one + mncc-socket /tmp/ms_mncc_one sim reader network-selection-mode auto imei 000000000000000 0 @@ -66,6 +67,7 @@ ms two layer2-socket /tmp/osmocom_l2.two sap-socket /tmp/osmocom_sap.two + mncc-socket /tmp/ms_mncc_two sim reader network-selection-mode auto imei 000000000000000 0 diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 57f23ee..6f4f59c 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -22,6 +22,7 @@ struct gsm_settings { char layer2_socket_path[128]; char sap_socket_path[128]; + char mncc_socket_path[128]; /* Audio settings */ struct audio_settings audio; diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 7b28bb4..5016582 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -269,6 +269,14 @@ *other_name = tmp->name; return -2; } + if (!strcmp(ms->settings.mncc_socket_path, + tmp->settings.mncc_socket_path)) { + LOGP(DMOB, LOGL_ERROR, "Cannot start MS '%s', because MS '%s' " + "is using the same mncc-socket.\nPlease shutdown " + "MS '%s' first.\n", ms->name, tmp->name, tmp->name); + *other_name = tmp->name; + return -3; + } } rc = mobile_init(ms); @@ -291,7 +299,6 @@ struct osmocom_ms *mobile_new(char *name) { static struct osmocom_ms *ms; - char *mncc_name; ms = talloc_zero(l23_ctx, struct osmocom_ms); if (!ms) { @@ -313,12 +320,8 @@ mobile_set_shutdown(ms, MS_SHUTDOWN_COMPL); if (mncc_recv_app) { - mncc_name = talloc_asprintf(ms, "/tmp/ms_mncc_%s", ms->name); - ms->mncc_entity.mncc_recv = mncc_recv_app; - ms->mncc_entity.sock_state = mncc_sock_init(ms, mncc_name); - - talloc_free(mncc_name); + ms->mncc_entity.sock_state = mncc_sock_init(ms, ms->settings.mncc_socket_path); } else if (ms->settings.ch_cap == GSM_CAP_SDCCH) ms->mncc_entity.mncc_recv = mncc_recv_dummy; else diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 23da620..769fad6 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -28,6 +28,7 @@ static char *layer2_socket_path = "/tmp/osmocom_l2"; static char *sap_socket_path = "/tmp/osmocom_sap"; +static char *mncc_socket_path = "/tmp/ms_mncc"; int gsm_settings_init(struct osmocom_ms *ms) { @@ -37,6 +38,10 @@ strcpy(set->layer2_socket_path, layer2_socket_path); strcpy(set->sap_socket_path, sap_socket_path); + /* Compose MNCC socket path using MS name */ + snprintf(set->mncc_socket_path, sizeof(set->mncc_socket_path) - 1, + "%s_%s", mncc_socket_path, ms->name); + /* Audio settings: drop TCH frames by default */ set->audio.io_handler = AUDIO_IOH_NONE; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index d6f6cd1..7c757a6 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1324,6 +1324,7 @@ vty_out(vty, " layer2-socket %s%s", set->layer2_socket_path, VTY_NEWLINE); vty_out(vty, " sap-socket %s%s", set->sap_socket_path, VTY_NEWLINE); + vty_out(vty, " mncc-socket %s%s", set->mncc_socket_path, VTY_NEWLINE); switch(set->sim_type) { case GSM_SIM_TYPE_NONE: vty_out(vty, " sim none%s", VTY_NEWLINE); @@ -1604,6 +1605,19 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_mncc, cfg_ms_mncc_cmd, "mncc-socket PATH", + "Define socket path for the MNCC interface\n" + "UNIX socket path (default '/tmp/ms_mncc_' + MS_NAME)") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + OSMO_STRLCPY_ARRAY(set->mncc_socket_path, argv[0]); + + vty_restart(vty, ms); + return CMD_SUCCESS; +} + DEFUN(cfg_ms_sim, cfg_ms_sim_cmd, "sim (none|reader|test|sap)", "Set SIM card to attach when powering on\nAttach no SIM\n" "Attach SIM from reader\nAttach build in test SIM\n" @@ -2933,6 +2947,7 @@ install_element(MS_NODE, &cfg_ms_show_this_cmd); install_element(MS_NODE, &cfg_ms_layer2_cmd); install_element(MS_NODE, &cfg_ms_sap_cmd); + install_element(MS_NODE, &cfg_ms_mncc_cmd); install_element(MS_NODE, &cfg_ms_sim_cmd); install_element(MS_NODE, &cfg_ms_mode_cmd); install_element(MS_NODE, &cfg_ms_imei_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I643356ac579bc5e765f668265ec803b22a73739c Gerrit-Change-Number: 30325 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add MNCC socket path to settings

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30325 ) Change subject: mobile: add MNCC socket path to settings ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I643356ac579bc5e765f668265ec803b22a73739c Gerrit-Change-Number: 30325 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Nov 2022 16:19:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-ci[master]: ansible inventory: we don't have slaves on admin2 for a long time

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30354 ) Change subject: ansible inventory: we don't have slaves on admin2 for a long time ...................................................................... ansible inventory: we don't have slaves on admin2 for a long time Change-Id: Ib5f07f7d854220bd006079b49af701c13d93b7bd --- M ansible/hosts 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/30354/1 diff --git a/ansible/hosts b/ansible/hosts index e1756be..0d965fa 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -3,12 +3,10 @@ osmo-gsm-tester-prod ansible_host=10.9.25.107 [coverity-slaves] -admin2-deb9build ansible_host=2a01:4f8:13b:828::1:300 build2-deb9build-ansible ansible_host=2a01:4f8:10b:2ad9::1:6 host2-deb9build-ansible ansible_host=2a01:4f8:120:8470::1:3 [jenkins-slaves] -admin2-deb9build ansible_host=2a01:4f8:13b:828::1:300 osmocom_jenkins_slave_fstrim=True build2-deb9build-ansible ansible_host=2a01:4f8:10b:2ad9::1:6 osmocom_jenkins_slave_fstrim=True build2-deb10build-ansible ansible_host=2a01:4f8:10b:2ad9::1:10 osmocom_jenkins_slave_fstrim=True build2-deb11build-ansible ansible_host=2a01:4f8:10b:2ad9::1:13 osmocom_jenkins_slave_fstrim=True -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib5f07f7d854220bd006079b49af701c13d93b7bd Gerrit-Change-Number: 30354 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-ci[master]: ansible inventory: We have recently killed gtp0-deb11build-i586

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30355 ) Change subject: ansible inventory: We have recently killed gtp0-deb11build-i586 ...................................................................... ansible inventory: We have recently killed gtp0-deb11build-i586 Change-Id: I15cb177e75f73fb8a06b17e42c99a6b573dc7574 --- M ansible/hosts 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/30355/1 diff --git a/ansible/hosts b/ansible/hosts index 0d965fa..0ff7cd4 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -15,7 +15,6 @@ host2-deb11build-ansible ansible_host=2a01:4f8:120:8470::1:4 osmocom_jenkins_slave_fstrim=True gtp0-deb9build ansible_host=10.34.2.102 osmocom_jenkins_slave_fstrim=True gtp0-deb10build ansible_host=10.34.2.101 osmocom_jenkins_slave_fstrim=True -gtp0-deb11build-i586 ansible_host=10.34.2.104 osmocom_jenkins_slave_fstrim=True rpi4-raspbian11build-ansible-1 ansible_host=10.9.25.50 docker_max_image_space="20 GB" rpi4-raspbian11build-ansible-2 ansible_host=10.9.25.60 docker_max_image_space="20 GB" rpi4-raspbian11build-ansible-3 ansible_host=10.9.25.70 docker_max_image_space="20 GB" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I15cb177e75f73fb8a06b17e42c99a6b573dc7574 Gerrit-Change-Number: 30355 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: osmo-ns-dummy: add ctrl interface

by fixeria

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30300 ) Change subject: osmo-ns-dummy: add ctrl interface ...................................................................... Patch Set 1: (2 comments) File utils/osmo-ns-dummy.c: https://gerrit.osmocom.org/c/libosmocore/+/30300/comment/760e455d_5185f23f PS1, Line 56: Set the ctrl port to listen on spacing issues https://gerrit.osmocom.org/c/libosmocore/+/30300/comment/aef21d32_ecf7947c PS1, Line 286: return -1; exit(1), like it's done above -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30300 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If6e06d9433e438b92f1ed1ef0f892308e031779b Gerrit-Change-Number: 30300 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 28 Nov 2022 16:08:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022