fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30893 )
Change subject: fix BSC_Tests_LCLS: do not use t_def_TestHdlrPars directly
......................................................................
fix BSC_Tests_LCLS: do not use t_def_TestHdlrPars directly
As stated in the comment near the t_def_TestHdlrPars definition,
valueof() shall not be used for getting a value of this template.
The f_gen_test_hdlr_pars() function should be used instead.
All LCLS testcases violated this, and started to fail since
recently after patch [1] has been merged:
"MSC_ConnectionHandler.ttcn:820 : Either imsi or imei must be set!"
BSC_Tests_LCLS.ttcn:743 BSC_Tests_LCLS control part
BSC_Tests_LCLS.ttcn:262 TC_lcls_gcr_only testcase
Use f_gen_test_hdlr_pars() as suggested.
Change-Id: I69ab8699b0be80b12e2df590d9170a743a00d035
Fixes: [1] b27653c6b60d49de5e67dfffb876d1a8b7091ff2
---
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_LCLS.ttcn
2 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Verified
pespin: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index c0a64a9..a9d7c9d 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -22,6 +22,7 @@
friend module BSC_Tests_VAMOS;
friend module BSC_Tests_CBSP;
+friend module BSC_Tests_LCLS;
import from Misc_Helpers all;
import from General_Types all;
diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn
index 0e7692c..6686a34 100644
--- a/bsc/BSC_Tests_LCLS.ttcn
+++ b/bsc/BSC_Tests_LCLS.ttcn
@@ -249,7 +249,7 @@
/* Send an ASSIGNMENT REQ with LCLS GCR only, without LCLS CFG or CSC */
testcase TC_lcls_gcr_only() runs on lcls_test_CT {
- var TestHdlrParams pars := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars := f_gen_test_hdlr_pars();
var MSC_ConnHdlr vc_conn;
f_lcls_init();
@@ -335,7 +335,7 @@
}
private function f_tc_lcls_gcr_bway_connect(boolean hr, boolean bts_mode := false) runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
@@ -393,7 +393,7 @@
/* Unless explicitly enabled, osmo-bsc will avoid LCLSs when the codecs or rates
* of both legs are different */
testcase TC_lcls_gcr_bway_codec_mismatch() runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd;
@@ -428,7 +428,7 @@
/* Send an ASSIGNMENT REQ with LCLS CFG+CSC enabling LCLS but GCR doesn't match! */
testcase TC_lcls_gcr_nomatch_bway_connect() runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd;
@@ -462,7 +462,7 @@
/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */
testcase TC_lcls_gcr_bway_dont_connect() runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
@@ -487,7 +487,7 @@
/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */
testcase TC_lcls_gcr_unsuppported_cfg() runs on lcls_test_CT {
- var TestHdlrParams pars := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars := f_gen_test_hdlr_pars();
var MSC_ConnHdlr vc_conn;
f_lcls_init();
@@ -508,7 +508,7 @@
/* Send an ASSIGNMENT REQ with LCLS GCR+CFG+CSC; expect no connect */
testcase TC_lcls_gcr_unsuppported_csc() runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
@@ -568,7 +568,7 @@
/* Send an ASSIGNMENT REQ with "do not connect" and enable later using LCLS CTRL */
testcase TC_lcls_gcr_bway_dont_connect_csc() runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd;
@@ -620,7 +620,7 @@
}
private function f_lcls_connect_break(boolean bts_mode := false) runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
@@ -676,7 +676,7 @@
/* Establish LCLS "connect" followed by a SCCP-level release of one leg */
testcase TC_lcls_connect_clear() runs on lcls_test_CT {
- var TestHdlrParams pars_a := valueof(t_def_TestHdlrPars);
+ var TestHdlrParams pars_a := f_gen_test_hdlr_pars();
var TestHdlrParams pars_b;
var MSC_ConnHdlr vc_conn;
var MgcpCommand mgcp_cmd;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30893
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: I69ab8699b0be80b12e2df590d9170a743a00d035
Gerrit-Change-Number: 30893
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30911 )
Change subject: radio interface: fix init
......................................................................
radio interface: fix init
5561f1129d0bed0ebd2a49fde07e8ee91e487fd6 introduced some changes,
but while RadioInterface lost its call to close() that was previously
used to improperly reset the buffers upon init() that call was
accidentally not removed for RadioInterfaceMulti and
RadioInterfaceResamp, so those reset previously initialized values to 0
during init(), which break osmo-trx for weird setups.
Change-Id: I74fc1586f8ae0832f4093ba8a44a1c70c78ec3d8
---
M Transceiver52M/radioInterfaceMulti.cpp
M Transceiver52M/radioInterfaceResamp.cpp
2 files changed, 0 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve; Verified
Hoernchen: Looks good to me, approved
diff --git a/Transceiver52M/radioInterfaceMulti.cpp b/Transceiver52M/radioInterfaceMulti.cpp
index eeb0c97..a7195b4 100644
--- a/Transceiver52M/radioInterfaceMulti.cpp
+++ b/Transceiver52M/radioInterfaceMulti.cpp
@@ -153,8 +153,6 @@
return false;
}
- close();
-
convertSendBuffer.resize(1);
convertRecvBuffer.resize(1);
diff --git a/Transceiver52M/radioInterfaceResamp.cpp b/Transceiver52M/radioInterfaceResamp.cpp
index 37167ae..869acd0 100644
--- a/Transceiver52M/radioInterfaceResamp.cpp
+++ b/Transceiver52M/radioInterfaceResamp.cpp
@@ -98,8 +98,6 @@
{
float cutoff = 1.0f;
- close();
-
switch (type) {
case RadioDevice::RESAMP_64M:
resamp_inrate = RESAMP_64M_INRATE;
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30911
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I74fc1586f8ae0832f4093ba8a44a1c70c78ec3d8
Gerrit-Change-Number: 30911
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: lynxis lazus.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30913 )
Change subject: ansible: install-poky-sdk: ensure it's not installed twice
......................................................................
Patch Set 3:
(1 comment)
Patchset:
PS3:
You could create a file once the entire task is run by adding a new task, and then check if the extra file is created in order to skip the installation.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30913
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8ff8e72a5974378327d4692341b0a371c667b741
Gerrit-Change-Number: 30913
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Tue, 10 Jan 2023 09:36:33 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment