laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28223 )
Change subject: BSC_Tests: fix TC_lost_sdcch_during_assignment (SCCPlite)
......................................................................
BSC_Tests: fix TC_lost_sdcch_during_assignment (SCCPlite)
When running ttcn3-bsc-test against osmo-bsc in SCCPlite mode,
TC_lost_sdcch_during_assignment fails with the following output:
Local verdict of MTC: fail reason: "Timeout of T_guard"
Final verdict of PTC: fail reason: "Unexpected DLCX received"
One key problem is that in f_TC_lost_sdcch_during_assignment() we
expect to receive a DLCX message on port MGCP, but somehow it gets
caught by the as_Media_mgw earlier than we attempt to receive it.
* Fix this race condition by activating the as_Media_mgw with
fail_on_dlcx := false, so that it does not catch DLCX messages.
Another problem is that for SCCPlite we're running the MGCP_Emulation
component with multi_conn_mode=true, so that all MGCP messages are
arriving at port MGCP_MULTI (not MGCP) wrapped into MGCP_RecvFrom.
* Expect the DLCX message on either of the two ports depending
on the value of g_pars.aoip (AoIP or SCCPlite mode).
This change makes BSC_Tests.TC_lost_sdcch_during_assignment pass.
Change-Id: If4807d3d7d196682f7f22732ad47bcbb72858ed3
---
M bsc/BSC_Tests.ttcn
1 file changed, 13 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 2e804e1..d9b178f 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -11283,7 +11283,7 @@
/* we should now have a COMPL_L3 at the MSC */
f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit});
- activate(as_Media_mgw());
+ activate(as_Media_mgw(fail_on_dlcx := false));
var RslChannelNr chan_nr := { u := { ch0 := RSL_CHAN_NR_Bm_ACCH }, tn := 1 };
f_rslem_register(0, chan_nr);
@@ -11312,9 +11312,18 @@
BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ);
var MgcpCommand mgcp;
- MGCP.receive(tr_DLCX()) -> value mgcp {
- MGCP.send(ts_DLCX_ACK2(mgcp.line.trans_id));
- };
+ var MGCP_RecvFrom mrf;
+ var template MgcpMessage msg_dlcx := { command := tr_DLCX };
+ alt {
+ [g_pars.aoip] MGCP.receive(tr_DLCX) -> value mgcp {
+ MGCP.send(ts_DLCX_ACK2(mgcp.line.trans_id));
+ }
+ [not g_pars.aoip] MGCP_MULTI.receive(tr_MGCP_RecvFrom_any(msg_dlcx)) -> value mrf {
+ MGCP_MULTI.send(t_MGCP_SendToMrf(mrf, MgcpMessage:{
+ response := ts_DLCX_ACK2(mrf.msg.command.line.trans_id)
+ }));
+ }
+ }
f_sleep(0.5);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28223
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: If4807d3d7d196682f7f22732ad47bcbb72858ed3
Gerrit-Change-Number: 28223
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels, pespin, fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27631 )
Change subject: libosmo-pfcp: implement PFCP header and msg handling
......................................................................
Patch Set 7: Code-Review+1
(6 comments)
File include/osmocom/pfcp/pfcp_msg.h:
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/e36f6363_18669def
PS3, Line 44: #define OSMO_LOG_PFCP_MSG_SRC(M, LEVEL, file, line, FMT, ARGS...) do { \
> you are aware of the "ARGS... […]
Its also the first time we are reaching this kind of complexit in a log macro...
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/135436b4_1ac02fa6
PS3, Line 110: struct osmo_fsm_inst *peer_fi;
> if it is only related to a peer (Association Setup / Update, etc), session == NULL. […]
Done
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/64b42d4f_38b04b65
PS3, Line 123: #define OSMO_PFCP_MSG_FOR_IES(IES_P) ((struct osmo_pfcp_msg *)((char *)IES_P - offsetof(struct osmo_pfcp_msg, ies)))
> there is the osmo_pfcp_msg->ies member. […]
Done
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/98ac6e6d_c9041b12
PS3, Line 149: #define OSMO_PFCP_MSG_MEMB(M, OFS) ((OFS) <= 0 ? NULL : (void *)((uint8_t *)(M) + OFS))
> for example, some messages don't have a Cause IE. […]
Done
File src/libosmo-pfcp/pfcp_msg.c:
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/ab472590_93aa3bd5
PS3, Line 65: struct osmo_pfcp_header_common {
> oh yes, forgot to run that script...
Done
https://gerrit.osmocom.org/c/osmo-upf/+/27631/comment/ba14ab4d_475f7cfc
PS3, Line 338: /* Append the encoded PFCP message to the message buffer.
> It is a feature described in the PFCP specs. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27631
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: I3f85ea052a6b7c064244a8093777e53a47c8c61e
Gerrit-Change-Number: 27631
Gerrit-PatchSet: 7
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Jun 2022 07:04:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28225 )
Change subject: pfcp ie: tweak CP Function Features
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28225
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-upf
Gerrit-Branch: master
Gerrit-Change-Id: Icda891a2f3401e58f142f229465403d5dc8befe5
Gerrit-Change-Number: 28225
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 07 Jun 2022 06:59:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment