fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35520?usp=email )
Change subject: ttcn3-msc-test: set 'hlr' / 'ipa-name' explicitly
......................................................................
ttcn3-msc-test: set 'hlr' / 'ipa-name' explicitly
Old osmo-msc versions do not include the Source Name IE in SMS related
GSUP messages, unless it's set explicitly in the config file ('hlr' /
'ipa-name'). Recent osmo-msc versions (see the related osmo-msc patch)
do include this IE even if it's not set explicitly ('unnamed-MSC').
Because of this, some testcases in ttcn3-msc-test are currently
failing for osmo-msc master, but still passing for the -latest.
Let's set the 'ipa-name' explicitly in osmo-msc.cfg, so that we can
expect both -master and -latest to include the Source Name IE.
Change-Id: I7757aae1d01b679f530b5c0a6c95b224cb9f204f
Related: osmo-ttcn3-hacks.git Ic24d3082fe3dce08e43e8f3ecb6d6132503c55c6
Related: osmo-msc.git I7bacd001b81326c32bc262c7d0c0491ded822fa8
Related: OS#6135
---
M ttcn3-msc-test/osmo-msc.cfg
1 file changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/20/35520/1
diff --git a/ttcn3-msc-test/osmo-msc.cfg b/ttcn3-msc-test/osmo-msc.cfg
index dabf142..b7b39f9 100644
--- a/ttcn3-msc-test/osmo-msc.cfg
+++ b/ttcn3-msc-test/osmo-msc.cfg
@@ -95,3 +95,4 @@
hlr
remote-ip 172.18.20.103
remote-port 4222
+ ipa-name test-MSC
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35520?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I7757aae1d01b679f530b5c0a6c95b224cb9f204f
Gerrit-Change-Number: 35520
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35514?usp=email )
Change subject: GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes()
......................................................................
GTPv2_Templates: Fix tEID field optional tr_PDU_GTP2C_msgtypes()
The TEID field is optional, based on t_Bit. Hence, we also want to
match by type if there's no TEID.
Change-Id: I65044b8758046704e22f9057f34ce5fdbb7aabfe
---
M library/GTPv2_Templates.ttcn
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/35514/1
diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn
index 5dea7e9..afe0138 100644
--- a/library/GTPv2_Templates.ttcn
+++ b/library/GTPv2_Templates.ttcn
@@ -106,7 +106,7 @@
version := '010'B,
messageType := types,
lengthf := ?,
- tEID := ?,
+ tEID := *,
sequenceNumber := ?,
spare3 := '00'O,
gtpcv2_pdu := ?,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35514?usp=email
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: I65044b8758046704e22f9057f34ce5fdbb7aabfe
Gerrit-Change-Number: 35514
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35515?usp=email )
Change subject: GTPv2_Emulation: routing improvements: Prioritize response, fallback to TEID
......................................................................
GTPv2_Emulation: routing improvements: Prioritize response, fallback to TEID
First try forwarding to component transmitting the originating request,
since this is the most fine-grained match.
Finally, if no specific match was found and if messages belongs to
TEID0, send it over that port as a fallback.
Fixes: 1d2cc67036e95a0c3ee3ac7738d7e15d5f76b8a2
Change-Id: Ie96d65085fb352489150183415dbd6cc8237a47c
---
M library/GTPv2_Emulation.ttcn
1 file changed, 24 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/35515/1
diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn
index eb2b977..240cce4 100644
--- a/library/GTPv2_Emulation.ttcn
+++ b/library/GTPv2_Emulation.ttcn
@@ -560,7 +560,12 @@
/* route inbound GTP2-C based on TEID, SEQ or IMSI */
[] GTP2C.receive(Gtp2cUnitdata:?) -> value g2c_ud {
var template hexstring imsi_t := f_gtp2c_extract_imsi(g2c_ud.gtpc);
- if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) {
+ /* if this is a response, route by SEQ: */
+ if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses))
+ and f_seq_known(g2c_ud.gtpc.sequenceNumber)) {
+ vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber);
+ CLIENT.send(g2c_ud.gtpc) to vc_conn;
+ }else if (isvalue(imsi_t) and f_imsi_known(valueof(imsi_t))) {
vc_conn := f_comp_by_imsi(valueof(imsi_t));
CLIENT.send(g2c_ud.gtpc) to vc_conn;
} else if ((ispresent(g2c_ud.gtpc.tEID) and g2c_ud.gtpc.tEID != '00000000'O)
@@ -571,13 +576,11 @@
and f_teid_known('00000000'O)) {
vc_conn := f_comp_by_teid(g2c_ud.gtpc.tEID);
CLIENT.send(g2c_ud.gtpc) to vc_conn;
- /* if this is a response, route by SEQ: */
- } else if (match(g2c_ud.gtpc, tr_PDU_GTP2C_msgtypes(gtp2_responses))
- and f_seq_known(g2c_ud.gtpc.sequenceNumber)) {
- vc_conn := f_comp_by_seq(g2c_ud.gtpc.sequenceNumber);
- CLIENT.send(g2c_ud.gtpc) to vc_conn;
} else {
SendToUdMsgTable(g2c_ud);
+ if (not ispresent(g2c_ud.gtpc.tEID) or g2c_ud.gtpc.tEID == '00000000'O) {
+ TEID0.send(g2c_ud.gtpc);
+ }
}
/* remove sequence number if response was received */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35515?usp=email
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: Ie96d65085fb352489150183415dbd6cc8237a47c
Gerrit-Change-Number: 35515
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35516?usp=email )
Change subject: pgw: Expect EchoResp in CLIENT port of component who sent EchoReq
......................................................................
pgw: Expect EchoResp in CLIENT port of component who sent EchoReq
A recent commit in GTPv2_Emulation improved the routing of incoming
messages from network towards clients.
After that change, the GTPv2_Emulation properly matches the originating
component of the procedure and forwards the reply to it.
Hence, TC_tx_echo() needs to be adapter to expect the reply on its
CLIENT port.
TEID0 is now left for incoming initiating messages which have no seqnr
match.
Change-Id: I1764fdf81192597e393d79d34cb8f221aa79bbd9
Fixes: 1d2cc67036e95a0c3ee3ac7738d7e15d5f76b8a2
---
M pgw/PGW_Tests.ttcn
1 file changed, 24 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/35516/1
diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn
index b8eb471..fa7be47 100644
--- a/pgw/PGW_Tests.ttcn
+++ b/pgw/PGW_Tests.ttcn
@@ -41,7 +41,7 @@
}
/* main component, we typically have one per testcase */
-type component PGW_Test_CT {
+type component PGW_Test_CT extends GTP2_ConnHdlr {
var GTPv2_Emulation_CT vc_GTP2;
port GTP2EM_PT TEID0;
@@ -241,6 +241,8 @@
vc_GTP2 := GTPv2_Emulation_CT.create("GTP2_EM");
map(vc_GTP2:GTP2C, system:GTP2C);
connect(vc_GTP2:TEID0, self:TEID0);
+ connect(vc_GTP2:CLIENT, self:GTP2);
+ connect(vc_GTP2:CLIENT_PROC, self:GTP2_PROC);
vc_GTP2.start(GTPv2_Emulation.main(cfg));
if (mp_pcrf_local_ip != "") {
@@ -785,10 +787,10 @@
f_init();
- TEID0.send(ts_GTP2C_EchoReq(0));
+ GTP2.send(ts_GTP2C_EchoReq(0));
T.start;
alt {
- [] TEID0.receive(tr_GTP2C_EchoResp) {
+ [] GTP2.receive(tr_GTP2C_EchoResp) {
setverdict(pass);
}
[] T.timeout {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35516?usp=email
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: I1764fdf81192597e393d79d34cb8f221aa79bbd9
Gerrit-Change-Number: 35516
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: daniel, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35509?usp=email )
Change subject: GTP_Templates: Add templates for some GTPv1C IEs
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35509?usp=email
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: I84aac34ca40a2707dc9da28e112fd7684e706c8e
Gerrit-Change-Number: 35509
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 09 Jan 2024 10:58:14 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment