Change in libosmocore[master]: tlv.h: Add msgb_tvlv_put_{16,32}be()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21609 )
Change subject: tlv.h: Add msgb_tvlv_put_{16,32}be()
..
tlv.h: Add msgb_tvlv_put_{16,32}be()
Those routines are very useful when puzzling together BSSGP messages
with 16-bit and 32bit sized IEs.
Change-Id: I033f9a708c9d7ffad91336178231dc66233e1693
---
M include/osmocom/gsm/tlv.h
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
diff --git a/include/osmocom/gsm/tlv.h b/include/osmocom/gsm/tlv.h
index d34b7da..fe057f4 100644
--- a/include/osmocom/gsm/tlv.h
+++ b/include/osmocom/gsm/tlv.h
@@ -4,6 +4,7 @@
#include
#include
+#include
#include
#include
@@ -278,6 +279,20 @@
return tvlv_put(buf, tag, len, val);
}
+/*! put (append) a TvLV field containing a big-endian 16bit value to msgb. */
+static inline uint8_t *msgb_tvlv_put_16be(struct msgb *msg, uint8_t tag,
uint16_t val)
+{
+ uint16_t val_be = osmo_htons(val);
+ return msgb_tvlv_put(msg, tag, 2, (const uint8_t *)&val_be);
+}
+
+/*! put (append) a TvLV field containing a big-endian 16bit value to msgb. */
+static inline uint8_t *msgb_tvlv_put_32be(struct msgb *msg, uint8_t tag,
uint32_t val)
+{
+ uint32_t val_be = osmo_htonl(val);
+ return msgb_tvlv_put(msg, tag, 4, (const uint8_t *)&val_be);
+}
+
/*! put (append) a vTvLV field to \ref msgb */
static inline uint8_t *msgb_vtvlv_gan_put(struct msgb *msg, uint16_t tag,
uint16_t len, const uint8_t *val)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21609
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I033f9a708c9d7ffad91336178231dc66233e1693
Gerrit-Change-Number: 21609
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmocore[master]: logging: Assing different 8bit colors to built-in subsystems
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21599 ) Change subject: logging: Assing different 8bit colors to built-in subsystems .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21599 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia8c0f91a61fbca0441faf66b3f368f45f886187c Gerrit-Change-Number: 21599 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 09:46:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: centos8-build: Upstream requires 'powertools' not 'PowerTools'
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/21623 ) Change subject: centos8-build: Upstream requires 'powertools' not 'PowerTools' .. centos8-build: Upstream requires 'powertools' not 'PowerTools' I just confirmed: With a centos:centos8 base image of a few weeks ago, "PowerTools" works. With the current docker base image for centos:centos8, only lowercase "powertools" works, uppercase is no longer accepted. https://access.redhat.com/discussions/5417621 https://www.reddit.com/r/CentOS/comments/jd7x3d/how_to_enable_powertools_in_centos_stream/ https://git.centos.org/rpms/centos-repos/blob/c8/f/SOURCES/CentOS-Stream-PowerTools.repo#_11 Change-Id: I518d5523688a7439f76684ee38bf743a4e78c9fd Closes: SYS#5244 --- M centos8-build/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/23/21623/1 diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile index e71e03c..9a21bbc 100644 --- a/centos8-build/Dockerfile +++ b/centos8-build/Dockerfile @@ -7,7 +7,7 @@ # Make additional development libraries available from PowerTools and Osmocom nightly (e.g. libdbi) RUNdnf install -y dnf-utils wget && \ - yum config-manager --set-enabled PowerTools && \ + yum config-manager --set-enabled powertools && \ cd /etc/yum.repos.d/ && \ wget https://download.opensuse.org/repositories/network:osmocom:nightly/CentOS_8_Stream/network:osmocom:nightly.repo -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I518d5523688a7439f76684ee38bf743a4e78c9fd Gerrit-Change-Number: 21623 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in docker-playground[master]: centos8-build: Upstream requires 'powertools' not 'PowerTools'
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21623 ) Change subject: centos8-build: Upstream requires 'powertools' not 'PowerTools' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I518d5523688a7439f76684ee38bf743a4e78c9fd Gerrit-Change-Number: 21623 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 10:13:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: centos8-build: Upstream requires 'powertools' not 'PowerTools'
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21623 ) Change subject: centos8-build: Upstream requires 'powertools' not 'PowerTools' .. centos8-build: Upstream requires 'powertools' not 'PowerTools' I just confirmed: With a centos:centos8 base image of a few weeks ago, "PowerTools" works. With the current docker base image for centos:centos8, only lowercase "powertools" works, uppercase is no longer accepted. https://access.redhat.com/discussions/5417621 https://www.reddit.com/r/CentOS/comments/jd7x3d/how_to_enable_powertools_in_centos_stream/ https://git.centos.org/rpms/centos-repos/blob/c8/f/SOURCES/CentOS-Stream-PowerTools.repo#_11 Change-Id: I518d5523688a7439f76684ee38bf743a4e78c9fd Closes: SYS#5244 --- M centos8-build/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile index e71e03c..9a21bbc 100644 --- a/centos8-build/Dockerfile +++ b/centos8-build/Dockerfile @@ -7,7 +7,7 @@ # Make additional development libraries available from PowerTools and Osmocom nightly (e.g. libdbi) RUNdnf install -y dnf-utils wget && \ - yum config-manager --set-enabled PowerTools && \ + yum config-manager --set-enabled powertools && \ cd /etc/yum.repos.d/ && \ wget https://download.opensuse.org/repositories/network:osmocom:nightly/CentOS_8_Stream/network:osmocom:nightly.repo -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I518d5523688a7439f76684ee38bf743a4e78c9fd Gerrit-Change-Number: 21623 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in docker-playground[master]: gbproxy-test-fr: Fix syntax error in config file
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/21624 )
Change subject: gbproxy-test-fr: Fix syntax error in config file
..
gbproxy-test-fr: Fix syntax error in config file
It's mp_enable_bss_load_sharing, not mp_enable_load_sharing
Change-Id: I0d2241e0d9e376f27d04721034b1e197901aa662
---
M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/24/21624/1
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index b363f98..7ba5d99 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -12,7 +12,7 @@
*.GBPVTY.CTRL_HOSTNAME := "172.18.25.10"
[MODULE_PARAMETERS]
-GBProxy_Tests.mp_enable_load_sharing := true;
+GBProxy_Tests.mp_enable_bss_load_sharing := true;
GBProxy_Tests.mp_nsconfig_sgsn := {
{
nsvc := {
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21624
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0d2241e0d9e376f27d04721034b1e197901aa662
Gerrit-Change-Number: 21624
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in docker-playground[master]: gbproxy-test-fr: Fix syntax error in config file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21624 ) Change subject: gbproxy-test-fr: Fix syntax error in config file .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0d2241e0d9e376f27d04721034b1e197901aa662 Gerrit-Change-Number: 21624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 11:04:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: gbproxy-test-fr: Fix syntax error in config file
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/21624 )
Change subject: gbproxy-test-fr: Fix syntax error in config file
..
gbproxy-test-fr: Fix syntax error in config file
It's mp_enable_bss_load_sharing, not mp_enable_load_sharing
Change-Id: I0d2241e0d9e376f27d04721034b1e197901aa662
---
M ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
index b363f98..7ba5d99 100644
--- a/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
+++ b/ttcn3-gbproxy-test-fr/GBProxy_Tests.cfg
@@ -12,7 +12,7 @@
*.GBPVTY.CTRL_HOSTNAME := "172.18.25.10"
[MODULE_PARAMETERS]
-GBProxy_Tests.mp_enable_load_sharing := true;
+GBProxy_Tests.mp_enable_bss_load_sharing := true;
GBProxy_Tests.mp_nsconfig_sgsn := {
{
nsvc := {
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21624
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0d2241e0d9e376f27d04721034b1e197901aa662
Gerrit-Change-Number: 21624
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmocore[master]: bssgp2: Encoding + Decoding functions for BVC and MS flow control
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21610 ) Change subject: bssgp2: Encoding + Decoding functions for BVC and MS flow control .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9c89bb1c03550930c07aad7ff8f67129ee7a6320 Gerrit-Change-Number: 21610 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:07:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21611 ) Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:09:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 ) Change subject: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2 .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 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: I1c3fde35cec7fa0adf2bef7659dfc19bf301ffa9 Gerrit-Change-Number: 21617 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:15:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: TC_sns_add: fix wrong udp port in SNS ADD message
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21619 ) Change subject: pcu: TC_sns_add: fix wrong udp port in SNS ADD message .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21619 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: I9bbbf1431468a452df324a7559518496e3eb48e3 Gerrit-Change-Number: 21619 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:17:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: SNS: remove TODO expect FLOW-CONTROL BVC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21620 ) Change subject: pcu: SNS: remove TODO expect FLOW-CONTROL BVC .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21620 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: I142c87d496f08d603ab8e1e13c5a29ebe6596bb0 Gerrit-Change-Number: 21620 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:17:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: SNS: add TC_sns_add_existent
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21621 ) Change subject: pcu: SNS: add TC_sns_add_existent .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21621 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: I096bcbe38d82d08a150a2f8e56f6bc02353273a1 Gerrit-Change-Number: 21621 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:18:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: SNS: fix typo
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21622 ) Change subject: pcu: SNS: fix typo .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21622 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: Iedb6b3f38d87ea3ac29c4bcaaf50e771b0b8a750 Gerrit-Change-Number: 21622 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 12:18:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_sns: rework IP-SNS initial remote
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21573 )
Change subject: gprs_ns2_sns: rework IP-SNS initial remote
..
Patch Set 2:
(4 comments)
https://gerrit.osmocom.org/c/libosmocore/+/21573/2/src/gb/gprs_ns2_internal.h
File src/gb/gprs_ns2_internal.h:
https://gerrit.osmocom.org/c/libosmocore/+/21573/2/src/gb/gprs_ns2_internal.h@296
PS2, Line 296: int offset);
offset means index here?
https://gerrit.osmocom.org/c/libosmocore/+/21573/2/src/gb/gprs_ns2_sns.c
File src/gb/gprs_ns2_sns.c:
https://gerrit.osmocom.org/c/libosmocore/+/21573/2/src/gb/gprs_ns2_sns.c@661
PS2, Line 661: /* empty state - SNS Select will start by all action */
You mean ns2_sns_st_all_action()?
https://gerrit.osmocom.org/c/libosmocore/+/21573/2/src/gb/gprs_ns2_sns.c@1251
PS2, Line 1251: .in_event_mask = 0,
worth adding a comment saying events are handled in all_state.
https://gerrit.osmocom.org/c/libosmocore/+/21573/2/src/gb/gprs_ns2_sns.c@1338
PS2, Line 1338: else if (gss->initial->list.next ==
&gss->sns_endpoints) /* last entry, continue with first */
keep using {} if first clause use {}.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21573
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I71cdbfb53e361e6112fed5e2712236d797ef3ab2
Gerrit-Change-Number: 21573
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-Comment-Date: Wed, 09 Dec 2020 12:26:58 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-trx[master]: ipc-driver-test: Allow setting dir prefix for UD socket
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/21594 ) Change subject: ipc-driver-test: Allow setting dir prefix for UD socket .. Patch Set 1: > Patch Set 1: > > Do we still need the socket number? Why not just go for the full path instead? > I only did the sock number because I was lazy and it was pretty much my own > arcane debug tool, not used by anyone else... Number still allows to set several of them in parallel. Same reason, being a debug tool and so on having the directory path + number is fine, let's merge this in instead of spending more time on it. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/21594 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I35282b38a1d560fb3440fe0aa9a27808d9d116cc Gerrit-Change-Number: 21594 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 12:41:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: nm_channel_fsm: Fix several FSM internal transitions not being made
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/21625 ) Change subject: nm_channel_fsm: Fix several FSM internal transitions not being made .. nm_channel_fsm: Fix several FSM internal transitions not being made During the initial implementation I used the wrong function to change state. As a result, from BSC point of view the BTS was changing state but the FSM internally was not. "Fortunately", while in state Dependency the BTS still could cope with that in order to still be operative with older osmo-bsc, so there was no major breakage, only some error log message being printed. Related: OS#4901 Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 --- M src/common/nm_channel_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/21625/1 diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 263d2cc..4925959 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -92,7 +92,7 @@ oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data); return; case NM_EV_BBTRANSC_ENABLED: - oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); return; default: OSMO_ASSERT(0); @@ -121,7 +121,7 @@ oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data); return; case NM_EV_BBTRANSC_DISABLED: - oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); return; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 Gerrit-Change-Number: 21625 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: nm_channel_fsm: Fix several FSM internal transitions not being made
pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/21625 ) Change subject: nm_channel_fsm: Fix several FSM internal transitions not being made .. nm_channel_fsm: Fix several FSM internal transitions not being made During the initial implementation I used the wrong function to change state. As a result, from BSC point of view the BTS was changing state but the FSM internally was not. "Fortunately", while in state Dependency the BTS still could cope with that in order to still be operative with older osmo-bsc, so there was no major breakage, only some error log message being printed. Related: OS#4873 Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 --- M src/common/nm_channel_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/21625/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 Gerrit-Change-Number: 21625 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: nm_channel_fsm: Fix several FSM internal transitions not being made
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21625 ) Change subject: nm_channel_fsm: Fix several FSM internal transitions not being made .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 Gerrit-Change-Number: 21625 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 09 Dec 2020 13:56:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: nm_channel_fsm: Fix several FSM internal transitions not being made
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21625 ) Change subject: nm_channel_fsm: Fix several FSM internal transitions not being made .. Patch Set 2: Verified+1 Code-Review+2 Works for me :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 Gerrit-Change-Number: 21625 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 09 Dec 2020 14:07:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: nm_channel_fsm: Fix several FSM internal transitions not being made
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21625 ) Change subject: nm_channel_fsm: Fix several FSM internal transitions not being made .. nm_channel_fsm: Fix several FSM internal transitions not being made During the initial implementation I used the wrong function to change state. As a result, from BSC point of view the BTS was changing state but the FSM internally was not. "Fortunately", while in state Dependency the BTS still could cope with that in order to still be operative with older osmo-bsc, so there was no major breakage, only some error log message being printed. Related: OS#4873 Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 --- M src/common/nm_channel_fsm.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 263d2cc..4925959 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -92,7 +92,7 @@ oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data); return; case NM_EV_BBTRANSC_ENABLED: - oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_OFF_LINE); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_OFFLINE); return; default: OSMO_ASSERT(0); @@ -121,7 +121,7 @@ oml_mo_opstart_nack(&ts->mo, (int)(intptr_t)data); return; case NM_EV_BBTRANSC_DISABLED: - oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY); + nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_DEPENDENCY); return; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21625 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifd2eefc362fca0aa9e6ae102c7e6dbc1b4f295d6 Gerrit-Change-Number: 21625 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627 )
Change subject: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
..
Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
Change-Id: Ib9a09fea85110a4f0966c07d911e37234aa06391
---
M library/Osmocom_Gb_Types.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/27/21627/1
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 2afedcc..ba05f7d 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -1255,7 +1255,7 @@
iEI := '1E'O,
ext := '1'B,
lengthIndicator := {
- length1 := 2
+ length1 := 1
},
unstructured_Value := tag
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627
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: Ib9a09fea85110a4f0966c07d911e37234aa06391
Gerrit-Change-Number: 21627
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21626 )
Change subject: gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
..
gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
Follow-up fix to I96e8b6a1a69148f770476e87c920dc256c1d7379
Related: OS#4520
Change-Id: I2eb6ffb3d0dba1405692c0e885622936d65cf95a
---
M gbproxy/GBProxy_Tests.fr.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/26/21626/1
diff --git a/gbproxy/GBProxy_Tests.fr.cfg b/gbproxy/GBProxy_Tests.fr.cfg
index ececed9..043a2db 100644
--- a/gbproxy/GBProxy_Tests.fr.cfg
+++ b/gbproxy/GBProxy_Tests.fr.cfg
@@ -12,7 +12,7 @@
*.GBPVTY.CTRL_HOSTNAME := "127.0.0.1"
[MODULE_PARAMETERS]
-GBProxy_Tests.mp_enable_load_sharing := true;
+GBProxy_Tests.mp_enable_bss_load_sharing := true;
GBProxy_Tests.mp_nsconfig_sgsn := {
{
handle_sns := false
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21626
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: I2eb6ffb3d0dba1405692c0e885622936d65cf95a
Gerrit-Change-Number: 21626
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bssgp: Introduce "GLOBAL" port for PTP BVC
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21629 )
Change subject: bssgp: Introduce "GLOBAL" port for PTP BVC
..
bssgp: Introduce "GLOBAL" port for PTP BVC
There are some messages/procedures on a PTP BVC which are not related
to one specific TLLI, but affect the whole PTP BVC. First and foremost
that is the FLOW-CONTROL-BVC. Let's check if the user is interested in
handling those internally (by connecting to the GLOBAL port). If not,
fall back to acknowledging all incoing FC-BVC and ignoring all ACKs.
Related: OS#4891
Change-Id: Ib80a6a522dbcb33fd0e7bd31a73ef28fdc636f57
---
M library/BSSGP_Emulation.ttcnpp
1 file changed, 24 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/29/21629/1
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index ebe9f45..633eee2 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -698,7 +698,10 @@
/* port to a management instance */
port BSSGP_BVC_MGMT_SP_PT MGMT;
- /* BSSGP-User SAP towards the user (Client) */
+ /* per-BVC global port for e.g. BVC Flow Control */
+ port BSSGP_SP_PT GLOBAL;
+
+ /* BSSGP-User SAP towards the user (per-TLLI, Client) */
port BSSGP_SP_PT BSSGP_SP;
port BSSGP_SP_PT BSSGP_SP_SIG;
port BSSGP_PROC_PT BSSGP_PROC;
@@ -1119,16 +1122,24 @@
[] as_ptp_handle_inbound_reset();
- /* simply acknowledge all per-BVC Flow Control Messages */
[g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_FC_BVC, g_cfg.bvci))
-> value udi {
- var OCT1 tag :=
udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;
- BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_BVC_ACK(tag), g_cfg.bvci,
g_bvc_lsp));
+ if (GLOBAL.checkstate("Connected")) {
+ GLOBAL.send(udi.bssgp);
+ } else {
+ /* simply acknowledge all per-BVC Flow Control Messages
*/
+ var OCT1 tag :=
udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;
+ BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_BVC_ACK(tag),
g_cfg.bvci, g_bvc_lsp));
+ }
}
-/*
- [g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(t_BVC_FC_MS, g_cfg.bvci)) {
- BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_MS_ACK, g_cfg.bvci));
+
+ [not g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(t_BVC_FC_BVC_ACK(?),
g_cfg.bvci)) -> value udi {
+ if (GLOBAL.checkstate("Connected")) {
+ GLOBAL.send(udi.bssgp);
+ } else {
+ /* ignore any incoming flow control ACK */
+ }
}
-*/
+
/* Any other PTP BSSGP message: If it has TLLI, route to component;
otherwise broadcast */
[] BVC.receive(tr_ptp_BnsUdInd(?, g_cfg.bvci)) -> value udi {
var BssgpDecoded dec := f_dec_bssgp(udi.bssgp);
@@ -1221,6 +1232,11 @@
BVC.send(ts_ptp_BnsUdReq(ts_BSSGP_DL_UD(tlli, llc_enc),
g_cfg.bvci, oct2int(tlli)));
}
+ /* Testcase sends us BSSGP on global port */
+ [] GLOBAL.receive(PDU_BSSGP:?)-> value bs_pdu sender vc_conn {
+ BVC.send(ts_ptp_BnsUdReq(bs_pdu, g_cfg.bvci, g_bvc_lsp));
+ }
+
[] MGMT.receive(BssgpBlockRequest:?) -> value bbr {
f_ptp_sendBlock(bbr.cause);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21629
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: Ib80a6a522dbcb33fd0e7bd31a73ef28fdc636f57
Gerrit-Change-Number: 21629
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21628 )
Change subject: bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
..
bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
... to indicate this is about the signaling BVC only.
Change-Id: I646db452c89842465902b5167c9c86de51df1241
---
M library/BSSGP_Emulation.ttcnpp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/28/21628/1
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 0aa27e6..ebe9f45 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -302,7 +302,7 @@
}
}
-private template PDU_BSSGP tr_GLOBAL := (
+private template PDU_BSSGP tr_GLOBAL_SIG := (
{pDU_BSSGP_SUSPEND:=?}, {pDU_BSSGP_SUSPEND_ACK:=?},
{pDU_BSSGP_SUSPEND_NACK:=?},
{pDU_BSSGP_RESUME:=?}, {pDU_BSSGP_RESUME_ACK:=?},
{pDU_BSSGP_RESUME_NACK:=?},
{pDU_BSSGP_SGSN_INVOKE_TRACE:=?}, {pDU_BSSGP_OVERLOAD:=?}
@@ -336,7 +336,7 @@
}
/* Messages with BVCI = 0 (Signaling) in BVCI field of NS */
- [] BSCP.receive(f_BnsUdInd(tr_GLOBAL, 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_GLOBAL_SIG, 0)) -> value udi {
GLOBAL.send(udi.bssgp);
}
[] BSCP.receive(f_BnsUdInd(tr_RIM, 0)) -> value udi {
@@ -393,7 +393,7 @@
BSCP.send(udr);
}
- [] GLOBAL.receive(tr_GLOBAL) -> value bssgp {
+ [] GLOBAL.receive(tr_GLOBAL_SIG) -> value bssgp {
BSCP.send(f_BnsUdReq(bssgp, 0, 0));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21628
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: I646db452c89842465902b5167c9c86de51df1241
Gerrit-Change-Number: 21628
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: cosmetic: More comments / section headers
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21630 )
Change subject: gbproxy: cosmetic: More comments / section headers
..
gbproxy: cosmetic: More comments / section headers
Change-Id: I26162cd37908d60761182edd50c3aa8389486b7c
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/30/21630/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index d6c8bb1..0145c97 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -1928,6 +1928,10 @@
f_cleanup();
}
+/***
+ * FLUSH-LL procedure
+ ***/
+
private function f_TC_flush_ll(charstring id) runs on BSSGP_ConnHdlr {
var BssgpBvci bvci := g_pars.pcu[0].cfg.bvc[0].bvci;
var integer i;
@@ -1958,6 +1962,10 @@
f_cleanup();
}
+/***
+ * SGSN-INVOKE-TRACE procedure
+ ***/
+
private altstep as_bssgp_g_pcu_count(integer pcu_idx, template (present)
PDU_BSSGP exp_rx, inout ro_integer roi)
runs on GlobalTest_CT {
[] G_PCU[pcu_idx].receive(exp_rx) from g_pcu[pcu_idx].vc_BSSGP {
@@ -1998,6 +2006,10 @@
f_cleanup();
}
+/***
+ * LLC-DISCARDED procedure
+ ***/
+
private function f_TC_llc_discarded(charstring id) runs on BSSGP_ConnHdlr {
var BssgpBvci bvci := g_pars.pcu[0].cfg.bvc[0].bvci;
@@ -2022,6 +2034,10 @@
f_cleanup();
}
+/***
+ * OVERLOAD procedure
+ ***/
+
/* Send an OVERLOAD from SGSN side and expect it to show up on each PCU (SIG
BVC) */
testcase TC_overload() runs on GlobalTest_CT
{
@@ -2051,6 +2067,10 @@
f_cleanup();
}
+/***
+ * BVC-BLOCK / BVC-UNBLOCK procedure
+ ***/
+
private function f_block_ptp_bvc_from_pcu(integer pcu_idx, integer bvc_idx)
runs on test_CT
{
var BSSGP_BVC_CT bvc_ct := g_pcu[pcu_idx].vc_BSSGP_BVC[bvc_idx];
@@ -2105,6 +2125,10 @@
f_cleanup();
}
+/***
+ * BVC-RESET procedure
+ ***/
+
private altstep as_ignore_status(BSSGP_BVC_MGMT_PT pt) {
[] pt.receive(BssgpStatusIndication:?) { repeat; }
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21630
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: I26162cd37908d60761182edd50c3aa8389486b7c
Gerrit-Change-Number: 21630
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631 )
Change subject: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
..
gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
This way it's more obvious that it refers to the PTP BVC, like we
already use PCU_SIG and SGSN_SIG for the signaling BVCs.
Change-Id: Ie8d327b0c6fae0e7963cc5907ab0bc94e97c67f3
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 31 insertions(+), 31 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/31/21631/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 0145c97..a2055ea 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -283,7 +283,7 @@
type component BSSGP_ConnHdlr {
/* array of per-BVC ports on the PCU side */
- port BSSGP_PT PCU[NUM_PCU];
+ port BSSGP_PT PCU_PTP[NUM_PCU];
port BSSGP_PT PCU_SIG[NUM_PCU];
port BSSGP_PROC_PT PCU_PROC[NUM_PCU];
/* component reference to the component to which we're currently
connected */
@@ -292,7 +292,7 @@
var BssgpBvcConfig pcu_bvc_cfg[NUM_PCU];
/* array of per-BVC ports on the SGSN side */
- port BSSGP_PT SGSN[NUM_SGSN];
+ port BSSGP_PT SGSN_PTP[NUM_SGSN];
port BSSGP_PT SGSN_SIG[NUM_SGSN];
port BSSGP_PROC_PT SGSN_PROC[NUM_SGSN];
/* component reference to the component to which we're currently
connected */
@@ -541,15 +541,15 @@
private function f_connect_to_pcu_bvc(integer port_idx, integer nse_idx,
integer bvc_idx)
runs on BSSGP_ConnHdlr {
var BSSGP_BVC_CT bvc_ct := g_pars.pcu[nse_idx].vc_BSSGP_BVC[bvc_idx]
- if (PCU[port_idx].checkstate("Connected")) {
+ if (PCU_PTP[port_idx].checkstate("Connected")) {
/* unregister + disconnect from old BVC */
f_client_unregister(g_pars.imsi, PCU_PROC[port_idx]);
- disconnect(self:PCU[port_idx], pcu_ct[port_idx]:BSSGP_SP);
+ disconnect(self:PCU_PTP[port_idx], pcu_ct[port_idx]:BSSGP_SP);
disconnect(self:PCU_SIG[port_idx],
pcu_ct[port_idx]:BSSGP_SP_SIG);
disconnect(self:PCU_PROC[port_idx],
pcu_ct[port_idx]:BSSGP_PROC);
}
/* connect to new BVC and register us */
- connect(self:PCU[port_idx], bvc_ct:BSSGP_SP);
+ connect(self:PCU_PTP[port_idx], bvc_ct:BSSGP_SP);
connect(self:PCU_SIG[port_idx], bvc_ct:BSSGP_SP_SIG);
connect(self:PCU_PROC[port_idx], bvc_ct:BSSGP_PROC);
f_client_register(g_pars.imsi, g_pars.tlli, PCU_PROC[port_idx]);
@@ -559,15 +559,15 @@
/* Connect the SGSN-side per-BVC ports (SGSN/SGSN_SIG/SGSN_PROC) array slot
'port_idx' to specified per-BVC component */
private function f_connect_to_sgsn_bvc(integer port_idx, BSSGP_BVC_CT bvc_ct)
runs on BSSGP_ConnHdlr {
- if (SGSN[port_idx].checkstate("Connected")) {
+ if (SGSN_PTP[port_idx].checkstate("Connected")) {
/* unregister + disconnect from old BVC */
f_client_unregister(g_pars.imsi, SGSN_PROC[port_idx]);
- disconnect(self:SGSN[port_idx], sgsn_ct[port_idx]:BSSGP_SP);
+ disconnect(self:SGSN_PTP[port_idx], sgsn_ct[port_idx]:BSSGP_SP);
disconnect(self:SGSN_SIG[port_idx],
sgsn_ct[port_idx]:BSSGP_SP_SIG);
disconnect(self:SGSN_PROC[port_idx],
sgsn_ct[port_idx]:BSSGP_PROC);
}
/* connect to new BVC and register us */
- connect(self:SGSN[port_idx], bvc_ct:BSSGP_SP);
+ connect(self:SGSN_PTP[port_idx], bvc_ct:BSSGP_SP);
connect(self:SGSN_SIG[port_idx], bvc_ct:BSSGP_SP_SIG);
connect(self:SGSN_PROC[port_idx], bvc_ct:BSSGP_PROC);
f_client_register(g_pars.imsi, g_pars.tlli, SGSN_PROC[port_idx]);
@@ -630,7 +630,7 @@
if (use_sig) {
PCU_SIG[pcu_idx].send(tx);
} else {
- PCU[pcu_idx].send(tx);
+ PCU_PTP[pcu_idx].send(tx);
}
T.start;
@@ -638,10 +638,10 @@
[use_sig] SGSN_SIG[sgsn_idx].receive(exp_rx) {
setverdict(pass);
}
- [not use_sig] SGSN[sgsn_idx].receive(exp_rx) {
+ [not use_sig] SGSN_PTP[sgsn_idx].receive(exp_rx) {
setverdict(pass);
}
- [] SGSN[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {
+ [] SGSN_PTP[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {
setverdict(fail, "Unexpected BSSGP on SGSN side: ", rx);
mtc.stop;
}
@@ -665,7 +665,7 @@
if (use_sig) {
SGSN_SIG[sgsn_idx].send(tx);
} else {
- SGSN[sgsn_idx].send(tx);
+ SGSN_PTP[sgsn_idx].send(tx);
}
T.start;
@@ -673,10 +673,10 @@
[use_sig] PCU_SIG[pcu_idx].receive(exp_rx) {
setverdict(pass);
}
-
Change in osmo-ttcn3-hacks[master]: gbproxy: properly shutdown at the end of the test
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633 )
Change subject: gbproxy: properly shutdown at the end of the test
..
gbproxy: properly shutdown at the end of the test
Destroying at least most of the components in an orderly fashion avoids
at least most of the race conditions during test shutdown.
Change-Id: I2aa4ef8a70c1139893c9621f5a6b6007b221c13d
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/33/21633/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 7811a01..9bd0550 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -14,6 +14,7 @@
import from General_Types all;
import from Osmocom_Types all;
+import from Misc_Helpers all;
import from GSM_Types all;
import from Native_Functions all;
import from NS_Types all;
@@ -398,6 +399,15 @@
}
+private function f_destroy_gb(inout GbInstance gb) runs on test_CT {
+ gb.vc_NS.stop;
+ gb.vc_BSSGP.stop;
+
+ for (var integer i := 0; i < lengthof(gb.cfg.bvc); i := i + 1) {
+ gb.vc_BSSGP_BVC[i].stop;
+ }
+}
+
private function f_init_vty() runs on test_CT {
map(self:GBPVTY, system:GBPVTY);
f_vty_set_prompts(GBPVTY);
@@ -513,7 +523,16 @@
}
function f_cleanup() runs on test_CT {
- self.stop;
+ var integer i;
+
+ for (i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {
+ f_destroy_gb(g_sgsn[i]);
+ }
+ for (i := 0; i < lengthof(mp_nsconfig_pcu); i := i+1) {
+ f_destroy_gb(g_pcu[i]);
+ }
+
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass);
}
type function void_fn(charstring id) runs on BSSGP_ConnHdlr;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633
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: I2aa4ef8a70c1139893c9621f5a6b6007b221c13d
Gerrit-Change-Number: 21633
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: Introduce global guard timer in test_CT
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632 )
Change subject: gbproxy: Introduce global guard timer in test_CT
..
gbproxy: Introduce global guard timer in test_CT
We did have a guard time in each ConnHdlr, but not in the MTC (test_CT).
However, we do have tests that don't use any ConnHdlr, and those were so
far ran without a guard timeout. Fix that.
Change-Id: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/32/21632/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index a2055ea..7811a01 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -279,6 +279,7 @@
var boolean g_use_echo := false;
var ro_integer g_roi := {};
+ timer g_Tguard;
};
type component BSSGP_ConnHdlr {
@@ -414,7 +415,7 @@
return false;
}
-function f_init() runs on test_CT {
+function f_init(float t_guard := 30.0) runs on test_CT {
var ro_integer bvci_unblocked := {};
var BssgpStatusIndication bsi;
var integer i;
@@ -424,6 +425,9 @@
}
g_initialized := true;
+ g_Tguard.start(t_guard);
+ activate(as_gTguard(g_Tguard));
+
g_sgsn[0].cfg := {
nsei := mp_nsconfig_sgsn[0].nsei,
sgsn_role := true,
@@ -503,6 +507,9 @@
mtc.stop;
}
}
+
+ /* re-start guard timer after all BVCs are up, so it only counts the
actual test case */
+ g_Tguard.start(t_guard);
}
function f_cleanup() runs on test_CT {
@@ -574,8 +581,8 @@
sgsn_ct[port_idx] := bvc_ct;
}
-private altstep as_Tguard() runs on BSSGP_ConnHdlr {
- [] g_Tguard.timeout {
+private altstep as_gTguard(timer Tguard) {
+ [] Tguard.timeout {
setverdict(fail, "Tguard timeout");
mtc.stop;
}
@@ -601,7 +608,7 @@
}
g_Tguard.start(pars.t_guard);
- activate(as_Tguard());
+ activate(as_gTguard(g_Tguard));
/* call the user-supplied test case function */
fn.apply(id);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632
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: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f
Gerrit-Change-Number: 21632
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: Test case for BVC flow control procedure
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634 )
Change subject: gbproxy: Test case for BVC flow control procedure
..
gbproxy: Test case for BVC flow control procedure
Related: OS#4891
Change-Id: I6daa5848bd59b42f152de783bfdc602d1f2da861
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 71 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/34/21634/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 9bd0550..5e81c13 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -726,6 +726,7 @@
port BSSGP_PT G_SGSN[NUM_SGSN];
};
+/* connect the signaling BVC of each NSE to the G_PCU / G_SGSN ports */
private function f_global_init() runs on GlobalTest_CT {
var integer i;
for (i := 0; i < lengthof(g_sgsn); i := i+1) {
@@ -736,6 +737,17 @@
}
}
+/* connect the first PTP BVC of each NSE to the G_PCU / G_SGSN ports */
+private function f_global_init_ptp() runs on GlobalTest_CT {
+ var integer i;
+ for (i := 0; i < lengthof(g_sgsn); i := i+1) {
+ connect(self:G_SGSN[i], g_sgsn[i].vc_BSSGP_BVC[0]:GLOBAL);
+ }
+ for (i := 0; i < lengthof(g_pcu); i := i+1) {
+ connect(self:G_PCU[i], g_pcu[i].vc_BSSGP_BVC[0]:GLOBAL);
+ }
+}
+
/* Send 'tx' on PTP-BVCI from PCU; expect 'rx' on SGSN */
friend function f_global_pcu2sgsn(template (value) PDU_BSSGP tx, template
(present) PDU_BSSGP exp_rx,
integer pcu_idx := 0, integer sgsn_idx := 0)
runs on GlobalTest_CT {
@@ -2324,6 +2336,64 @@
f_cleanup();
}
+/***
+ * FLOW-CONTROL-BVC procedure
+ ***/
+
+private altstep as_g_count_sgsn(integer sgsn_idx, inout ro_integer roi,
+template PDU_BSSGP exp_rx, template (omit)
PDU_BSSGP tx_reply)
+runs on GlobalTest_CT {
+ [] G_SGSN[sgsn_idx].receive(exp_rx) {
+ roi := roi & { sgsn_idx };
+ if (ispresent(tx_reply)) {
+ G_SGSN[sgsn_idx].send(tx_reply);
+ }
+ }
+}
+/* Send FC-BVC from simulated PCU; expect each SGSN to receive it; expect PCU
to receive ACK */
+testcase TC_fc_bvc() runs on GlobalTest_CT
+{
+ f_init();
+ f_global_init_ptp();
+
+ var template (value) PDU_BSSGP pdu_tx := t_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
+ /* we cannot use pdu_tx as there are some subtle differences in the
length field :/ */
+ var template (present) PDU_BSSGP pdu_rx := tr_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
+ var template (omit) PDU_BSSGP ack_tx :=
+
t_BVC_FC_BVC_ACK(pdu_tx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value);
+
+ /* Send a FC-BVC from BSS to gbproxy, expect an ACK in response */
+ G_PCU[0].send(pdu_tx);
+
+ /* Activate altsteps: One for each SGSN-side PTP BVC port */
+ var ro_default defaults := {};
+ for (var integer i := 0; i < lengthof(g_sgsn); i := i+1) {
+ var default d := activate(as_g_count_sgsn(i, g_roi, pdu_rx,
ack_tx));
+ defaults := defaults & { d };
+ }
+
+ f_sleep(3.0);
+
+ for (var integer i := 0; i < lengthof(defaults); i := i+1) {
+ deactivate(defaults[i]);
+ }
+
+ /* check if BVC-block was received on all expected BVC */
+ for (var integer i := 0; i < lengthof(g_sgsn); i := i+1) {
+ if (not ro_integer_contains(g_roi, i)) {
+ setverdict(fail, "Missing BVC-FLOW-CONTROL on SGSN
index ", i);
+ }
+ }
+
+ /* Expect ACK on PCU side */
+ G_PCU[0].receive(ack_tx);
+
+ setverdict(pass);
+
+ f_cleanup();
+}
+
+
control {
execute( TC_BVC_bringup() );
execute( TC_ul_unitdata() );
@@ -2385,6 +2455,7 @@
execute( TC_flush_ll() );
+ execute( TC_fc_bvc() );
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634
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: I6daa5848bd59b42f152de783bfdc602d1f2da861
Gerrit-Change-Number: 21634
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21626 ) Change subject: gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21626 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: I2eb6ffb3d0dba1405692c0e885622936d65cf95a Gerrit-Change-Number: 21626 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 14:32:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627 ) Change subject: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627 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: Ib9a09fea85110a4f0966c07d911e37234aa06391 Gerrit-Change-Number: 21627 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Dec 2020 14:32:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21628 ) Change subject: bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21628 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: I646db452c89842465902b5167c9c86de51df1241 Gerrit-Change-Number: 21628 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Dec 2020 14:33:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bssgp: Introduce "GLOBAL" port for PTP BVC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21629 ) Change subject: bssgp: Introduce "GLOBAL" port for PTP BVC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21629 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: Ib80a6a522dbcb33fd0e7bd31a73ef28fdc636f57 Gerrit-Change-Number: 21629 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 14:33:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: cosmetic: More comments / section headers
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21630 ) Change subject: gbproxy: cosmetic: More comments / section headers .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21630 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: I26162cd37908d60761182edd50c3aa8389486b7c Gerrit-Change-Number: 21630 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 14:33:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Introduce global guard timer in test_CT
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632 ) Change subject: gbproxy: Introduce global guard timer in test_CT .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632 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: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f Gerrit-Change-Number: 21632 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 14:34:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627 ) Change subject: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length .. Removed Verified+1 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627 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: Ib9a09fea85110a4f0966c07d911e37234aa06391 Gerrit-Change-Number: 21627 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote
Change in osmo-ttcn3-hacks[master]: gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21626 )
Change subject: gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
..
gbproxy: Fix syntax error in GBProxy_Tests.fr.cfg
Follow-up fix to I96e8b6a1a69148f770476e87c920dc256c1d7379
Related: OS#4520
Change-Id: I2eb6ffb3d0dba1405692c0e885622936d65cf95a
---
M gbproxy/GBProxy_Tests.fr.cfg
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved; Verified
diff --git a/gbproxy/GBProxy_Tests.fr.cfg b/gbproxy/GBProxy_Tests.fr.cfg
index ececed9..043a2db 100644
--- a/gbproxy/GBProxy_Tests.fr.cfg
+++ b/gbproxy/GBProxy_Tests.fr.cfg
@@ -12,7 +12,7 @@
*.GBPVTY.CTRL_HOSTNAME := "127.0.0.1"
[MODULE_PARAMETERS]
-GBProxy_Tests.mp_enable_load_sharing := true;
+GBProxy_Tests.mp_enable_bss_load_sharing := true;
GBProxy_Tests.mp_nsconfig_sgsn := {
{
handle_sns := false
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21626
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: I2eb6ffb3d0dba1405692c0e885622936d65cf95a
Gerrit-Change-Number: 21626
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627 )
Change subject: Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
..
Osmocom_Gb_Types: Fix t_BVC_FC_BVC_ACK() TAG IE length
Change-Id: Ib9a09fea85110a4f0966c07d911e37234aa06391
---
M library/Osmocom_Gb_Types.ttcn
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index 2afedcc..ba05f7d 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -1255,7 +1255,7 @@
iEI := '1E'O,
ext := '1'B,
lengthIndicator := {
- length1 := 2
+ length1 := 1
},
unstructured_Value := tag
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21627
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: Ib9a09fea85110a4f0966c07d911e37234aa06391
Gerrit-Change-Number: 21627
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631 ) Change subject: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631 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: Ie8d327b0c6fae0e7963cc5907ab0bc94e97c67f3 Gerrit-Change-Number: 21631 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 14:37:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: properly shutdown at the end of the test
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633 ) Change subject: gbproxy: properly shutdown at the end of the test .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633 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: I2aa4ef8a70c1139893c9621f5a6b6007b221c13d Gerrit-Change-Number: 21633 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 14:38:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21607 ) Change subject: NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Gerrit-Change-Number: 21607 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 14:41:32 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Test case for BVC flow control procedure
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634 ) Change subject: gbproxy: Test case for BVC flow control procedure .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634 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: I6daa5848bd59b42f152de783bfdc602d1f2da861 Gerrit-Change-Number: 21634 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 14:59:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
daniel has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21597 )
Change subject: logging: Introduce DLBSSGP logging constant
..
Patch Set 4:
(1 comment)
DBSSGP in src/gb/common_vty.{c,h} is unused now, we can remove it.
https://gerrit.osmocom.org/c/libosmocore/+/21597/4/src/gb/gprs_bssgp.c
File src/gb/gprs_bssgp.c:
https://gerrit.osmocom.org/c/libosmocore/+/21597/4/src/gb/gprs_bssgp.c@1356
PS4, Line 1356: LOGP(DLGLOBAL, LOGL_ERROR, "BSSGP has moved from DGPRS
to DLGPRS, please update your code\n");
We should also mark it as OSMO_DEPRECATED() in gprs/gprs_bssgp.h
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93
Gerrit-Change-Number: 21597
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Comment-Date: Wed, 09 Dec 2020 15:15:25 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631 ) Change subject: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631 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: Ie8d327b0c6fae0e7963cc5907ab0bc94e97c67f3 Gerrit-Change-Number: 21631 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 15:26:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: properly shutdown at the end of the test
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633 ) Change subject: gbproxy: properly shutdown at the end of the test .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633 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: I2aa4ef8a70c1139893c9621f5a6b6007b221c13d Gerrit-Change-Number: 21633 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 15:26:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gbproxy: Test case for BVC flow control procedure
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634 ) Change subject: gbproxy: Test case for BVC flow control procedure .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634 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: I6daa5848bd59b42f152de783bfdc602d1f2da861 Gerrit-Change-Number: 21634 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 15:26:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bssgp: Introduce "GLOBAL" port for PTP BVC
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21629 )
Change subject: bssgp: Introduce "GLOBAL" port for PTP BVC
..
bssgp: Introduce "GLOBAL" port for PTP BVC
There are some messages/procedures on a PTP BVC which are not related
to one specific TLLI, but affect the whole PTP BVC. First and foremost
that is the FLOW-CONTROL-BVC. Let's check if the user is interested in
handling those internally (by connecting to the GLOBAL port). If not,
fall back to acknowledging all incoing FC-BVC and ignoring all ACKs.
Related: OS#4891
Change-Id: Ib80a6a522dbcb33fd0e7bd31a73ef28fdc636f57
---
M library/BSSGP_Emulation.ttcnpp
1 file changed, 24 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index ebe9f45..633eee2 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -698,7 +698,10 @@
/* port to a management instance */
port BSSGP_BVC_MGMT_SP_PT MGMT;
- /* BSSGP-User SAP towards the user (Client) */
+ /* per-BVC global port for e.g. BVC Flow Control */
+ port BSSGP_SP_PT GLOBAL;
+
+ /* BSSGP-User SAP towards the user (per-TLLI, Client) */
port BSSGP_SP_PT BSSGP_SP;
port BSSGP_SP_PT BSSGP_SP_SIG;
port BSSGP_PROC_PT BSSGP_PROC;
@@ -1119,16 +1122,24 @@
[] as_ptp_handle_inbound_reset();
- /* simply acknowledge all per-BVC Flow Control Messages */
[g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(tr_BVC_FC_BVC, g_cfg.bvci))
-> value udi {
- var OCT1 tag :=
udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;
- BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_BVC_ACK(tag), g_cfg.bvci,
g_bvc_lsp));
+ if (GLOBAL.checkstate("Connected")) {
+ GLOBAL.send(udi.bssgp);
+ } else {
+ /* simply acknowledge all per-BVC Flow Control Messages
*/
+ var OCT1 tag :=
udi.bssgp.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value;
+ BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_BVC_ACK(tag),
g_cfg.bvci, g_bvc_lsp));
+ }
}
-/*
- [g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(t_BVC_FC_MS, g_cfg.bvci)) {
- BVC.send(ts_ptp_BnsUdReq(t_BVC_FC_MS_ACK, g_cfg.bvci));
+
+ [not g_sgsn_role] BVC.receive(tr_ptp_BnsUdInd(t_BVC_FC_BVC_ACK(?),
g_cfg.bvci)) -> value udi {
+ if (GLOBAL.checkstate("Connected")) {
+ GLOBAL.send(udi.bssgp);
+ } else {
+ /* ignore any incoming flow control ACK */
+ }
}
-*/
+
/* Any other PTP BSSGP message: If it has TLLI, route to component;
otherwise broadcast */
[] BVC.receive(tr_ptp_BnsUdInd(?, g_cfg.bvci)) -> value udi {
var BssgpDecoded dec := f_dec_bssgp(udi.bssgp);
@@ -1221,6 +1232,11 @@
BVC.send(ts_ptp_BnsUdReq(ts_BSSGP_DL_UD(tlli, llc_enc),
g_cfg.bvci, oct2int(tlli)));
}
+ /* Testcase sends us BSSGP on global port */
+ [] GLOBAL.receive(PDU_BSSGP:?)-> value bs_pdu sender vc_conn {
+ BVC.send(ts_ptp_BnsUdReq(bs_pdu, g_cfg.bvci, g_bvc_lsp));
+ }
+
[] MGMT.receive(BssgpBlockRequest:?) -> value bbr {
f_ptp_sendBlock(bbr.cause);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21629
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: Ib80a6a522dbcb33fd0e7bd31a73ef28fdc636f57
Gerrit-Change-Number: 21629
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: cosmetic: More comments / section headers
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21630 )
Change subject: gbproxy: cosmetic: More comments / section headers
..
gbproxy: cosmetic: More comments / section headers
Change-Id: I26162cd37908d60761182edd50c3aa8389486b7c
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 24 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index d6c8bb1..0145c97 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -1928,6 +1928,10 @@
f_cleanup();
}
+/***
+ * FLUSH-LL procedure
+ ***/
+
private function f_TC_flush_ll(charstring id) runs on BSSGP_ConnHdlr {
var BssgpBvci bvci := g_pars.pcu[0].cfg.bvc[0].bvci;
var integer i;
@@ -1958,6 +1962,10 @@
f_cleanup();
}
+/***
+ * SGSN-INVOKE-TRACE procedure
+ ***/
+
private altstep as_bssgp_g_pcu_count(integer pcu_idx, template (present)
PDU_BSSGP exp_rx, inout ro_integer roi)
runs on GlobalTest_CT {
[] G_PCU[pcu_idx].receive(exp_rx) from g_pcu[pcu_idx].vc_BSSGP {
@@ -1998,6 +2006,10 @@
f_cleanup();
}
+/***
+ * LLC-DISCARDED procedure
+ ***/
+
private function f_TC_llc_discarded(charstring id) runs on BSSGP_ConnHdlr {
var BssgpBvci bvci := g_pars.pcu[0].cfg.bvc[0].bvci;
@@ -2022,6 +2034,10 @@
f_cleanup();
}
+/***
+ * OVERLOAD procedure
+ ***/
+
/* Send an OVERLOAD from SGSN side and expect it to show up on each PCU (SIG
BVC) */
testcase TC_overload() runs on GlobalTest_CT
{
@@ -2051,6 +2067,10 @@
f_cleanup();
}
+/***
+ * BVC-BLOCK / BVC-UNBLOCK procedure
+ ***/
+
private function f_block_ptp_bvc_from_pcu(integer pcu_idx, integer bvc_idx)
runs on test_CT
{
var BSSGP_BVC_CT bvc_ct := g_pcu[pcu_idx].vc_BSSGP_BVC[bvc_idx];
@@ -2105,6 +2125,10 @@
f_cleanup();
}
+/***
+ * BVC-RESET procedure
+ ***/
+
private altstep as_ignore_status(BSSGP_BVC_MGMT_PT pt) {
[] pt.receive(BssgpStatusIndication:?) { repeat; }
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21630
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: I26162cd37908d60761182edd50c3aa8389486b7c
Gerrit-Change-Number: 21630
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21628 )
Change subject: bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
..
bssgp: rename tr_GLOBAL to tr_GLOBAL_SIG
... to indicate this is about the signaling BVC only.
Change-Id: I646db452c89842465902b5167c9c86de51df1241
---
M library/BSSGP_Emulation.ttcnpp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/library/BSSGP_Emulation.ttcnpp b/library/BSSGP_Emulation.ttcnpp
index 0aa27e6..ebe9f45 100644
--- a/library/BSSGP_Emulation.ttcnpp
+++ b/library/BSSGP_Emulation.ttcnpp
@@ -302,7 +302,7 @@
}
}
-private template PDU_BSSGP tr_GLOBAL := (
+private template PDU_BSSGP tr_GLOBAL_SIG := (
{pDU_BSSGP_SUSPEND:=?}, {pDU_BSSGP_SUSPEND_ACK:=?},
{pDU_BSSGP_SUSPEND_NACK:=?},
{pDU_BSSGP_RESUME:=?}, {pDU_BSSGP_RESUME_ACK:=?},
{pDU_BSSGP_RESUME_NACK:=?},
{pDU_BSSGP_SGSN_INVOKE_TRACE:=?}, {pDU_BSSGP_OVERLOAD:=?}
@@ -336,7 +336,7 @@
}
/* Messages with BVCI = 0 (Signaling) in BVCI field of NS */
- [] BSCP.receive(f_BnsUdInd(tr_GLOBAL, 0)) -> value udi {
+ [] BSCP.receive(f_BnsUdInd(tr_GLOBAL_SIG, 0)) -> value udi {
GLOBAL.send(udi.bssgp);
}
[] BSCP.receive(f_BnsUdInd(tr_RIM, 0)) -> value udi {
@@ -393,7 +393,7 @@
BSCP.send(udr);
}
- [] GLOBAL.receive(tr_GLOBAL) -> value bssgp {
+ [] GLOBAL.receive(tr_GLOBAL_SIG) -> value bssgp {
BSCP.send(f_BnsUdReq(bssgp, 0, 0));
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21628
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: I646db452c89842465902b5167c9c86de51df1241
Gerrit-Change-Number: 21628
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21631 )
Change subject: gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
..
gbproxy: Rename PCU port to PCU_PTP; SGSN port to SGSN_PTP
This way it's more obvious that it refers to the PTP BVC, like we
already use PCU_SIG and SGSN_SIG for the signaling BVCs.
Change-Id: Ie8d327b0c6fae0e7963cc5907ab0bc94e97c67f3
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 31 insertions(+), 31 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 0145c97..a2055ea 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -283,7 +283,7 @@
type component BSSGP_ConnHdlr {
/* array of per-BVC ports on the PCU side */
- port BSSGP_PT PCU[NUM_PCU];
+ port BSSGP_PT PCU_PTP[NUM_PCU];
port BSSGP_PT PCU_SIG[NUM_PCU];
port BSSGP_PROC_PT PCU_PROC[NUM_PCU];
/* component reference to the component to which we're currently
connected */
@@ -292,7 +292,7 @@
var BssgpBvcConfig pcu_bvc_cfg[NUM_PCU];
/* array of per-BVC ports on the SGSN side */
- port BSSGP_PT SGSN[NUM_SGSN];
+ port BSSGP_PT SGSN_PTP[NUM_SGSN];
port BSSGP_PT SGSN_SIG[NUM_SGSN];
port BSSGP_PROC_PT SGSN_PROC[NUM_SGSN];
/* component reference to the component to which we're currently
connected */
@@ -541,15 +541,15 @@
private function f_connect_to_pcu_bvc(integer port_idx, integer nse_idx,
integer bvc_idx)
runs on BSSGP_ConnHdlr {
var BSSGP_BVC_CT bvc_ct := g_pars.pcu[nse_idx].vc_BSSGP_BVC[bvc_idx]
- if (PCU[port_idx].checkstate("Connected")) {
+ if (PCU_PTP[port_idx].checkstate("Connected")) {
/* unregister + disconnect from old BVC */
f_client_unregister(g_pars.imsi, PCU_PROC[port_idx]);
- disconnect(self:PCU[port_idx], pcu_ct[port_idx]:BSSGP_SP);
+ disconnect(self:PCU_PTP[port_idx], pcu_ct[port_idx]:BSSGP_SP);
disconnect(self:PCU_SIG[port_idx],
pcu_ct[port_idx]:BSSGP_SP_SIG);
disconnect(self:PCU_PROC[port_idx],
pcu_ct[port_idx]:BSSGP_PROC);
}
/* connect to new BVC and register us */
- connect(self:PCU[port_idx], bvc_ct:BSSGP_SP);
+ connect(self:PCU_PTP[port_idx], bvc_ct:BSSGP_SP);
connect(self:PCU_SIG[port_idx], bvc_ct:BSSGP_SP_SIG);
connect(self:PCU_PROC[port_idx], bvc_ct:BSSGP_PROC);
f_client_register(g_pars.imsi, g_pars.tlli, PCU_PROC[port_idx]);
@@ -559,15 +559,15 @@
/* Connect the SGSN-side per-BVC ports (SGSN/SGSN_SIG/SGSN_PROC) array slot
'port_idx' to specified per-BVC component */
private function f_connect_to_sgsn_bvc(integer port_idx, BSSGP_BVC_CT bvc_ct)
runs on BSSGP_ConnHdlr {
- if (SGSN[port_idx].checkstate("Connected")) {
+ if (SGSN_PTP[port_idx].checkstate("Connected")) {
/* unregister + disconnect from old BVC */
f_client_unregister(g_pars.imsi, SGSN_PROC[port_idx]);
- disconnect(self:SGSN[port_idx], sgsn_ct[port_idx]:BSSGP_SP);
+ disconnect(self:SGSN_PTP[port_idx], sgsn_ct[port_idx]:BSSGP_SP);
disconnect(self:SGSN_SIG[port_idx],
sgsn_ct[port_idx]:BSSGP_SP_SIG);
disconnect(self:SGSN_PROC[port_idx],
sgsn_ct[port_idx]:BSSGP_PROC);
}
/* connect to new BVC and register us */
- connect(self:SGSN[port_idx], bvc_ct:BSSGP_SP);
+ connect(self:SGSN_PTP[port_idx], bvc_ct:BSSGP_SP);
connect(self:SGSN_SIG[port_idx], bvc_ct:BSSGP_SP_SIG);
connect(self:SGSN_PROC[port_idx], bvc_ct:BSSGP_PROC);
f_client_register(g_pars.imsi, g_pars.tlli, SGSN_PROC[port_idx]);
@@ -630,7 +630,7 @@
if (use_sig) {
PCU_SIG[pcu_idx].send(tx);
} else {
- PCU[pcu_idx].send(tx);
+ PCU_PTP[pcu_idx].send(tx);
}
T.start;
@@ -638,10 +638,10 @@
[use_sig] SGSN_SIG[sgsn_idx].receive(exp_rx) {
setverdict(pass);
}
- [not use_sig] SGSN[sgsn_idx].receive(exp_rx) {
+ [not use_sig] SGSN_PTP[sgsn_idx].receive(exp_rx) {
setverdict(pass);
}
- [] SGSN[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {
+ [] SGSN_PTP[sgsn_idx].receive(PDU_BSSGP:?) -> value rx {
setverdict(fail, "Unexpected BSSGP on SGSN side: ", rx);
mtc.stop;
}
@@ -665,7 +665,7 @@
if (use_sig) {
SGSN_SIG[sgsn_idx].send(tx);
} else {
- SGSN[sgsn_idx].send(tx);
+ SGSN_PTP[sgsn_idx].send(tx);
}
T.start;
@@ -673,10 +673,10 @@
[use_sig] PCU_SIG[pcu_idx].receive(exp_rx) {
Change in osmo-ttcn3-hacks[master]: gbproxy: Introduce global guard timer in test_CT
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632 )
Change subject: gbproxy: Introduce global guard timer in test_CT
..
gbproxy: Introduce global guard timer in test_CT
We did have a guard time in each ConnHdlr, but not in the MTC (test_CT).
However, we do have tests that don't use any ConnHdlr, and those were so
far ran without a guard timeout. Fix that.
Change-Id: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 11 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index a2055ea..7811a01 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -279,6 +279,7 @@
var boolean g_use_echo := false;
var ro_integer g_roi := {};
+ timer g_Tguard;
};
type component BSSGP_ConnHdlr {
@@ -414,7 +415,7 @@
return false;
}
-function f_init() runs on test_CT {
+function f_init(float t_guard := 30.0) runs on test_CT {
var ro_integer bvci_unblocked := {};
var BssgpStatusIndication bsi;
var integer i;
@@ -424,6 +425,9 @@
}
g_initialized := true;
+ g_Tguard.start(t_guard);
+ activate(as_gTguard(g_Tguard));
+
g_sgsn[0].cfg := {
nsei := mp_nsconfig_sgsn[0].nsei,
sgsn_role := true,
@@ -503,6 +507,9 @@
mtc.stop;
}
}
+
+ /* re-start guard timer after all BVCs are up, so it only counts the
actual test case */
+ g_Tguard.start(t_guard);
}
function f_cleanup() runs on test_CT {
@@ -574,8 +581,8 @@
sgsn_ct[port_idx] := bvc_ct;
}
-private altstep as_Tguard() runs on BSSGP_ConnHdlr {
- [] g_Tguard.timeout {
+private altstep as_gTguard(timer Tguard) {
+ [] Tguard.timeout {
setverdict(fail, "Tguard timeout");
mtc.stop;
}
@@ -601,7 +608,7 @@
}
g_Tguard.start(pars.t_guard);
- activate(as_Tguard());
+ activate(as_gTguard(g_Tguard));
/* call the user-supplied test case function */
fn.apply(id);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21632
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: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f
Gerrit-Change-Number: 21632
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: properly shutdown at the end of the test
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633 )
Change subject: gbproxy: properly shutdown at the end of the test
..
gbproxy: properly shutdown at the end of the test
Destroying at least most of the components in an orderly fashion avoids
at least most of the race conditions during test shutdown.
Change-Id: I2aa4ef8a70c1139893c9621f5a6b6007b221c13d
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 20 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 7811a01..9bd0550 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -14,6 +14,7 @@
import from General_Types all;
import from Osmocom_Types all;
+import from Misc_Helpers all;
import from GSM_Types all;
import from Native_Functions all;
import from NS_Types all;
@@ -398,6 +399,15 @@
}
+private function f_destroy_gb(inout GbInstance gb) runs on test_CT {
+ gb.vc_NS.stop;
+ gb.vc_BSSGP.stop;
+
+ for (var integer i := 0; i < lengthof(gb.cfg.bvc); i := i + 1) {
+ gb.vc_BSSGP_BVC[i].stop;
+ }
+}
+
private function f_init_vty() runs on test_CT {
map(self:GBPVTY, system:GBPVTY);
f_vty_set_prompts(GBPVTY);
@@ -513,7 +523,16 @@
}
function f_cleanup() runs on test_CT {
- self.stop;
+ var integer i;
+
+ for (i := 0; i < lengthof(mp_nsconfig_sgsn); i := i+1) {
+ f_destroy_gb(g_sgsn[i]);
+ }
+ for (i := 0; i < lengthof(mp_nsconfig_pcu); i := i+1) {
+ f_destroy_gb(g_pcu[i]);
+ }
+
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, pass);
}
type function void_fn(charstring id) runs on BSSGP_ConnHdlr;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21633
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: I2aa4ef8a70c1139893c9621f5a6b6007b221c13d
Gerrit-Change-Number: 21633
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Test case for BVC flow control procedure
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634 )
Change subject: gbproxy: Test case for BVC flow control procedure
..
gbproxy: Test case for BVC flow control procedure
Related: OS#4891
Change-Id: I6daa5848bd59b42f152de783bfdc602d1f2da861
---
M gbproxy/GBProxy_Tests.ttcn
1 file changed, 71 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 9bd0550..5e81c13 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -726,6 +726,7 @@
port BSSGP_PT G_SGSN[NUM_SGSN];
};
+/* connect the signaling BVC of each NSE to the G_PCU / G_SGSN ports */
private function f_global_init() runs on GlobalTest_CT {
var integer i;
for (i := 0; i < lengthof(g_sgsn); i := i+1) {
@@ -736,6 +737,17 @@
}
}
+/* connect the first PTP BVC of each NSE to the G_PCU / G_SGSN ports */
+private function f_global_init_ptp() runs on GlobalTest_CT {
+ var integer i;
+ for (i := 0; i < lengthof(g_sgsn); i := i+1) {
+ connect(self:G_SGSN[i], g_sgsn[i].vc_BSSGP_BVC[0]:GLOBAL);
+ }
+ for (i := 0; i < lengthof(g_pcu); i := i+1) {
+ connect(self:G_PCU[i], g_pcu[i].vc_BSSGP_BVC[0]:GLOBAL);
+ }
+}
+
/* Send 'tx' on PTP-BVCI from PCU; expect 'rx' on SGSN */
friend function f_global_pcu2sgsn(template (value) PDU_BSSGP tx, template
(present) PDU_BSSGP exp_rx,
integer pcu_idx := 0, integer sgsn_idx := 0)
runs on GlobalTest_CT {
@@ -2324,6 +2336,64 @@
f_cleanup();
}
+/***
+ * FLOW-CONTROL-BVC procedure
+ ***/
+
+private altstep as_g_count_sgsn(integer sgsn_idx, inout ro_integer roi,
+template PDU_BSSGP exp_rx, template (omit)
PDU_BSSGP tx_reply)
+runs on GlobalTest_CT {
+ [] G_SGSN[sgsn_idx].receive(exp_rx) {
+ roi := roi & { sgsn_idx };
+ if (ispresent(tx_reply)) {
+ G_SGSN[sgsn_idx].send(tx_reply);
+ }
+ }
+}
+/* Send FC-BVC from simulated PCU; expect each SGSN to receive it; expect PCU
to receive ACK */
+testcase TC_fc_bvc() runs on GlobalTest_CT
+{
+ f_init();
+ f_global_init_ptp();
+
+ var template (value) PDU_BSSGP pdu_tx := t_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
+ /* we cannot use pdu_tx as there are some subtle differences in the
length field :/ */
+ var template (present) PDU_BSSGP pdu_rx := tr_BVC_FC_BVC(10240, 2000,
1024, 1000, '01'O);
+ var template (omit) PDU_BSSGP ack_tx :=
+
t_BVC_FC_BVC_ACK(pdu_tx.pDU_BSSGP_FLOW_CONTROL_BVC.tag.unstructured_Value);
+
+ /* Send a FC-BVC from BSS to gbproxy, expect an ACK in response */
+ G_PCU[0].send(pdu_tx);
+
+ /* Activate altsteps: One for each SGSN-side PTP BVC port */
+ var ro_default defaults := {};
+ for (var integer i := 0; i < lengthof(g_sgsn); i := i+1) {
+ var default d := activate(as_g_count_sgsn(i, g_roi, pdu_rx,
ack_tx));
+ defaults := defaults & { d };
+ }
+
+ f_sleep(3.0);
+
+ for (var integer i := 0; i < lengthof(defaults); i := i+1) {
+ deactivate(defaults[i]);
+ }
+
+ /* check if BVC-block was received on all expected BVC */
+ for (var integer i := 0; i < lengthof(g_sgsn); i := i+1) {
+ if (not ro_integer_contains(g_roi, i)) {
+ setverdict(fail, "Missing BVC-FLOW-CONTROL on SGSN
index ", i);
+ }
+ }
+
+ /* Expect ACK on PCU side */
+ G_PCU[0].receive(ack_tx);
+
+ setverdict(pass);
+
+ f_cleanup();
+}
+
+
control {
execute( TC_BVC_bringup() );
execute( TC_ul_unitdata() );
@@ -2385,6 +2455,7 @@
execute( TC_flush_ll() );
+ execute( TC_fc_bvc() );
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21634
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: I6daa5848bd59b42f152de783bfdc602d1f2da861
Gerrit-Change-Number: 21634
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Add test for FLOW-CONTROL-MS procedure (TC_fc_ms)
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21635 )
Change subject: gbproxy: Add test for FLOW-CONTROL-MS procedure (TC_fc_ms)
..
gbproxy: Add test for FLOW-CONTROL-MS procedure (TC_fc_ms)
Change-Id: Ie087ee8e8adfb963d21f35c60628214d4297250d
Closes: SYS#5210
---
M gbproxy/GBProxy_Tests.ttcn
M library/Osmocom_Gb_Types.ttcn
2 files changed, 134 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/35/21635/1
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index 5e81c13..655e396 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -2393,6 +2393,37 @@
f_cleanup();
}
+/***
+ * FLOW-CONTROL-MS procedure
+ ***/
+
+private function f_TC_fc_ms(charstring id) runs on BSSGP_ConnHdlr {
+ var BssgpBvci bvci := g_pars.pcu[0].cfg.bvc[0].bvci;
+
+ var template (value) PDU_BSSGP fc_tx := ts_BVC_FC_MS(g_pars.tlli, 100,
200, '12'O);
+ /* we cannot use pdu_tx as there are some subtle differences in the
length field :/ */
+ var template (present) PDU_BSSGP fc_rx := tr_BVC_FC_MS(g_pars.tlli,
100, 200, '12'O);
+ var template (value) PDU_BSSGP ack_tx := ts_BVC_FC_MS_ACK(g_pars.tlli,
'12'O);
+
+ f_pcu2sgsn(fc_tx, fc_rx, use_sig := false);
+ f_sgsn2pcu(ack_tx, ack_tx, use_sig := false);
+
+ setverdict(pass);
+}
+/* Send a FLOW-CONTROL-MS from BSS side and expect it to show up on SGSN (PTP
BVC) */
+testcase TC_fc_ms() runs on test_CT
+{
+ var BSSGP_ConnHdlr vc_conn;
+ f_init();
+
+ vc_conn := f_start_handler(refers(f_TC_fc_ms), testcasename(), g_pcu,
g_sgsn, 21);
+ vc_conn.done;
+ /* TODO: start multiple handlers (UEs) on various cells on same and
other NSEs */
+
+ f_cleanup();
+}
+
+
control {
execute( TC_BVC_bringup() );
@@ -2456,6 +2487,7 @@
execute( TC_flush_ll() );
execute( TC_fc_bvc() );
+ execute( TC_fc_ms() );
}
diff --git a/library/Osmocom_Gb_Types.ttcn b/library/Osmocom_Gb_Types.ttcn
index ba05f7d..c532772 100644
--- a/library/Osmocom_Gb_Types.ttcn
+++ b/library/Osmocom_Gb_Types.ttcn
@@ -1262,6 +1262,108 @@
}
}
+ template (value) PDU_BSSGP ts_BVC_FC_MS(GprsTlli tlli, uint16_t bmax,
uint16_t bucket_leak_rate,
+ OCT1 tag) := {
+ pDU_BSSGP_FLOW_CONTROL_MS := {
+ bssgpPduType := '28'O,
+ tLLI := ts_BSSGP_TLLI(tlli),
+ tag := {
+ iEI := '1E'O,
+ ext := '1'B,
+ lengthIndicator := {
+ length1 := 1
+ },
+ unstructured_Value := tag
+ },
+ mS_Bucket_Size := {
+ iEI := '12'O,
+ ext := '1'B,
+ lengthIndicator := {
+ length1 := 2
+ },
+ bmax := f_oct_or_wc(bmax, 2)
+ },
+ bucket_Leak_Rate := {
+ iEI := '03'O,
+ ext := '1'B,
+ lengthIndicator := {
+ length1 := 2
+ },
+ r_Value := f_oct_or_wc(bucket_leak_rate, 2)
+ },
+ bucket_Full_Ratio := omit,
+ flow_Control_Granularity := omit
+ }
+ }
+ template (present) PDU_BSSGP tr_BVC_FC_MS(template (present) GprsTlli
tlli := ?,
+ template (present) uint16_t
bmax := ?,
+ template (present) uint16_t
bucket_leak_rate := ?,
+ template (present) OCT1 tag
:= ?) := {
+ pDU_BSSGP_FLOW_CONTROL_MS := {
+ bssgpPduType := '28'O,
+ tLLI := ts_BSSGP_TLLI(tlli),
+ tag := {
+ iEI := '1E'O,
+ ext := '1'B,
+ lengthIndicator := {
+ length1 := 1
+ },
+ unstructured_Value := tag
+ },
+ mS_Bucket_Size := {
+ iEI := '12'O,
+ ext := '1'B,
+
Change in docker-playground[master]: centos8-repo-install-test: Upstream requires 'powertools' not 'PowerT...
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/21636 ) Change subject: centos8-repo-install-test: Upstream requires 'powertools' not 'PowerTools' .. centos8-repo-install-test: Upstream requires 'powertools' not 'PowerTools' I just confirmed: With a centos:centos8 base image of a few weeks ago, "PowerTools" works. With the current docker base image for centos:centos8, only lowercase "powertools" works, uppercase is no longer accepted. https://access.redhat.com/discussions/5417621 https://www.reddit.com/r/CentOS/comments/jd7x3d/how_to_enable_powertools_in_centos_stream/ https://git.centos.org/rpms/centos-repos/blob/c8/f/SOURCES/CentOS-Stream-PowerTools.repo#_11 Change-Id: I0db6c82576c5aae94531b7ec2fd98429cab702de Closes: SYS#5244 --- M centos8-repo-install-test/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/21636/1 diff --git a/centos8-repo-install-test/Dockerfile b/centos8-repo-install-test/Dockerfile index 5cbddb0..27d7a59 100644 --- a/centos8-repo-install-test/Dockerfile +++ b/centos8-repo-install-test/Dockerfile @@ -9,4 +9,4 @@ dnf-utils # Make additional development libraries available -RUNyum config-manager --set-enabled PowerTools +RUNyum config-manager --set-enabled powertools -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0db6c82576c5aae94531b7ec2fd98429cab702de Gerrit-Change-Number: 21636 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in docker-playground[master]: centos8-repo-install-test: Upstream requires 'powertools' not 'PowerT...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21636 ) Change subject: centos8-repo-install-test: Upstream requires 'powertools' not 'PowerTools' .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0db6c82576c5aae94531b7ec2fd98429cab702de Gerrit-Change-Number: 21636 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:10:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: centos8-repo-install-test: Upstream requires 'powertools' not 'PowerT...
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21636 ) Change subject: centos8-repo-install-test: Upstream requires 'powertools' not 'PowerTools' .. centos8-repo-install-test: Upstream requires 'powertools' not 'PowerTools' I just confirmed: With a centos:centos8 base image of a few weeks ago, "PowerTools" works. With the current docker base image for centos:centos8, only lowercase "powertools" works, uppercase is no longer accepted. https://access.redhat.com/discussions/5417621 https://www.reddit.com/r/CentOS/comments/jd7x3d/how_to_enable_powertools_in_centos_stream/ https://git.centos.org/rpms/centos-repos/blob/c8/f/SOURCES/CentOS-Stream-PowerTools.repo#_11 Change-Id: I0db6c82576c5aae94531b7ec2fd98429cab702de Closes: SYS#5244 --- M centos8-repo-install-test/Dockerfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/centos8-repo-install-test/Dockerfile b/centos8-repo-install-test/Dockerfile index 5cbddb0..27d7a59 100644 --- a/centos8-repo-install-test/Dockerfile +++ b/centos8-repo-install-test/Dockerfile @@ -9,4 +9,4 @@ dnf-utils # Make additional development libraries available -RUNyum config-manager --set-enabled PowerTools +RUNyum config-manager --set-enabled powertools -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21636 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0db6c82576c5aae94531b7ec2fd98429cab702de Gerrit-Change-Number: 21636 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-bsc[master]: NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21607 ) Change subject: NM FSMs: fix DISABLED_NOTINSTALLED -> DISABLED_NOTINSTALLED .. Patch Set 2: Code-Review+1 Wouldn't it make sense to handle this inside the macro/inline-functions? If you check inside nm_bb_transc_fsm_state_chg(), then you don't have to change the callers, and it would be a genric solution. In fact, we could even consider introducing an osmo_fsm flag that would make such transitions quiet for certain fsm "classes" that set the flag. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21607 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I24a78905bb684f8501dc5ade0605662ec283febc Gerrit-Change-Number: 21607 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:12:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_sns: correct dynamic calculation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21618 ) Change subject: gprs_ns2_sns: correct dynamic calculation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I58d706c6fffb4237b90b37cade4dc00c6aba6ac9 Gerrit-Change-Number: 21618 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:13:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21598 ) Change subject: gb: Add beginnings of a new BSSGP implementation .. Patch Set 6: Code-Review-1 (6 comments) https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c File src/gb/bssgp_bvc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c@4 PS6, Line 4: /* FIXME: This should probably be moved to libosmogb? */ Isn't it? Also license seems to be missing here https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c@238 PS6, Line 238: bfp->features.negotiated = bfp->features.advertised & features_rx; missing bfp->features.received = features_rx; https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c@650 PS6, Line 650: OSMO_ASSERT(bvci >= 2); OSMO_ASSERT(ra_id) as well https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c File src/gb/gprs_bssgp2.c: https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c@3 PS6, Line 3: License? https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c@11 PS6, Line 11: //#include Remove https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c@71 PS6, Line 71: BVC-BLOCK *BLOCK-ACK -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:13:34 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_sns: correct dynamic calculation
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21618 )
Change subject: gprs_ns2_sns: correct dynamic calculation
..
gprs_ns2_sns: correct dynamic calculation
The wrong argument was used to multiply by 4. However it was still
compliant because the SNS code would always supports 16 NSVCs.
Use the correct multiplier.
Fixes: ttnc3 pcu sns test cases
Fixes: 42ad54915285 ("gprs_ns2_sns: dynamic calculate the maximum NS-VCs")
Change-Id: I58d706c6fffb4237b90b37cade4dc00c6aba6ac9
---
M src/gb/gprs_ns2_sns.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c
index d13d920..5d18d04 100644
--- a/src/gb/gprs_ns2_sns.c
+++ b/src/gb/gprs_ns2_sns.c
@@ -1320,7 +1320,7 @@
gss->num_ip4_local = count;
gss->num_max_ip4_remote = 4;
- gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip4_remote * 4, 8);
+ gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip4_remote *
gss->num_ip4_local, 8);
break;
case IPv6:
/* IPv6 */
@@ -1359,7 +1359,7 @@
}
gss->num_ip6_local = count;
gss->num_max_ip6_remote = 4;
- gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip6_remote * 4, 8);
+ gss->num_max_nsvcs = OSMO_MAX(gss->num_max_ip6_remote *
gss->num_ip6_local, 8);
break;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21618
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I58d706c6fffb4237b90b37cade4dc00c6aba6ac9
Gerrit-Change-Number: 21618
Gerrit-PatchSet: 2
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: Add test for FLOW-CONTROL-MS procedure (TC_fc_ms)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21635 ) Change subject: gbproxy: Add test for FLOW-CONTROL-MS procedure (TC_fc_ms) .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21635 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: Ie087ee8e8adfb963d21f35c60628214d4297250d Gerrit-Change-Number: 21635 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:14:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: move allocation of the SNS fsm into create_nse
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21571 ) Change subject: gprs_ns2: move allocation of the SNS fsm into create_nse .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21571 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I64e1f3dcc63d38e65bb486c9ac08d4032b7ad222 Gerrit-Change-Number: 21571 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:16:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: add member name to bind
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21485 ) Change subject: gprs_ns2: add member name to bind .. Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/21485/4/src/gb/gprs_ns2_internal.h File src/gb/gprs_ns2_internal.h: https://gerrit.osmocom.org/c/libosmocore/+/21485/4/src/gb/gprs_ns2_internal.h@185 PS4, Line 185: char *name; const? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8f1d66b7b3b12da12db8b5e6bd08c1beff085b3e Gerrit-Change-Number: 21485 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:17:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: rework gprs_ns2_fr_connect*()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21486 ) Change subject: gprs_ns2: rework gprs_ns2_fr_connect*() .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4e1374b0e979b3293302c5ed46a91a58f3a5a916 Gerrit-Change-Number: 21486 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:17:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp2: Encoding + Decoding functions for BVC and MS flow control
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21610 ) Change subject: bssgp2: Encoding + Decoding functions for BVC and MS flow control .. Patch Set 2: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/21610/2/src/gb/gprs_bssgp2.c File src/gb/gprs_bssgp2.c: https://gerrit.osmocom.org/c/libosmocore/+/21610/2/src/gb/gprs_bssgp2.c@421 PS2, Line 421: bgph->pdu_type = BSSGP_PDUT_FLOW_CONTROL_BVC_ACK; FLOW_CONTROL_MS_ACK -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9c89bb1c03550930c07aad7ff8f67129ee7a6320 Gerrit-Change-Number: 21610 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:20:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21611 ) Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:24:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21572 ) Change subject: gprs_ns2: add gprs_ns2_free_nsvcs() to free all NS-VC of a NSE .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21572 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I909443b540dbf75146297f1d7f94940690be6c0d Gerrit-Change-Number: 21572 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:33:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: gsm_lchan_name: assert on NULL lchan
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/21637 )
Change subject: gsm_lchan_name: assert on NULL lchan
..
gsm_lchan_name: assert on NULL lchan
Steve Langasek submitted some patches
against downstream osmo-bsc 1.3.0 because some possible null derefences
were detected by the compiler on Ubuntu s390x. Code has eveolved since
then and patch doesn't apply directly anymore, since related code
changed (we now use osmo_count in bsc_subscr_get).
The compiled allegedly claimed some null dereference in gsm_lchan_name.
In general code using that function seems to be doing checks for
existing lchan before calling it, or assuming the lchan pointer is not
null, so I couldn't find any major issue.
However, let's add a OSMO_ASSERT to make sure we can easily identify the
issue if an issue ever happens there, since the gsm_lchan_name should
clearly only be called on non null pointers.
Change-Id: If4d12cb1d95ee2a89244bb8f27df839871667387
---
M include/osmocom/bsc/gsm_data.h
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/21637/1
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 6904266..584c0e6 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -937,6 +937,7 @@
static inline char *gsm_lchan_name(const struct gsm_lchan *lchan)
{
+ OSMO_ASSERT(lchan);
return lchan->name;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21637
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If4d12cb1d95ee2a89244bb8f27df839871667387
Gerrit-Change-Number: 21637
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in libosmocore[master]: gprs_ns2_sns: use different binds for the initial connection
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21574 ) Change subject: gprs_ns2_sns: use different binds for the initial connection .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21574 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4a0a0608dac6ad8b5769ada2a14ca23f61eb0bcb Gerrit-Change-Number: 21574 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:34:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gprs_ns2_sns: introduce SNS Size/Config retries
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21575 ) Change subject: gprs_ns2_sns: introduce SNS Size/Config retries .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21575 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00e9023a6e7adc6ad48f4016fcaef189ac8b353e Gerrit-Change-Number: 21575 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 16:34:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: gsm_lchan_name: assert on NULL lchan
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21637 ) Change subject: gsm_lchan_name: assert on NULL lchan .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21637 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If4d12cb1d95ee2a89244bb8f27df839871667387 Gerrit-Change-Number: 21637 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Dec 2020 16:35:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: centos8-build: Use arg OSMOCOM_REPO_MIRROR
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21588 ) Change subject: centos8-build: Use arg OSMOCOM_REPO_MIRROR .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2aefff04792fe4d215fcc52377bec64d9a1db2d Gerrit-Change-Number: 21588 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:36:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: centos8-build: Use arg OSMOCOM_REPO_MIRROR
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21588 ) Change subject: centos8-build: Use arg OSMOCOM_REPO_MIRROR .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21588 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2aefff04792fe4d215fcc52377bec64d9a1db2d Gerrit-Change-Number: 21588 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 16:36:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: centos8-build: Use arg OSMOCOM_REPO_MIRROR
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/21588 )
Change subject: centos8-build: Use arg OSMOCOM_REPO_MIRROR
..
centos8-build: Use arg OSMOCOM_REPO_MIRROR
Change-Id: If2aefff04792fe4d215fcc52377bec64d9a1db2d
---
M centos8-build/Dockerfile
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 9a21bbc..f4aab6c 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -1,6 +1,7 @@
ARGREGISTRY=docker.io
ARGUPSTREAM_DISTRO=centos:centos8
FROM ${REGISTRY}/${UPSTREAM_DISTRO}
+ARGOSMOCOM_REPO_MIRROR="http://download.opensuse.org";
# Let package metadata expire after 60 seconds instead of 48 hours
RUNecho "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
@@ -9,7 +10,7 @@
RUNdnf install -y dnf-utils wget && \
yum config-manager --set-enabled powertools && \
cd /etc/yum.repos.d/ && \
- wget
https://download.opensuse.org/repositories/network:osmocom:nightly/CentOS_8_Stream/network:osmocom:nightly.repo
+ wget
$OSMOCOM_REPO_MIRROR/repositories/network:osmocom:nightly/CentOS_8_Stream/network:osmocom:nightly.repo
RUNdnf install -y \
autoconf \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21588
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If2aefff04792fe4d215fcc52377bec64d9a1db2d
Gerrit-Change-Number: 21588
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 ) Change subject: gbproxy: change osmo-gbproxy.cfg to support ns2 vty2 .. Patch Set 1: Code-Review+1 +1 for when it's ready -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21617 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: I1c3fde35cec7fa0adf2bef7659dfc19bf301ffa9 Gerrit-Change-Number: 21617 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 17:03:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: Fix hdlcnet device names
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/21638 ) Change subject: ttcn3-gbproxy-test-fr: Fix hdlcnet device names .. ttcn3-gbproxy-test-fr: Fix hdlcnet device names In Change-Id I80de01c96185c60fe2de7a8ffa9daed2669658e1 we introduced the wrong hdlcnetX device names. We must use each devoce only once, rather than trying to use hdlcnet1..4 twice. Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/38/21638/1 diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index 1713afb..c31d260 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -41,7 +41,7 @@ nse 2001 nsvci 2 frnet hdlcnet2 dlci 17 nse 2001 nsvci 3 frnet hdlcnet3 dlci 18 nse 2001 nsvci 4 frnet hdlcnet4 dlci 19 - nse 2002 nsvci 5 frnet hdlcnet1 dlci 20 - nse 2002 nsvci 6 frnet hdlcnet2 dlci 21 - nse 2003 nsvci 7 frnet hdlcnet3 dlci 22 - nse 2003 nsvci 8 frnet hdlcnet4 dlci 23 + nse 2002 nsvci 5 frnet hdlcnet5 dlci 20 + nse 2002 nsvci 6 frnet hdlcnet6 dlci 21 + nse 2003 nsvci 7 frnet hdlcnet7 dlci 22 + nse 2003 nsvci 8 frnet hdlcnet8 dlci 23 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f Gerrit-Change-Number: 21638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: Fix hdlcnet device names
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21638 ) Change subject: ttcn3-gbproxy-test-fr: Fix hdlcnet device names .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f Gerrit-Change-Number: 21638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 18:29:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: Fix hdlcnet device names
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21638 ) Change subject: ttcn3-gbproxy-test-fr: Fix hdlcnet device names .. ttcn3-gbproxy-test-fr: Fix hdlcnet device names In Change-Id I80de01c96185c60fe2de7a8ffa9daed2669658e1 we introduced the wrong hdlcnetX device names. We must use each devoce only once, rather than trying to use hdlcnet1..4 twice. Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f --- M ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg index 1713afb..c31d260 100644 --- a/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg +++ b/ttcn3-gbproxy-test-fr/osmo-gbproxy.cfg @@ -41,7 +41,7 @@ nse 2001 nsvci 2 frnet hdlcnet2 dlci 17 nse 2001 nsvci 3 frnet hdlcnet3 dlci 18 nse 2001 nsvci 4 frnet hdlcnet4 dlci 19 - nse 2002 nsvci 5 frnet hdlcnet1 dlci 20 - nse 2002 nsvci 6 frnet hdlcnet2 dlci 21 - nse 2003 nsvci 7 frnet hdlcnet3 dlci 22 - nse 2003 nsvci 8 frnet hdlcnet4 dlci 23 + nse 2002 nsvci 5 frnet hdlcnet5 dlci 20 + nse 2002 nsvci 6 frnet hdlcnet6 dlci 21 + nse 2003 nsvci 7 frnet hdlcnet7 dlci 22 + nse 2003 nsvci 8 frnet hdlcnet8 dlci 23 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f Gerrit-Change-Number: 21638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-gbproxy-test-fr: Fix hdlcnet device names
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21638 ) Change subject: ttcn3-gbproxy-test-fr: Fix hdlcnet device names .. Patch Set 1: Code-Review+1 I remember changing this, though probably in osmo-ttcn3-hacks -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21638 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56f75995fe94b46b0210de2a4f83e384b4e4ca4f Gerrit-Change-Number: 21638 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 18:35:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: sgsn: check for NULL of gprs_subscr_get_or_create()
lynxis lazus has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-sgsn/+/21639 )
Change subject: sgsn: check for NULL of gprs_subscr_get_or_create()
..
sgsn: check for NULL of gprs_subscr_get_or_create()
gprs_subscr_get_or_create() can return NULL if no memory can
be allocated. Detected by the compiler on Ubuntu s390x.
Signed-off-by: Steve Langasek
Signed-off-by: Alexander Couzens
Change-Id: I86b3652d46bdd581fe6cbab16b52395a0daaa082
---
M src/sgsn/gprs_subscriber.c
M src/sgsn/sgsn_vty.c
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/39/21639/1
diff --git a/src/sgsn/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c
index c23b332..943fbc3 100644
--- a/src/sgsn/gprs_subscriber.c
+++ b/src/sgsn/gprs_subscriber.c
@@ -870,6 +870,8 @@
if (!subscr) {
subscr = gprs_subscr_get_or_create(mmctx->imsi);
+ if (!subscr)
+ return NULL;
subscr->flags |= GPRS_SUBSCRIBER_FIRST_CONTACT;
subscr->flags &= ~GPRS_SUBSCRIBER_ENABLE_PURGE;
}
@@ -893,6 +895,8 @@
LOGMMCTXP(LOGL_DEBUG, mmctx, "Requesting subscriber data update\n");
subscr = gprs_subscr_get_or_create_by_mmctx(mmctx);
+ if (!subscr)
+ return -ENOMEM;
subscr->flags |= GPRS_SUBSCRIBER_UPDATE_LOCATION_PENDING;
@@ -918,6 +922,8 @@
LOGMMCTXP(LOGL_DEBUG, mmctx, "Requesting subscriber authentication
info\n");
subscr = gprs_subscr_get_or_create_by_mmctx(mmctx);
+ if (!subscr)
+ return -ENOMEM;
subscr->flags |= GPRS_SUBSCRIBER_UPDATE_AUTH_INFO_PENDING;
diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index 33a652c..56aa0c9 100644
--- a/src/sgsn/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
@@ -1020,6 +1020,10 @@
}
subscr = gprs_subscr_get_or_create(imsi);
+ if (subscr) {
+ vty_out(vty, "Can not create subscriber. Out of memory.%s",
imsi);
+ return CMD_WARNING;
+ }
subscr->keep_in_ram = 1;
gprs_subscr_put(subscr);
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21639
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I86b3652d46bdd581fe6cbab16b52395a0daaa082
Gerrit-Change-Number: 21639
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus
Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: sgsn: Use the new NS2 api
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/20397 ) Change subject: sgsn: Use the new NS2 api .. Patch Set 6: > Patch Set 5: Code-Review-1 > > I would like to add FR/GRE support before merging. FR/GRE is still not supported, but there is code in libosmocore to support it. However without testing I don't see much point in waiting longer for this. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/20397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I92a3bcaf166b091a22d74c7c1586964d33d7cc9d Gerrit-Change-Number: 20397 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 09 Dec 2020 21:22:02 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: make raise/lower step limitation configurable
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21568 ) Change subject: power_control: make raise/lower step limitation configurable .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic37742f46f533865043b3dbcf16ea702e1746f98 Gerrit-Change-Number: 21568 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 21:39:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: power_control: make raise/lower step limitation configurable
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21568 )
Change subject: power_control: make raise/lower step limitation configurable
..
power_control: make raise/lower step limitation configurable
Change-Id: Ic37742f46f533865043b3dbcf16ea702e1746f98
Related: SYS#4918
---
M include/osmo-bts/bts.h
M include/osmo-bts/power_control.h
M src/common/bts.c
M src/common/power_control.c
M tests/power/bs_power_loop_test.c
M tests/power/bs_power_loop_test.err
M tests/power/bs_power_loop_test.ok
M tests/power/ms_power_loop_test.c
8 files changed, 64 insertions(+), 36 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h
index 48f404c..2edc20e 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -107,6 +107,10 @@
int target_dbm;
/* Tolerated deviation from target */
int hysteresis_db;
+ /* How many dB do we raise power at maximum */
+ int raise_step_max_db;
+ /* How many dB do we lower power at maximum */
+ int lower_step_max_db;
/* RxLev filtering algorithm */
enum bts_pf_algo pf_algo;
/* (Optional) filtering parameters */
diff --git a/include/osmo-bts/power_control.h b/include/osmo-bts/power_control.h
index f2e14cf..ab107b8 100644
--- a/include/osmo-bts/power_control.h
+++ b/include/osmo-bts/power_control.h
@@ -3,6 +3,10 @@
#include
#include
+/* How many dB do we raise/lower power as maximum */
+#define PWR_RAISE_MAX_DB 4
+#define PWR_LOWER_MAX_DB 8
+
int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan,
const uint8_t ms_power_lvl,
const int8_t ul_rssi_dbm);
diff --git a/src/common/bts.c b/src/common/bts.c
index e021864..ba24497 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -53,6 +53,7 @@
#include
#include
#include
+#include
#define MIN_QUAL_RACH 50 /* minimum link quality (in centiBels) for Access
Bursts */
#define MIN_QUAL_NORM -5 /* minimum link quality (in centiBels) for Normal
Bursts */
@@ -334,6 +335,8 @@
(struct bts_power_ctrl_params) {
.target_dbm = -75,
.hysteresis_db = 3, /* -78 .. -72 dBm */
+ .raise_step_max_db = PWR_RAISE_MAX_DB,
+ .lower_step_max_db = PWR_LOWER_MAX_DB,
.pf_algo = BTS_PF_ALGO_EWMA,
.pf = {
.ewma = {
diff --git a/src/common/power_control.c b/src/common/power_control.c
index d458a92..a616f18 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -33,10 +33,6 @@
#include
#include
-/* how many dB do we raise/lower as maximum (1 ms power level = 2 dB) */
-#define PWR_RAISE_MAX_DB 4
-#define PWR_LOWER_MAX_DB 8
-
/* We don't want to deal with floating point, so we scale up */
#define EWMA_SCALE_FACTOR 100
@@ -122,10 +118,10 @@
/* Don't ever change more than PWR_{LOWER,RAISE}_MAX_DBM during one loop
* iteration, i.e. reduce the speed at which the MS transmit power can
* change. A higher value means a lower level (and vice versa) */
- if (delta > PWR_RAISE_MAX_DB)
- delta = PWR_RAISE_MAX_DB;
- else if (delta < -PWR_LOWER_MAX_DB)
- delta = -PWR_LOWER_MAX_DB;
+ if (delta > params->raise_step_max_db)
+ delta = params->raise_step_max_db;
+ else if (delta < -params->lower_step_max_db)
+ delta = -params->lower_step_max_db;
return delta;
}
diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c
index 2f60cc0..fd93183 100644
--- a/tests/power/bs_power_loop_test.c
+++ b/tests/power/bs_power_loop_test.c
@@ -31,6 +31,15 @@
#define PWR_TEST_RXLEV_TARGET 30
+#define PWR_TEST_CFG_RXLEV_TARGET \
+ .target_dbm = -110 + PWR_TEST_RXLEV_TARGET
+
+/* NOTE: raise/lower values are intentionally swapped here,
+ * as it makes more sense in the context of BS Power Control. */
+#define PWR_TEST_CFG_RAISE_LOWER_MAX \
+ .raise_step_max_db = PWR_LOWER_MAX_DB, \
+ .lower_step_max_db = PWR_RAISE_MAX_DB
+
#define DL_MEAS_FULL(rxqual, rxlev) \
.rxqual_full = rxqual, \
.rxlev_full = rxlev
@@ -95,10 +104,15 @@
g_trx = gsm_bts_trx_alloc(g_bts);
OSMO_ASSERT(g_trx != NULL);
- g_bts->dl_power_ctrl.target_dbm = rxlev2dbm(PWR_TEST_RXLEV_TARGET);
g_bts->band = GSM_BAND_900;
g_bts->c0 = g_trx;
+ g_bts->dl_power_ctrl = g_bts->ul_power_ctrl = \
+ (struct bts_power_ctrl_params) {
+ PWR_TEST_CFG_RXLEV_TARGET,
+ PWR_TEST_CFG_RAISE_LOWER_MAX,
+ };
+
printf("\nStarting test case '%s'\n", name);
}
@@ -326,7 +340,8 @@
/* Enable hysteresis */
{ .type = PWR_TEST_ST_SET_PARAMS,
.params = {
-
Change in osmo-bts[master]: vty: resurrect per-lchan BS/MS Power Control information
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21481 )
Change subject: vty: resurrect per-lchan BS/MS Power Control information
..
vty: resurrect per-lchan BS/MS Power Control information
Change-Id: I48812383ef0a125e83b9b3761f3f15873d3b37b4
Related: SYS#4918
---
M src/common/vty.c
1 file changed, 47 insertions(+), 7 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/common/vty.c b/src/common/vty.c
index bbb0ba1..ada871a 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1307,6 +1307,49 @@
}
}
+static void lchan_bs_power_ctrl_state_dump(struct vty *vty, const char *prefix,
+ const struct gsm_lchan *lchan)
+{
+ const struct lchan_power_ctrl_state *st = &lchan->bs_power_ctrl;
+ const struct gsm_bts_trx *trx = lchan->ts->trx;
+
+ vty_out(vty, "%sBS (Downlink) Power Control (%s):%s",
+ prefix, st->fixed ? "fixed" : "autonomous",
+ VTY_NEWLINE);
+
+ vty_out(vty, "%s Channel reduction: %u dB", prefix, st->current);
+ if (!st->fixed)
+ vty_out(vty, " (max %u dB)", st->max);
+ vty_out(vty, "%s", VTY_NEWLINE);
+
+ vty_out(vty, "%s TRX reduction: %u dB%s",
+ prefix, trx->max_power_red, VTY_NEWLINE);
+
+ int actual = trx->nominal_power - (trx->max_power_red + st->current);
+ vty_out(vty, "%s Actual / Nominal power: %d dBm / %d dBm%s",
+ prefix, actual, trx->nominal_power, VTY_NEWLINE);
+}
+
+static void lchan_ms_power_ctrl_state_dump(struct vty *vty, const char *prefix,
+ const struct gsm_lchan *lchan)
+{
+ const struct lchan_power_ctrl_state *st = &lchan->ms_power_ctrl;
+ const struct gsm_bts_trx *trx = lchan->ts->trx;
+
+ vty_out(vty, "%sMS (Uplink) Power Control (%s):%s",
+ prefix, st->fixed ? "fixed" : "autonomous",
+ VTY_NEWLINE);
+
+ int current_dbm = ms_pwr_dbm(trx->bts->band, st->current);
+ int max_dbm = ms_pwr_dbm(trx->bts->band, st->max);
+
+ vty_out(vty, "%s Current power level: %u, -%d dBm",
+ prefix, st->current, current_dbm);
+ if (!st->fixed)
+ vty_out(vty, " (max %u, -%d dBm)", st->max, max_dbm);
+ vty_out(vty, "%s", VTY_NEWLINE);
+}
+
static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan)
{
struct in_addr ia;
@@ -1335,13 +1378,6 @@
lchan->state == LCHAN_S_BROKEN ? " Error reason: " : "",
lchan->state == LCHAN_S_BROKEN ? lchan->broken_reason : "",
VTY_NEWLINE);
-#if 0
- /* TODO: print more info about MS/BS Power Control */
- vty_out(vty, " BS Power: %d dBm, MS Power: %u dBm%s",
- lchan->ts->trx->nominal_power - (lchan->ts->trx->max_power_red
+ lchan->bs_power_red),
- ms_pwr_dbm(lchan->ts->trx->bts->band, lchan->ms_power_ctrl.max),
- VTY_NEWLINE);
-#endif
vty_out(vty, " Channel Mode / Codec: %s%s",
gsm48_chan_mode_name(lchan->tch_mode),
VTY_NEWLINE);
@@ -1383,6 +1419,10 @@
if (lchan->loopback)
vty_out(vty, " RTP/PDCH Loopback Enabled%s", VTY_NEWLINE);
vty_out(vty, " Radio Link Failure Counter 'S': %d%s", lchan->s,
VTY_NEWLINE);
+
+ /* BS/MS Power Control state */
+ lchan_bs_power_ctrl_state_dump(vty, " ", lchan);
+ lchan_ms_power_ctrl_state_dump(vty, " ", lchan);
}
static void lchan_dump_short_vty(struct vty *vty, const struct gsm_lchan
*lchan)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21481
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I48812383ef0a125e83b9b3761f3f15873d3b37b4
Gerrit-Change-Number: 21481
Gerrit-PatchSet: 6
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-sgsn[master]: sgsn: check for NULL of gprs_subscr_get_or_create()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/21639 ) Change subject: sgsn: check for NULL of gprs_subscr_get_or_create() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/21639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I86b3652d46bdd581fe6cbab16b52395a0daaa082 Gerrit-Change-Number: 21639 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 09 Dec 2020 21:40:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21597 )
Change subject: logging: Introduce DLBSSGP logging constant
..
Patch Set 4:
> Patch Set 4:
>
> (1 comment)
>
> DBSSGP in src/gb/common_vty.{c,h} is unused now, we can remove it.
If you do that, all extrenal code using it will break. That would be osmo-sgsn,
osmo-gbproxy and osmo-pcu. We need to convert those over to DLBSSGP first, and
then we can remove them. I'll add ac omment
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93
Gerrit-Change-Number: 21597
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Comment-Date: Wed, 09 Dec 2020 21:42:48 +
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/21597 )
Change subject: logging: Introduce DLBSSGP logging constant
..
Patch Set 4:
(1 comment)
> > DBSSGP in src/gb/common_vty.{c,h} is unused now, we can remove it.
>
> If you do that, all extrenal code using it will break. That would be
> osmo-sgsn, osmo-gbproxy and osmo-pcu. We need to convert those over to
> DLBSSGP first, and then we can remove them. I'll add ac omment
actually , you are right. The applications define those integer symbols
themselves and then hand them into the library via this API. So it can be
removed.
https://gerrit.osmocom.org/c/libosmocore/+/21597/4/src/gb/gprs_bssgp.c
File src/gb/gprs_bssgp.c:
https://gerrit.osmocom.org/c/libosmocore/+/21597/4/src/gb/gprs_bssgp.c@1356
PS4, Line 1356: LOGP(DLGLOBAL, LOGL_ERROR, "BSSGP has moved from DGPRS
to DLGPRS, please update your code\n");
> We should also mark it as OSMO_DEPRECATED() in gprs/gprs_bssgp. […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93
Gerrit-Change-Number: 21597
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Comment-Date: Wed, 09 Dec 2020 21:45:55 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: daniel
Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
Hello Jenkins Builder, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21597 to look at the new patch set (#5). Change subject: logging: Introduce DLBSSGP logging constant .. logging: Introduce DLBSSGP logging constant Historically, BSSGP uses a non-constant, user-configurable integer varieable for the logging sub-system. Let's replace this with a statically-allocated library logging constant. This is required if we want to use the subsystem number in e.g. static initialized for osmo_fsm.log_subsys. Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93 --- M include/osmocom/core/logging.h M include/osmocom/gprs/gprs_bssgp.h M src/gb/common_vty.c M src/gb/common_vty.h M src/gb/gprs_bssgp.c M src/gb/gprs_bssgp_bss.c M src/gb/gprs_bssgp_util.c M src/gb/gprs_bssgp_vty.c M src/logging.c M tests/logging/logging_vty_test.vty 10 files changed, 75 insertions(+), 73 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/97/21597/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93 Gerrit-Change-Number: 21597 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
Hello Jenkins Builder, pespin, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21611 to look at the new patch set (#5). Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. bssgp_bvc_fsm: Add basic BVC flow control rx/tx support The FSM doesn't actually implement the flow control logic, it only decodes / dispatches and encodes messages. Related: OS#4891 Change-Id: Ie59be6761177c43456898be9148727f15861a622 --- M include/osmocom/gprs/bssgp_bvc_fsm.h M src/gb/bssgp_bvc_fsm.c M src/gb/gprs_bssgp2.c 3 files changed, 44 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/11/21611/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
Hello Jenkins Builder, pespin, daniel, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/21598 to look at the new patch set (#7). Change subject: gb: Add beginnings of a new BSSGP implementation .. gb: Add beginnings of a new BSSGP implementation Similar to ns2 superseding ns, we now also intoduce a next generation of BSSGP related code to libosmogb. However, this is not aiming to be a full implementation yet, but simply those parts that we currently need from the revamped osmo-gbproxy. The gprs_bssgp2.[ch] differs in two ways from the old code: * it separates message encoding from message transmission * it supports more recent specs / IEs bssgp_bvc_fsm.c is a genric implementation of the BSSGP BVC RESET/BLOCK/UNBLOCK logic with support for both PTP and signaling, both on the SGSN side and the BSS side. Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a --- M include/Makefile.am A include/osmocom/gprs/bssgp_bvc_fsm.h A include/osmocom/gprs/gprs_bssgp2.h M src/gb/Makefile.am A src/gb/bssgp_bvc_fsm.c A src/gb/gprs_bssgp2.c M src/gb/libosmogb.map 7 files changed, 1,139 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/98/21598/7 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21598 ) Change subject: gb: Add beginnings of a new BSSGP implementation .. Patch Set 7: (6 comments) https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c File src/gb/bssgp_bvc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c@4 PS6, Line 4: /* FIXME: This should probably be moved to libosmogb? */ > Isn't it? […] Done https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c@238 PS6, Line 238: bfp->features.negotiated = bfp->features.advertised & features_rx; > missing bfp->features. […] nice cach. You can see that features.received was not present at first and only added very late in the development. I've removed the lcoal variable in my next version and simply use the bfp->features.received directly. https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/bssgp_bvc_fsm.c@650 PS6, Line 650: OSMO_ASSERT(bvci >= 2); > OSMO_ASSERT(ra_id) as well Done https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c File src/gb/gprs_bssgp2.c: https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c@3 PS6, Line 3: > License? Done https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c@11 PS6, Line 11: //#include > Remove Done https://gerrit.osmocom.org/c/libosmocore/+/21598/6/src/gb/gprs_bssgp2.c@71 PS6, Line 71: BVC-BLOCK > *BLOCK-ACK Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 21:59:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: logging: Introduce DLBSSGP logging constant
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21597 ) Change subject: logging: Introduce DLBSSGP logging constant .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I506190aae9217c0956e4b5764d1a0c0772268e93 Gerrit-Change-Number: 21597 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 09 Dec 2020 21:59:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gb: Add beginnings of a new BSSGP implementation
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21598 ) Change subject: gb: Add beginnings of a new BSSGP implementation .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icbe8e4f03b68fd73b8eae95f6f6cccd4fa9af95a Gerrit-Change-Number: 21598 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 21:59:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp2: Encoding + Decoding functions for BVC and MS flow control
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21610 ) Change subject: bssgp2: Encoding + Decoding functions for BVC and MS flow control .. Patch Set 3: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/21610/2/src/gb/gprs_bssgp2.c File src/gb/gprs_bssgp2.c: https://gerrit.osmocom.org/c/libosmocore/+/21610/2/src/gb/gprs_bssgp2.c@421 PS2, Line 421: bgph->pdu_type = BSSGP_PDUT_FLOW_CONTROL_BVC_ACK; > FLOW_CONTROL_MS_ACK Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9c89bb1c03550930c07aad7ff8f67129ee7a6320 Gerrit-Change-Number: 21610 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 22:00:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: daniel Gerrit-MessageType: comment
Change in libosmocore[master]: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/21611 ) Change subject: bssgp_bvc_fsm: Add basic BVC flow control rx/tx support .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/21611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie59be6761177c43456898be9148727f15861a622 Gerrit-Change-Number: 21611 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 09 Dec 2020 22:00:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-bts-test: fix: sleep 2 seconds before respawning the IUT
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/21640 )
Change subject: ttcn3-bts-test: fix: sleep 2 seconds before respawning the IUT
..
ttcn3-bts-test: fix: sleep 2 seconds before respawning the IUT
There has been a lot of changes merged to both osmo-{bsc,bts}, so
now the later seems to be respawning faster then before. Because
of that, osmo-bts-trx is now reaching the limit of 500 runs on
Jenkins right in the middle of ttcn3-bts-test execution:
respawn.sh: exiting after 500 runs
causing the remaining test cases to fail due to:
"BTS_Tests.ttcn:253 : Timeout waiting for RSL bring up"
Most likely, the IUT respawns several times in the windows between
the test cases, i.e. after TITAN finishes one test case and before
it starts another. Let's instruct respawn.sh to sleep 2 seconds
before starting the process again.
Change-Id: I09e5a8e7c4d28424cd0d004a8bae3cf0ade2d838
---
M ttcn3-bts-test/jenkins.sh
1 file changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/40/21640/1
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index be6a71c..957adf6 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -24,7 +24,6 @@
start_bts() {
local variant
variant="$1"
- sleep_time_respawn="$2"
echo Starting container with BTS
if [ -z "$variant" ]; then
echo ERROR: You have to specify a BTS variant
@@ -35,7 +34,7 @@
--ulimit core=-1 \
-v $VOL_BASE_DIR/bts:/data \
-v $VOL_BASE_DIR/unix:/data/unix \
- -e "SLEEP_BEFORE_RESPAWN=$sleep_time_respawn" \
+ -e "SLEEP_BEFORE_RESPAWN=2" \
--name ${BUILD_TAG}-bts -d \
$DOCKER_ARGS \
$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
@@ -142,7 +141,7 @@
# 1) classic test suite with BSC for OML and trxcon+fake_trx
start_bsc
-start_bts trx 0
+start_bts trx
start_fake_trx
start_trxcon
start_testsuite generic
@@ -154,7 +153,7 @@
docker container kill ${BUILD_TAG}-fake_trx
docker container kill ${BUILD_TAG}-bts
cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/
-start_bts virtual 0
+start_bts virtual
start_virtphy
# ... and execute the testsuite again with different cfg
#start_testsuite virtphy
@@ -166,7 +165,7 @@
docker container kill ${BUILD_TAG}-bts
cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/
-start_bts trx 1
+start_bts trx
start_fake_trx
start_trxcon
# ... and execute the testsuite again with different cfg
@@ -178,7 +177,7 @@
# restart the BSC/BTS and run the testsuite again
docker container kill ${BUILD_TAG}-bts
start_bsc
-start_bts trx 0
+start_bts trx
start_testsuite hopping
# append ':hopping' to the classnames,
# e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'"
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21640
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I09e5a8e7c4d28424cd0d004a8bae3cf0ade2d838
Gerrit-Change-Number: 21640
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in docker-playground[master]: debian-stretch-titan: use dpkg to install libfftranscode
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/21641 )
Change subject: debian-stretch-titan: use dpkg to install libfftranscode
..
debian-stretch-titan: use dpkg to install libfftranscode
For some magic reason, apt segfaults while installing the DEBs:
$ apt install ./libfftranscode0_0.3_${DPKG_ARCH}.deb \
./libfftranscode-dev_0.3_${DPKG_ARCH}.deb
WARNING: apt does not have a stable CLI interface. Use with caution in
scripts.
Reading package lists...
Segmentation fault (core dumped)
so it kind of confirms the warning about its stability ;)
Change-Id: I7f3288161577b055145afe89de7dff50853760f5
---
M debian-stretch-titan/Dockerfile
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/41/21641/1
diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile
index 4b288d0..0a6d73c 100644
--- a/debian-stretch-titan/Dockerfile
+++ b/debian-stretch-titan/Dockerfile
@@ -44,5 +44,5 @@
RUNDPKG_ARCH="$(dpkg --print-architecture)" && export $DPKG_ARCH && \
wget
https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.3_${DPKG_ARCH}.deb
&& \
wget
https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.3_${DPKG_ARCH}.deb
&& \
- apt install ./libfftranscode0_0.3_${DPKG_ARCH}.deb
./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \
+ dpkg -i ./libfftranscode0_0.3_${DPKG_ARCH}.deb
./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \
rm libfftranscode*.deb
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21641
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I7f3288161577b055145afe89de7dff50853760f5
Gerrit-Change-Number: 21641
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
