Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28971 )
Change subject: f_tc_mt_t310: detect MNCC failure explicitly
......................................................................
Patch Set 1:
(1 comment)
File msc/MSC_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28971/comment/ff77d9a8_7135…
PS1, Line 1801: va
if you only use that variable in the receive() statement below, you should just be able to write receive(MNCC_PDU:?) below and avoid another variable declaration.
... and as the jenkins job compile failure complained: You need to declare a non-template MNCC_PDU variable called mncc_rx.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28971
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: I49a15142a4b6c51ca767a884c0574f96e01d7cb1
Gerrit-Change-Number: 28971
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Sun, 07 Aug 2022 15:08:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: neels.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28969 )
Change subject: msc: call: allow using MGW conn IPs in either order
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28969
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: Id0c98bc267daff352fc7db7712f967111970fd4d
Gerrit-Change-Number: 28969
Gerrit-PatchSet: 1
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: Sun, 07 Aug 2022 15:05:41 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria, dexter.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28963 )
Change subject: pySim.transport: Add mechanism for handling for CAT/USAT proactive cmds
......................................................................
Patch Set 4:
(2 comments)
File pySim/transport/__init__.py:
https://gerrit.osmocom.org/c/pysim/+/28963/comment/ba5f5046_cbc15b4e
PS4, Line 57: receive_fetch
> Rather decorate with @abc.abstractmethod, no need to raise NotImplementedError.
the point here is that you don't neccessarily need to provide a receive_fetch method in your derived class. you only need it _if_ you don't implement the various handle_xxx methods. That's why I did it this way.
https://gerrit.osmocom.org/c/pysim/+/28963/comment/bb7c4316_ed7c0f67
PS4, Line 164: while
> Could you explain why are you changing 'if' to 'while'?
the existing code only handled one proactive response, and then interjected the FETCH command. However, if that FETCH command again reuslts in a 91xx response, it means there's another proactive command pending, and we need to do another FETCH, and repeat.
This could/should have been a separate patch, but given that nobody is using the code yet, and the entire proactive support is pretty much WIP, I thought I can avoid creating even more one-line commits.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28963
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I844504e2fc1b27ce4fc7ede20b2307e698baa0f6
Gerrit-Change-Number: 28963
Gerrit-PatchSet: 4
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Sun, 07 Aug 2022 15:04:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/28962 )
Change subject: tlv: Use self._compute_tag() method rather than direct self.tag
......................................................................
tlv: Use self._compute_tag() method rather than direct self.tag
The TLV_IE.from_tlv() method is part of a base class that is inherited
by more specific classes. The official way to obtain the tag is the
inherited-class-provided self._compute_tag() method, and *not* a direct
reference to the self.tag member.
This allows for some more obscure TLV parsers, such as the upcoming one
for Proactive Commands in the CAT/OTA context.
Change-Id: I0cd70e31567edc5a0584336efcb5e4282734f6dd
---
M pySim/tlv.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/pySim/tlv.py b/pySim/tlv.py
index 5acc781..a5baa23 100644
--- a/pySim/tlv.py
+++ b/pySim/tlv.py
@@ -236,7 +236,7 @@
return {}, b''
(rawtag, remainder) = self.__class__._parse_tag_raw(do)
if rawtag:
- if rawtag != self.tag:
+ if rawtag != self._compute_tag():
raise ValueError("%s: Encountered tag %s doesn't match our supported tag %s" %
(self, rawtag, self.tag))
(length, remainder) = self.__class__._parse_len(remainder)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/28962
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I0cd70e31567edc5a0584336efcb5e4282734f6dd
Gerrit-Change-Number: 28962
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28970 )
Change subject: msc: add MSC_Tests_Iu.control to MSC_Tests.cfg
......................................................................
msc: add MSC_Tests_Iu.control to MSC_Tests.cfg
Also run the Iu tests for osmo-msc.
Same as we have in docker-playground.git/ttcn3-msc-test/MSC_Tests.cfg
Related: SYS#5066
Change-Id: Ied0449fd0328ee57b66e3cff9d34b0e1d27b9fb4
---
M msc/MSC_Tests.cfg
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/28970/1
diff --git a/msc/MSC_Tests.cfg b/msc/MSC_Tests.cfg
index b852bac..7894099 100644
--- a/msc/MSC_Tests.cfg
+++ b/msc/MSC_Tests.cfg
@@ -16,6 +16,7 @@
[EXECUTE]
MSC_Tests.control
+MSC_Tests_Iu.control
#MSC_Tests.TC_cr_before_reset
#MSC_Tests.TC_lu_imsi_noauth_tmsi
#MSC_Tests.TC_lu_imsi_noauth_notmsi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28970
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: Ied0449fd0328ee57b66e3cff9d34b0e1d27b9fb4
Gerrit-Change-Number: 28970
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28969 )
Change subject: msc: call: allow using MGW conn IPs in either order
......................................................................
msc: call: allow using MGW conn IPs in either order
So far, the first CRCX dispatched by osmo-msc is used for the RAN side,
and the second one for the CN side. Upcoming changes to osmo-msc move
the CN side CRCX to an earlier point in time, reversing that order.
Allow both RTP addresses from the two MGCP CRCX OK to appear in the
Assignment Request message to RAN, so that the test succeeds for both
the current osmo-msc and the upcoming patch (see below).
Related: SYS#5066
Related: Ie433db1ba0c46d4b97538a969233c155cefac21c (osmo-msc)
Change-Id: Id0c98bc267daff352fc7db7712f967111970fd4d
---
M msc/BSC_ConnectionHandler.ttcn
M msc/MSC_Tests.ttcn
2 files changed, 12 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/28969/1
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index c3426a4..4e736b8 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -1066,8 +1066,10 @@
if (g_pars.ran_is_geran) {
- var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
+ var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass1 :=
f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?);
+ var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass2 :=
+ f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?);
interleave {
/* Second MGCP CRCX (this time for MSS/CN side) */
@@ -1084,7 +1086,7 @@
}
/* expect the MSC to trigger a BSSMAP ASSIGNMENT */
- [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) -> value bssap {
+ [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, (tla_ass1, tla_ass2))) -> value bssap {
var template BSSMAP_IE_AoIP_TransportLayerAddress tla;
var BSSMAP_IE_SpeechCodec codec;
var BSSMAP_IE_Osmo_OsmuxCID osmuxCID;
@@ -1486,8 +1488,10 @@
return;
}
- var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
+ var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass1 :=
f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?);
+ var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass2 :=
+ f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?);
var default mdcx := activate(as_optional_mgcp_mdcx(cpars.mgw_conn_2.mgw_rtp_ip, cpars.mgw_conn_2.mgw_rtp_port));
var boolean got_mncc_setup_compl_ind := false;
@@ -1533,8 +1537,9 @@
var BSSMAP_IE_SpeechCodec codec;
var BSSMAP_IE_Osmo_OsmuxCID osmuxCID;
- if (not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass)) {
- log("Expected:", tla_ass);
+ if (not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass1)
+ and not match(bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer, tla_ass2)) {
+ log("Expected one of: 1:", tla_ass1, " 2:", tla_ass2);
log("Got:", bssap.pdu.bssmap.assignmentRequest.aoIPTransportLayer);
setverdict(fail, "MSC sent Assignment Request with unexpected AoIP Transport Layer IE");
mtc.stop;
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index 3042586..79221d7 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -6695,7 +6695,8 @@
/* ...and with Assignment of a voice channel. */
var template BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
- f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?);
+ (f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_1.mgw_rtp_ip, ?),
+ f_tr_BSSMAP_IE_AoIP_TLA(cpars.mgw_conn_2.mgw_rtp_ip, ?));
BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass));
/* By this Assignment Request, the CM Re-Establishment Request is implicitly accepted. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28969
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: Id0c98bc267daff352fc7db7712f967111970fd4d
Gerrit-Change-Number: 28969
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange