[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Rename component id
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?usp=email ) Change subject: SIP_Emulation: Rename component id .. Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/d448a0d6_2e86e10b PS1, Line 9: it makes it impossible to reference the : component name under TESTPORT_PARAMETERS I run `git-grep` and found this: ``` msc/MSC_Tests.default:[TESTPORT_PARAMETERS] msc/MSC_Tests.default-"MSC_Test-MNCC".MNCC.socket_type := "SEQPACKET"; ``` So escaping dashes should not be a problem. We follow this naming style in other testcases. so I would suggest to stick to it. File library/SIP_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641/comment/58aa9a96_03410162 PS1, Line 229: _EMU We also don't have the `EMU` in other emulation components, so why making this different... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36641?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: Iecefe7d98a5842872f1efc55e013f672186ef1a8 Gerrit-Change-Number: 36641 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 25 Apr 2024 17:32:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: SIP_Emulation: Remove duplicated map()
Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36640?usp=email ) Change subject: SIP_Emulation: Remove duplicated map() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36640?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: I5632c94d03a9dce0d04d94766ce72e6700b6116b Gerrit-Change-Number: 36640 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 25 Apr 2024 17:25:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ci[master]: OBS: move gerrit-binpkgs logic to separate script
Attention is currently required from: neels, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36639?usp=email ) Change subject: OBS: move gerrit-binpkgs logic to separate script .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36639?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I100d8dfc0c58bdafe7efb0fa4108031ce10398a5 Gerrit-Change-Number: 36639 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 25 Apr 2024 17:18:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: {cbc,remsim}: fix unbound 'use_ssl' field in HTTP_Adapter_Params
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36636?usp=email )
Change subject: {cbc,remsim}: fix unbound 'use_ssl' field in HTTP_Adapter_Params
..
{cbc,remsim}: fix unbound 'use_ssl' field in HTTP_Adapter_Params
A recent commit added a new field to record HTTP_Adapter_Params, but
forgot to update the callers f_http_init() to actually set this field.
Change-Id: I534d087b71cefd683a0c7411a415049c5e1ee519
Fixes: 832b1efe "HTTP_Adapter: Allow API users to enable/disable SSL"
---
M cbc/CBC_Tests.ttcn
M remsim/RemsimServer_Tests.ttcn
2 files changed, 18 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn
index 57f4d9e..52f6378 100644
--- a/cbc/CBC_Tests.ttcn
+++ b/cbc/CBC_Tests.ttcn
@@ -187,10 +187,10 @@
}
private function f_init(integer num_bsc := 0, integer num_mme := 0) runs on
test_CT {
- var HTTP_Adapter_Params http_adapter_pars;
- http_adapter_pars := {
+ var HTTP_Adapter_Params http_adapter_pars := {
http_host := mp_cbc_host,
- http_port := mp_cbc_ecbe_port
+ http_port := mp_cbc_ecbe_port,
+ use_ssl := false
};
f_http_init(http_adapter_pars);
diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn
index 94529b2..23ea8cb 100644
--- a/remsim/RemsimServer_Tests.ttcn
+++ b/remsim/RemsimServer_Tests.ttcn
@@ -71,7 +71,8 @@
var HTTP_Adapter_Params http_adapter_pars;
http_adapter_pars := {
http_host := mp_server_ip,
- http_port := mp_rsres_port
+ http_port := mp_rsres_port,
+ use_ssl := false
};
f_http_init(http_adapter_pars);
f_rsres_post_reset();
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36636?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: I534d087b71cefd683a0c7411a415049c5e1ee519
Gerrit-Change-Number: 36636
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: {cbc,remsim}: fix unbound 'use_ssl' field in HTTP_Adapter_Params
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36636?usp=email )
Change subject: {cbc,remsim}: fix unbound 'use_ssl' field in HTTP_Adapter_Params
..
{cbc,remsim}: fix unbound 'use_ssl' field in HTTP_Adapter_Params
A recent commit added a new field to record HTTP_Adapter_Params, but
forgot to update the callers f_http_init() to actually set this field.
Change-Id: I534d087b71cefd683a0c7411a415049c5e1ee519
Fixes: 832b1efe "HTTP_Adapter: Allow API users to enable/disable SSL"
---
M cbc/CBC_Tests.ttcn
M remsim/RemsimServer_Tests.ttcn
2 files changed, 18 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/36/36636/1
diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn
index 57f4d9e..52f6378 100644
--- a/cbc/CBC_Tests.ttcn
+++ b/cbc/CBC_Tests.ttcn
@@ -187,10 +187,10 @@
}
private function f_init(integer num_bsc := 0, integer num_mme := 0) runs on
test_CT {
- var HTTP_Adapter_Params http_adapter_pars;
- http_adapter_pars := {
+ var HTTP_Adapter_Params http_adapter_pars := {
http_host := mp_cbc_host,
- http_port := mp_cbc_ecbe_port
+ http_port := mp_cbc_ecbe_port,
+ use_ssl := false
};
f_http_init(http_adapter_pars);
diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn
index 94529b2..23ea8cb 100644
--- a/remsim/RemsimServer_Tests.ttcn
+++ b/remsim/RemsimServer_Tests.ttcn
@@ -71,7 +71,8 @@
var HTTP_Adapter_Params http_adapter_pars;
http_adapter_pars := {
http_host := mp_server_ip,
- http_port := mp_rsres_port
+ http_port := mp_rsres_port,
+ use_ssl := false
};
f_http_init(http_adapter_pars);
f_rsres_post_reset();
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36636?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: I534d087b71cefd683a0c7411a415049c5e1ee519
Gerrit-Change-Number: 36636
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in docker-playground[master]: ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36635?usp=email ) Change subject: ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg .. ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg This commit fixes the following error: cp osmo-stp.cfg /home/osmocom-build/jenkins/workspace/ttcn3-sgsn-test-sns/logs/stp/ cp: cannot stat 'osmo-stp.cfg': No such file or directory Change-Id: Ie0f887dc68e89d2fa1f9a2ee8dfd7f8ce71fc329 Fixes: e4fdd72 "ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg" --- A ttcn3-sgsn-test-sns/osmo-stp.cfg 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/ttcn3-sgsn-test-sns/osmo-stp.cfg b/ttcn3-sgsn-test-sns/osmo-stp.cfg new file mode 12 index 000..6760339 --- /dev/null +++ b/ttcn3-sgsn-test-sns/osmo-stp.cfg @@ -0,0 +1 @@ +../ttcn3-sgsn-test/osmo-stp.cfg \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36635?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: Ie0f887dc68e89d2fa1f9a2ee8dfd7f8ce71fc329 Gerrit-Change-Number: 36635 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36635?usp=email ) Change subject: ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg .. ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg This commit fixes the following error: cp osmo-stp.cfg /home/osmocom-build/jenkins/workspace/ttcn3-sgsn-test-sns/logs/stp/ cp: cannot stat 'osmo-stp.cfg': No such file or directory Change-Id: Ie0f887dc68e89d2fa1f9a2ee8dfd7f8ce71fc329 Fixes: e4fdd72 "ttcn3-sgsn-test-sns: add missing symlink to osmo-stp.cfg" --- A ttcn3-sgsn-test-sns/osmo-stp.cfg 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/35/36635/1 diff --git a/ttcn3-sgsn-test-sns/osmo-stp.cfg b/ttcn3-sgsn-test-sns/osmo-stp.cfg new file mode 12 index 000..6760339 --- /dev/null +++ b/ttcn3-sgsn-test-sns/osmo-stp.cfg @@ -0,0 +1 @@ +../ttcn3-sgsn-test/osmo-stp.cfg \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36635?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: Ie0f887dc68e89d2fa1f9a2ee8dfd7f8ce71fc329 Gerrit-Change-Number: 36635 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: osmo_io: Add iofd param to segmentation_cb
Attention is currently required from: daniel, jolly, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36582?usp=email ) Change subject: osmo_io: Add iofd param to segmentation_cb .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36582?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8d77e30b1ea759ee5ac2a69d704e81ea71e3079 Gerrit-Change-Number: 36582 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 24 Apr 2024 18:38:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: repo-install-test: centos8: fix almalinux keys
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36630?usp=email ) Change subject: repo-install-test: centos8: fix almalinux keys .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36630?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia06d24ce7ce48651f5a41489e78b5b55dc2d3921 Gerrit-Change-Number: 36630 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Wed, 24 Apr 2024 18:34:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: iuup: Increment RTP hdr seqnr even if Tx over UDP fails
Attention is currently required from: neels, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36632?usp=email ) Change subject: iuup: Increment RTP hdr seqnr even if Tx over UDP fails .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36632?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I8095f3505c859650c0b83abce405067bef745975 Gerrit-Change-Number: 36632 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 24 Apr 2024 18:33:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-mgw[master]: Fix IuUP RTP hdr seqnr field not incremented
Attention is currently required from: neels, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36631?usp=email ) Change subject: Fix IuUP RTP hdr seqnr field not incremented .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36631?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I154e1e41cd02fd4d9b88ad98fc7c4d657246c589 Gerrit-Change-Number: 36631 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 24 Apr 2024 18:32:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/ttcn3: add ttcn3-sgsn-test-sns[-latest]
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36624?usp=email ) Change subject: jobs/ttcn3: add ttcn3-sgsn-test-sns[-latest] .. jobs/ttcn3: add ttcn3-sgsn-test-sns[-latest] Change-Id: Iefd81a081fa29af35fc7d575ea23e464c165dbc7 Depends: docker-playground.git I767ec223585002d6420eda27ed338722f764c902 --- M jobs/ttcn3-testsuites.yml 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 2c3e07d..8a1f767 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -75,6 +75,8 @@ timer: H 05 * * * - ttcn3-sgsn-test: timer: H 05 * * * + - ttcn3-sgsn-test-sns: + timer: H 05 * * * - ttcn3-bsc-test: timer: H 05 * * * - ttcn3-mgw-test: @@ -166,6 +168,8 @@ timer: H 08 * * * - ttcn3-sgsn-test-latest: timer: H 08 * * * + - ttcn3-sgsn-test-sns-latest: + timer: H 08 * * * - ttcn3-bsc-test-latest: timer: H 08 * * * - ttcn3-mgw-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36624?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iefd81a081fa29af35fc7d575ea23e464c165dbc7 Gerrit-Change-Number: 36624 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[S] Change in osmo-sgsn[master]: docs: front page: use https:// instead of http://
Attention is currently required from: lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36629?usp=email ) Change subject: docs: front page: use https:// instead of http:// .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36629?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If3c3b8e79f94da7a3bcc9262808da09f6a5a601c Gerrit-Change-Number: 36629 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 24 Apr 2024 08:45:02 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: docs: update year to 2024
Attention is currently required from: lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36628?usp=email ) Change subject: docs: update year to 2024 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36628?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I85a987eee470d2040c91289d33c5d97c3e90674d Gerrit-Change-Number: 36628 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 24 Apr 2024 08:44:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-sgsn[master]: docs: replace legacy NS with new NS2 chapters
Attention is currently required from: lynxis lazus. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36627?usp=email ) Change subject: docs: replace legacy NS with new NS2 chapters .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/36627?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9cc86d234e029b5192e36aeb14b0e39d1496842d Gerrit-Change-Number: 36627 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: lynxis lazus Gerrit-Comment-Date: Wed, 24 Apr 2024 08:44:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: vty: fix memleak in host_config_set()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/36616?usp=email )
Change subject: vty: fix memleak in host_config_set()
..
vty: fix memleak in host_config_set()
Not only we call this function from vty_read_config_file(), but
also from config_write_file_cmd. Thus we leak memory when doing
'write file FILE' in the VTY.
Change-Id: I356818aae3addab6db39de9a625453b7435b7cc1
---
M src/vty/command.c
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/vty/command.c b/src/vty/command.c
index a3e0e36..1719690 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -4297,7 +4297,7 @@
/* Set config filename. Called from vty.c */
void host_config_set(const char *filename)
{
- host.config = talloc_strdup(tall_vty_cmd_ctx, filename);
+ osmo_talloc_replace_string(tall_vty_cmd_ctx, , filename);
}
const char *host_config_file(void)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36616?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I356818aae3addab6db39de9a625453b7435b7cc1
Gerrit-Change-Number: 36616
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: tests: do not copy *.cfg files to the build directory
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/36614?usp=email )
Change subject: tests: do not copy *.cfg files to the build directory
..
tests: do not copy *.cfg files to the build directory
When running 'make check' in-tree ($builddir == $srcdir), those
*.cfg files end up in tests/ and show up as git-add candidates.
Instead of copying them, just let the test binaries know where
to find those files via the cmdline parameters.
Change-Id: I74e428f0548418fdecada3d25049d6e110e790fe
---
M tests/Makefile.am
M tests/msgfile/msgfile_test.c
M tests/testsuite.at
M tests/vty/vty_test.c
4 files changed, 32 insertions(+), 11 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b1731d..45490f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -550,8 +550,7 @@
gea/gea_test \
>$(srcdir)/gea/gea_test.ok
if ENABLE_MSGFILE
- cp $(srcdir)/msgfile/msgconfig.cfg .
- msgfile/msgfile_test \
+ msgfile/msgfile_test $(srcdir)/msgfile/msgconfig.cfg \
>$(srcdir)/msgfile/msgfile_test.ok
endif
sms/sms_test \
@@ -606,8 +605,7 @@
strrb/strrb_test \
>$(srcdir)/strrb/strrb_test.ok
if ENABLE_VTY
- cp $(srcdir)/vty/*.cfg .
- vty/vty_test \
+ vty/vty_test $(srcdir)/vty \
>$(srcdir)/vty/vty_test.ok \
2>$(srcdir)/vty/vty_test.err
endif
diff --git a/tests/msgfile/msgfile_test.c b/tests/msgfile/msgfile_test.c
index 3fe173d..ec58816 100644
--- a/tests/msgfile/msgfile_test.c
+++ b/tests/msgfile/msgfile_test.c
@@ -17,6 +17,7 @@
#include
#include
+#include
#include
@@ -39,8 +40,8 @@
{
struct osmo_config_list *entries;
- /* todo use msgfile_test.c.in and replace the path */
- entries = osmo_config_list_parse(NULL, "msgconfig.cfg");
+ OSMO_ASSERT(argc > 1);
+ entries = osmo_config_list_parse(NULL, argv[1]);
dump_entries(entries);
talloc_free(entries);
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 9ff64ac..9f17ba3 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -84,9 +84,8 @@
if ENABLE_MSGFILE
AT_SETUP([msgfile])
AT_KEYWORDS([msgfile])
-cp $abs_srcdir/msgfile/msgconfig.cfg .
cat $abs_srcdir/msgfile/msgfile_test.ok > expout
-AT_CHECK([$abs_top_builddir/tests/msgfile/msgfile_test], [0], [expout])
+AT_CHECK([$abs_top_builddir/tests/msgfile/msgfile_test
$abs_srcdir/msgfile/msgconfig.cfg], [0], [expout])
AT_CLEANUP
endif
@@ -243,8 +242,7 @@
AT_KEYWORDS([vty])
cat $abs_srcdir/vty/vty_test.ok > expout
cat $abs_srcdir/vty/vty_test.err > experr
-cp $abs_srcdir/vty/*.cfg .
-AT_CHECK([$abs_top_builddir/tests/vty/vty_test], [0], [expout], [experr])
+AT_CHECK([$abs_top_builddir/tests/vty/vty_test $abs_srcdir/vty], [0],
[expout], [experr])
AT_CLEANUP
AT_SETUP([gprs-bssgp])
diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c
index 01e323e..a3f8489 100644
--- a/tests/vty/vty_test.c
+++ b/tests/vty/vty_test.c
@@ -39,6 +39,7 @@
#include
static enum event last_vty_connection_event = -1;
+static const char *cfg_path = NULL;
void *ctx = NULL;
static void test_cmd_string_from_valstr(void)
@@ -292,9 +293,12 @@
void test_exit_by_indent(const char *fname, int expect_rc)
{
+ char fpath[PATH_MAX];
int rc;
+
printf("reading file %s, expecting rc=%d\n", fname, expect_rc);
- rc = vty_read_config_file(fname, NULL);
+ snprintf([0], sizeof(fpath), "%s/%s", cfg_path, fname);
+ rc = vty_read_config_file(fpath, NULL);
printf("got rc=%d\n", rc);
OSMO_ASSERT(rc == expect_rc);
}
@@ -618,6 +622,12 @@
};
void *stats_ctx;
+ if (argc < 2) {
+ fprintf(stderr, "Usage: %s CFG_PATH\n", argv[0]);
+ return 1;
+ }
+ cfg_path = argv[1];
+
ctx = talloc_named_const(NULL, 0, "stats test context");
stats_ctx = talloc_named_const(ctx, 1, "stats test context");
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36614?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I74e428f0548418fdecada3d25049d6e110e790fe
Gerrit-Change-Number: 36614
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: tests: rename logging_test_gsmtap -> logging_gsmtap_test
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36615?usp=email ) Change subject: tests: rename logging_test_gsmtap -> logging_gsmtap_test .. tests: rename logging_test_gsmtap -> logging_gsmtap_test This way the naming is consistent with existing tests and matches the 'tests/*/*_test' pattern in .gitignore. Change-Id: I280fc0cc1bda9ba445af71f00bc8f1ccfd2b2091 --- M tests/Makefile.am R tests/logging/logging_gsmtap_test.c R tests/logging/logging_gsmtap_test.err M tests/testsuite.at 4 files changed, 19 insertions(+), 7 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/Makefile.am b/tests/Makefile.am index 45490f2..3b4325e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,7 @@ gsm0808/gsm0808_test gsm0408/gsm0408_test \ gprs/gprs_test kasumi/kasumi_test gea/gea_test \ logging/logging_test codec/codec_test \ -logging/logging_test_gsmtap\ +logging/logging_gsmtap_test\ loggingrb/loggingrb_test strrb/strrb_test \ comp128/comp128_test \ bitvec/bitvec_test msgb/msgb_test bits/bitcomp_test\ @@ -246,7 +246,7 @@ logging_logging_vty_test_SOURCES = logging/logging_vty_test.c logging_logging_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) -logging_logging_test_gsmtap_SOURCES = logging/logging_test_gsmtap.c +logging_logging_gsmtap_test_SOURCES = logging/logging_gsmtap_test.c vty_vty_transcript_test_SOURCES = vty/vty_transcript_test.c vty_vty_transcript_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) @@ -431,7 +431,7 @@ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ logging/logging_test.ok logging/logging_test.err \ logging/logging_vty_test.vty \ -logging/logging_test_gsmtap.err\ +logging/logging_gsmtap_test.err\ fr/fr_test.ok loggingrb/logging_test.ok \ loggingrb/logging_test.errstrrb/strrb_test.ok \ codec/codec_test.ok \ @@ -589,8 +589,8 @@ logging/logging_test \ >$(srcdir)/logging/logging_test.ok \ 2>$(srcdir)/logging/logging_test.err - logging/logging_test_gsmtap \ - 2>&1 |grep -v "enqueueing message failed" >$(srcdir)/logging/logging_test_gsmtap.err + logging/logging_gsmtap_test \ + 2>&1 |grep -v "enqueueing message failed" >$(srcdir)/logging/logging_gsmtap_test.err codec/codec_test \ >$(srcdir)/codec/codec_test.ok codec/codec_ecu_fr_test \ diff --git a/tests/logging/logging_test_gsmtap.c b/tests/logging/logging_gsmtap_test.c similarity index 100% rename from tests/logging/logging_test_gsmtap.c rename to tests/logging/logging_gsmtap_test.c diff --git a/tests/logging/logging_test_gsmtap.err b/tests/logging/logging_gsmtap_test.err similarity index 100% rename from tests/logging/logging_test_gsmtap.err rename to tests/logging/logging_gsmtap_test.err diff --git a/tests/testsuite.at b/tests/testsuite.at index 9f17ba3..e721b93 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -202,8 +202,8 @@ AT_SETUP([logging_gsmtap]) AT_KEYWORDS([logging_gsmtap]) -cat $abs_srcdir/logging/logging_test_gsmtap.err > experr -AT_CHECK([$abs_top_builddir/tests/logging/logging_test_gsmtap 3>&1 1>&2 2>&3 |grep -v "enqueueing message failed" 3>&1 1>&2 2>&3 ], [], [ignore], [experr]) +cat $abs_srcdir/logging/logging_gsmtap_test.err > experr +AT_CHECK([$abs_top_builddir/tests/logging/logging_gsmtap_test 3>&1 1>&2 2>&3 |grep -v "enqueueing message failed" 3>&1 1>&2 2>&3 ], [], [ignore], [experr]) AT_CLEANUP AT_SETUP([codec]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I280fc0cc1bda9ba445af71f00bc8f1ccfd2b2091 Gerrit-Change-Number: 36615 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in docker-playground[master]: ttcn3-sgsn-test: add config files for running SNS testcases
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/36623?usp=email )
Change subject: ttcn3-sgsn-test: add config files for running SNS testcases
..
ttcn3-sgsn-test: add config files for running SNS testcases
Change-Id: I767ec223585002d6420eda27ed338722f764c902
---
A ttcn3-sgsn-test-sns/jenkins.sh
A ttcn3-sgsn-test-sns/sns
A ttcn3-sgsn-test/jenkins-sns.sh
A ttcn3-sgsn-test/sns/SGSN_Tests.cfg
A ttcn3-sgsn-test/sns/osmo-sgsn.cfg
5 files changed, 219 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Verified
diff --git a/ttcn3-sgsn-test-sns/jenkins.sh b/ttcn3-sgsn-test-sns/jenkins.sh
new file mode 12
index 000..4c1f7b3
--- /dev/null
+++ b/ttcn3-sgsn-test-sns/jenkins.sh
@@ -0,0 +1 @@
+../ttcn3-sgsn-test/jenkins-sns.sh
\ No newline at end of file
diff --git a/ttcn3-sgsn-test-sns/sns b/ttcn3-sgsn-test-sns/sns
new file mode 12
index 000..95cdae2
--- /dev/null
+++ b/ttcn3-sgsn-test-sns/sns
@@ -0,0 +1 @@
+../ttcn3-sgsn-test/sns
\ No newline at end of file
diff --git a/ttcn3-sgsn-test/jenkins-sns.sh b/ttcn3-sgsn-test/jenkins-sns.sh
new file mode 100755
index 000..027244d
--- /dev/null
+++ b/ttcn3-sgsn-test/jenkins-sns.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "osmo-sgsn-$IMAGE_SUFFIX" \
+ "ttcn3-sgsn-test"
+
+set_clean_up_trap
+set -e
+
+mkdir $VOL_BASE_DIR/sgsn-tester
+cp sns/SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/
+write_mp_osmo_repo "$VOL_BASE_DIR/sgsn-tester/SGSN_Tests.cfg"
+
+mkdir $VOL_BASE_DIR/sgsn
+cp sns/osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/
+
+mkdir $VOL_BASE_DIR/stp
+cp osmo-stp.cfg $VOL_BASE_DIR/stp/
+
+mkdir $VOL_BASE_DIR/unix
+
+network_create
+network_replace_subnet_in_configs
+
+echo Starting container with STP
+docker run --rm \
+ $(docker_network_params $SUBNET 200) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/stp:/data \
+ --name ${BUILD_TAG}-stp -d \
+ $DOCKER_ARGS \
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
+
+echo Starting container with SGSN
+docker run --rm \
+ $(docker_network_params $SUBNET 10) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/sgsn:/data \
+ --name ${BUILD_TAG}-sgsn-sns -d \
+ $DOCKER_ARGS \
+ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
+ /bin/sh -c "osmo-sgsn -c /data/osmo-sgsn.cfg
>/data/osmo-sgsn.log 2>&1"
+
+echo Starting container with SGSN testsuite
+docker run --rm \
+ $(docker_network_params $SUBNET 103) \
+ --ulimit core=-1 \
+ -e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \
+ -e "OSMO_SUT_PORT=4245" \
+ -v $VOL_BASE_DIR/sgsn-tester:/data \
+ --name ${BUILD_TAG}-ttcn3-sgsn-test-sns \
+ $DOCKER_ARGS \
+ $REPO_USER/ttcn3-sgsn-test
diff --git a/ttcn3-sgsn-test/sns/SGSN_Tests.cfg
b/ttcn3-sgsn-test/sns/SGSN_Tests.cfg
new file mode 100644
index 000..e3ee59f
--- /dev/null
+++ b/ttcn3-sgsn-test/sns/SGSN_Tests.cfg
@@ -0,0 +1,46 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"/osmo-ttcn3-hacks/Common.cfg"
+# testsuite specific configuration, not expected to change
+"/osmo-ttcn3-hacks/sgsn/SGSN_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+*.SGSNVTY.CTRL_HOSTNAME := "172.18.8.10"
+
+[MODULE_PARAMETERS]
+SGSN_Tests.mp_nsconfig := {
+ {
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.8.103",
+ remote_ip := "172.18.8.10",
+ data_weight := 1,
+ signalling_weight := 1
+ }
+ }
+ }
+ }
+ }
+}
+SGSN_Tests.mp_ranap_cfg := {
+ {
+ sctp_addr := { 23908, "172.18.8.103", 2905, "172.18.8.200" }
+ }
+}
+SGSN_Tests.mp_hlr_ip := "172.18.8.103"
+SGSN_Tests.mp_ggsn_ip := "172.18.8.103"
+SGSN_Tests.mp_sgsn_gtp_ip := "172.18.8.10"
+
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+SGSN_Tests_NS.cont
[S] Change in docker-playground[master]: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36622?usp=email ) Change subject: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control .. ttcn3-sgsn-test: add missing SGSN_Tests_NS.control This does not enable the SNS testcases though. We need a separate job with its own configuration files for running the SNS testcases. Change-Id: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Related: osmo-ttcn3-hacks.git Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 6fd2ae8..d3d1ee7 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -74,3 +74,4 @@ [EXECUTE] SGSN_Tests.control SGSN_Tests_Iu.control +SGSN_Tests_NS.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36622?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: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Gerrit-Change-Number: 36622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_rau_invalid_old_rai
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sgsn: add TC_attach_rau_invalid_old_rai .. sgsn: add TC_attach_rau_invalid_old_rai This testcase currently crashes osmo-sgsn. Change-Id: I006adabdad26c0c48e1ebe99421bcab7295dc147 Related: OS#6441 --- M sgsn/SGSN_Tests.ttcn 1 file changed, 57 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/36625/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?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: I006adabdad26c0c48e1ebe99421bcab7295dc147 Gerrit-Change-Number: 36625 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add TC_attach_rau_invalid_old_rai
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?usp=email )
Change subject: sgsn: add TC_attach_rau_invalid_old_rai
..
sgsn: add TC_attach_rau_invalid_old_rai
This testcase currently crashes osmo-sgsn.
Change-Id: I006adabdad26c0c48e1ebe99421bcab7295dc147
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 56 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/25/36625/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 0371e29..d55a264 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2755,6 +2755,49 @@
f_cleanup();
}
+private function f_TC_attach_rau_invalid_old_rai(charstring id) runs on
BSSGP_ConnHdlr {
+ timer T;
+
+ /* perform regular attach */
+ f_TC_attach(id);
+
+ /* perform RAU via cell A */
+ f_routing_area_update(g_pars.ra);
+
+ f_bssgp_client_unregister(g_pars.imsi);
+ f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]);
+
+ /* perform RAU via cell B, but indicating the new RAI as the old RAI */
+ var RoutingAreaIdentificationV old_ra :=
f_cellid_to_RAI(g_pars.bssgp_cell_id[1]);
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra), 1);
+
+ T.start(2.0);
+ alt {
+ [] BSSGP[1].receive(tr_GMM_RAU_REJECT) {
+ setverdict(pass);
+ T.stop;
+ }
+ [] BSSGP[1].receive(tr_LLC_XID_MT_CMD(?, ?)) { repeat; }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for RAU Reject");
+ mtc.stop;
+ }
+ }
+
+ /* perform RAU via cell B, this time with proper old RAI of cell A */
+ f_routing_area_update(old_ra := g_pars.ra, ran_index := 1);
+
+ f_detach_mo(c_GMM_DTT_MO_GPRS, true, true, 1);
+}
+testcase TC_attach_rau_invalid_old_rai() runs on test_CT {
+ var BSSGP_ConnHdlr vc_conn;
+ f_init();
+ f_sleep(1.0);
+ vc_conn := f_start_handler(refers(f_TC_attach_rau_invalid_old_rai),
testcasename(), g_gb, 138);
+ vc_conn.done;
+ f_cleanup();
+}
+
private function f_TC_attach_gmm_attach_req_while_gmm_attach(charstring id)
runs on BSSGP_ConnHdlr {
var integer count_req := 0;
var MobileIdentityLV mi;
@@ -3984,6 +4027,8 @@
/* At the end, may crash osmo-sgsn, see OS#3957, OS#4245 */
execute( TC_attach_req_id_req_ra_update() );
+ /* At the end, may crash osmo-sgsn */
+ execute( TC_attach_rau_invalid_old_rai() );
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36625?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: I006adabdad26c0c48e1ebe99421bcab7295dc147
Gerrit-Change-Number: 36625
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in meta-telephony[201705]: Remove User= and Group= from systemd service files
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/meta-telephony/+/36618?usp=email ) Change subject: Remove User= and Group= from systemd service files .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/meta-telephony/+/36618?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: meta-telephony Gerrit-Branch: 201705 Gerrit-Change-Id: I68a8fba034aeb0e2923b2958b8d6842410d8b23c Gerrit-Change-Number: 36618 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 22 Apr 2024 13:07:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: daniel, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. Patch Set 6: (1 comment) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/68b78d5c_0321edd4 PS6, Line 3748: f_pdp_ctx_act(apars); > @axilirator@gmail. […] I believe PCAPs would do a better job explaining what's going on. https://osmocom.org/attachments/download/8165/SGSN_Tests.TC_sgsn_context_req_in.pcapng.gz -- here is a PCAP file recorded with the previous patch revision (5). * [packet 456] MS sends GMM `Activate PDP Context Request` with the `Requested PDP Address` IE being empty (wireshark displays `Dynamic addressing`); * [packet 476] SGSN sends GTPC `Create PDP Context Request` with the `End user address` IE being empty (expecting GGSN to assign it?); * [packet 478] GGSN (the testsuite) responds with `Create PDP Context Response`, but **not including** the `End user address` IE; * [packet 487] SGSN responds with GMM `Activate PDP Context Accept` with the `PDP Address` IE being empty (wireshark displays `Dynamic addressing`); * [packet 489] the testsuite sends `SGSN Context Request`; * [packet 492] SGSN responds with `SGSN Context Response` containing no `PDP Context` IE -- this makes the testcase fail. This is basically a), `apars.addr.addressInfo := omit` by default. This is also the case for the other (existing) testcases in SGSN_Tests.ttcn, see https://jenkins.osmocom.org/jenkins/view/TTCN3/job/ttcn3-sgsn-test/2318/artifact/logs/sgsn-tester/SGSN_Tests.TC_attach_pdp_act.pcap.gz for instance. Or any other `SGSN_Tests.TC_attach_pdp_act_...` testcase. The testsuite (virtual GGSN) assigns no IP address, and osmo-sgsn happily accepts that. I don't know if this is right or wrong, you're saying it's not right? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 22 Apr 2024 13:04:38 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in docker-playground[master]: ttcn3-sgsn-test: add config files for running SNS testcases
Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36623?usp=email ) Change subject: ttcn3-sgsn-test: add config files for running SNS testcases .. Patch Set 2: (1 comment) File ttcn3-sgsn-test/sns/SGSN_Tests.cfg: https://gerrit.osmocom.org/c/docker-playground/+/36623/comment/ee0bf1b5_1159b91d PS2, Line 46: SGSN_Tests_NS.control > See, you are assing it here, why adding it to the other already exiting > SGSN_Tests. […] "you are assing" -- lol, what?!? See my comment in previous commit. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36623?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: I767ec223585002d6420eda27ed338722f764c902 Gerrit-Change-Number: 36623 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 22 Apr 2024 12:53:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control
Attention is currently required from: pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/docker-playground/+/36622?usp=email )
Change subject: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control
..
Patch Set 2:
(1 comment)
Patchset:
PS2:
> SNS testcases need another set; NS testcases do not.
```
106 control {
107
108 if (mp_nsconfig[0].handle_sns) {
109 execute( TC_SNS_size() );
110 execute( TC_SNS_size_too_big() );
111 execute( TC_SNS_config_bss() );
112 execute( TC_SNS_config_sgsn() );
113 execute( TC_SNS_and_alive() );
114 } else {
115 execute( TC_NS_connect_alive() );
116 execute( TC_NS_connect_reset() );
117 }
118 }
```
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36622?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: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7
Gerrit-Change-Number: 36622
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Mon, 22 Apr 2024 12:51:45 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36622?usp=email ) Change subject: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control .. Patch Set 2: (1 comment) Patchset: PS2: > I'm a bit lost here. If they need another set of config files + jenkins.sh, > why adding this . […] SNS testcases need another set; NS testcases do not. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36622?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: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Gerrit-Change-Number: 36622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Mon, 22 Apr 2024 12:50:40 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in docker-playground[master]: ttcn3-sgsn-test: add config files for running SNS testcases
Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36623?usp=email ) Change subject: ttcn3-sgsn-test: add config files for running SNS testcases .. Patch Set 2: Verified+1 (1 comment) Patchset: PS2: I tested this by running `./jenkins-sns.sh` locally, all testcases passed. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36623?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: I767ec223585002d6420eda27ed338722f764c902 Gerrit-Change-Number: 36623 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Comment-Date: Mon, 22 Apr 2024 12:31:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in docker-playground[master]: ttcn3-sgsn-test: add config files for running SNS testcases
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36623?usp=email ) Change subject: ttcn3-sgsn-test: add config files for running SNS testcases .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36623?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: I767ec223585002d6420eda27ed338722f764c902 Gerrit-Change-Number: 36623 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 22 Apr 2024 12:30:04 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/ttcn3: add ttcn3-sgsn-test-sns[-latest]
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36624?usp=email ) Change subject: jobs/ttcn3: add ttcn3-sgsn-test-sns[-latest] .. jobs/ttcn3: add ttcn3-sgsn-test-sns[-latest] Change-Id: Iefd81a081fa29af35fc7d575ea23e464c165dbc7 Depends: docker-playground.git I767ec223585002d6420eda27ed338722f764c902 --- M jobs/ttcn3-testsuites.yml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/24/36624/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index a60c2a6..830b549 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -75,6 +75,8 @@ timer: H 05 * * * - ttcn3-sgsn-test: timer: H 05 * * * + - ttcn3-sgsn-test-sns: + timer: H 05 * * * - ttcn3-bsc-test: timer: H 05 * * * - ttcn3-mgw-test: @@ -166,6 +168,8 @@ timer: H 08 * * * - ttcn3-sgsn-test-latest: timer: H 08 * * * + - ttcn3-sgsn-test-sns-latest: + timer: H 08 * * * - ttcn3-bsc-test-latest: timer: H 08 * * * - ttcn3-mgw-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36624?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iefd81a081fa29af35fc7d575ea23e464c165dbc7 Gerrit-Change-Number: 36624 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[M] Change in docker-playground[master]: ttcn3-sgsn-test: add config files for running SNS testcases
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/36623?usp=email )
Change subject: ttcn3-sgsn-test: add config files for running SNS testcases
..
ttcn3-sgsn-test: add config files for running SNS testcases
Change-Id: I767ec223585002d6420eda27ed338722f764c902
---
A ttcn3-sgsn-test/jenkins-sns.sh
A ttcn3-sgsn-test/sns/SGSN_Tests.cfg
A ttcn3-sgsn-test/sns/osmo-sgsn.cfg
3 files changed, 217 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/23/36623/1
diff --git a/ttcn3-sgsn-test/jenkins-sns.sh b/ttcn3-sgsn-test/jenkins-sns.sh
new file mode 100755
index 000..027244d
--- /dev/null
+++ b/ttcn3-sgsn-test/jenkins-sns.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "osmo-stp-$IMAGE_SUFFIX" \
+ "osmo-sgsn-$IMAGE_SUFFIX" \
+ "ttcn3-sgsn-test"
+
+set_clean_up_trap
+set -e
+
+mkdir $VOL_BASE_DIR/sgsn-tester
+cp sns/SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/
+write_mp_osmo_repo "$VOL_BASE_DIR/sgsn-tester/SGSN_Tests.cfg"
+
+mkdir $VOL_BASE_DIR/sgsn
+cp sns/osmo-sgsn.cfg $VOL_BASE_DIR/sgsn/
+
+mkdir $VOL_BASE_DIR/stp
+cp osmo-stp.cfg $VOL_BASE_DIR/stp/
+
+mkdir $VOL_BASE_DIR/unix
+
+network_create
+network_replace_subnet_in_configs
+
+echo Starting container with STP
+docker run --rm \
+ $(docker_network_params $SUBNET 200) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/stp:/data \
+ --name ${BUILD_TAG}-stp -d \
+ $DOCKER_ARGS \
+ $REPO_USER/osmo-stp-$IMAGE_SUFFIX
+
+echo Starting container with SGSN
+docker run --rm \
+ $(docker_network_params $SUBNET 10) \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/sgsn:/data \
+ --name ${BUILD_TAG}-sgsn-sns -d \
+ $DOCKER_ARGS \
+ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
+ /bin/sh -c "osmo-sgsn -c /data/osmo-sgsn.cfg
>/data/osmo-sgsn.log 2>&1"
+
+echo Starting container with SGSN testsuite
+docker run --rm \
+ $(docker_network_params $SUBNET 103) \
+ --ulimit core=-1 \
+ -e "TTCN3_PCAP_PATH=/data" \
+ -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \
+ -e "OSMO_SUT_PORT=4245" \
+ -v $VOL_BASE_DIR/sgsn-tester:/data \
+ --name ${BUILD_TAG}-ttcn3-sgsn-test-sns \
+ $DOCKER_ARGS \
+ $REPO_USER/ttcn3-sgsn-test
diff --git a/ttcn3-sgsn-test/sns/SGSN_Tests.cfg
b/ttcn3-sgsn-test/sns/SGSN_Tests.cfg
new file mode 100644
index 000..e3ee59f
--- /dev/null
+++ b/ttcn3-sgsn-test/sns/SGSN_Tests.cfg
@@ -0,0 +1,46 @@
+[ORDERED_INCLUDE]
+# Common configuration, shared between test suites
+"/osmo-ttcn3-hacks/Common.cfg"
+# testsuite specific configuration, not expected to change
+"/osmo-ttcn3-hacks/sgsn/SGSN_Tests.default"
+
+# Local configuration below
+
+[LOGGING]
+
+[TESTPORT_PARAMETERS]
+*.SGSNVTY.CTRL_HOSTNAME := "172.18.8.10"
+
+[MODULE_PARAMETERS]
+SGSN_Tests.mp_nsconfig := {
+ {
+ handle_sns := true,
+ nsvc := {
+ {
+ provider := {
+ ip := {
+ address_family := AF_INET,
+ local_ip := "172.18.8.103",
+ remote_ip := "172.18.8.10",
+ data_weight := 1,
+ signalling_weight := 1
+ }
+ }
+ }
+ }
+ }
+}
+SGSN_Tests.mp_ranap_cfg := {
+ {
+ sctp_addr := { 23908, "172.18.8.103", 2905, "172.18.8.200" }
+ }
+}
+SGSN_Tests.mp_hlr_ip := "172.18.8.103"
+SGSN_Tests.mp_ggsn_ip := "172.18.8.103"
+SGSN_Tests.mp_sgsn_gtp_ip := "172.18.8.10"
+
+
+[MAIN_CONTROLLER]
+
+[EXECUTE]
+SGSN_Tests_NS.control
diff --git a/ttcn3-sgsn-test/sns/osmo-sgsn.cfg
b/ttcn3-sgsn-test/sns/osmo-sgsn.cfg
new file mode 100644
index 000..f2a4def
--- /dev/null
+++ b/ttcn3-sgsn-test/sns/osmo-sgsn.cfg
@@ -0,0 +1,105 @@
+!
+! OsmoSGSN (1.2.0.46-e77e-dirty) configuration saved from vty
+!!
+!
+log gsmtap 172.18.8.103
+ logging level set-all debug
+ logging filter all 1
+!
+log stderr
+ logging filter all 1
+ logging color 1
+ logging print category 1
+ logging timestamp 1
+ logging print extended-timestamp 1
+ logging print file 1
+ logging level mm debug
+ logging level pag notice
+ logging level
[S] Change in docker-playground[master]: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36622?usp=email to look at the new patch set (#2). Change subject: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control .. ttcn3-sgsn-test: add missing SGSN_Tests_NS.control This does not enable the SNS testcases though. We need a separate job with its own configuration files for running the SNS testcases. Change-Id: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Related: osmo-ttcn3-hacks.git Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/36622/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36622?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: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Gerrit-Change-Number: 36622 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[S] Change in docker-playground[master]: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36622?usp=email ) Change subject: ttcn3-sgsn-test: add missing SGSN_Tests_NS.control .. ttcn3-sgsn-test: add missing SGSN_Tests_NS.control Change-Id: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Related: osmo-ttcn3-hacks.git Ib2bffbb110961474928f35d212cb492d4b6fdee0 --- M ttcn3-sgsn-test/SGSN_Tests.cfg 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/36622/1 diff --git a/ttcn3-sgsn-test/SGSN_Tests.cfg b/ttcn3-sgsn-test/SGSN_Tests.cfg index 6fd2ae8..d3d1ee7 100644 --- a/ttcn3-sgsn-test/SGSN_Tests.cfg +++ b/ttcn3-sgsn-test/SGSN_Tests.cfg @@ -74,3 +74,4 @@ [EXECUTE] SGSN_Tests.control SGSN_Tests_Iu.control +SGSN_Tests_NS.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36622?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: I605526dff6d3c0ec4c5dc58dc00ca51b4ccd68a7 Gerrit-Change-Number: 36622 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: daniel, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. Patch Set 6: (1 comment) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/be34a9b2_441b8d55 PS6, Line 3748: f_pdp_ctx_act(apars); > @vyanitskiy@sysmocom. […] I don't think it really matters for this specific test scenario whether the requested IP address matches the assigned one. Likewise, I don't think it matters here whether we allocate IP address statically or dynamically. Just to clarify: I was not the one implementing `f_pdp_ctx_act()`, so I am simply trying to use the existing code base. What you suggest makes sense for those testcases specifically testing the PDP Context Activation procedure. And AFAICS, the existing testcases do not cover these scenarios, unfortunately. Here I just want to make sure that osmo-sgsn provides the `PDP Context IE` in `SGSN Context Response`. The IP address assignment approach is a less significant detail preceding the "core" phase of the test scenario. I have two options with the existing code base: * a) leave `apars.addr.addressInfo` empty (`omit`) - this is the default, and this results in a PDP Context activated with no address at all. The testcase is failing because osmo-sgsn does not include the `PDP Context IE`. * b) assign a valid address to `apars.addr.addressInfo` - this is what I did in the last patch revision and got the testcase passing. Regarding a), @dwillm...@sysmocom.de told me that it's impossible to encode a `PDP Context IE` in `SGSN Context Response` without an IP address. I just checked 3GPP TS 29.060, section 7.7.29 myself, and AFAICS it **is** possible: we can simply set `PDP Address Length` to 0. So all in all, I can: * stick to b) merging the current patch revision; * fix osmo-sgsn to handle PCP contexts with empty IP address correctly (is this even a valid scenario on practice?) and revert back to the previous patch revision a); * spend more hours on improving the testsuite, implementing additional testcases for static vs dynamic + requested != assigned scenarios (this goes beyond the scope of OS#6294). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Mon, 22 Apr 2024 12:02:33 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: jobs/ttcn3: run io_uring testsuites on all nodes
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36602?usp=email ) Change subject: jobs/ttcn3: run io_uring testsuites on all nodes .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36602?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I59b9a7c3928281a0557c17629029adcbc5ae7410 Gerrit-Change-Number: 36602 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Mon, 22 Apr 2024 11:46:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: fixup: sgsn: fix unused param in f_routing_area_update()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36613?usp=email )
Change subject: fixup: sgsn: fix unused param in f_routing_area_update()
..
fixup: sgsn: fix unused param in f_routing_area_update()
In 1ee1edd2 I changed f_routing_area_update() to actually use the
given RAI as Old RAI in the Routing Area Update Request. Not only
this broke the testcase scenario (Old RAI shall remain unchanged!),
but also started triggering a use-after-free bug in osmo-sgsn.
Passing 'ran_index := 1' is enough for the second Routing Area Update
Request to show up with a different RAI (at BSSGP level), however the
Old RAI IE shall obviously indicate the *old* RAI, not the new one.
A follow-up commit will add a separate testcase to reproduce the
use-after-free problem in osmo-sgsn.
Change-Id: Ib16985cb08834a238ca4f7a747c43097f430ed6f
Fixes: 1ee1edd2 "sgsn: fix unused param in f_routing_area_update()"
Related: OS#6439
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 24 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 67e815b..0371e29 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2734,7 +2734,7 @@
f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]);
log("sending second RAU via different RA");
- f_routing_area_update(f_cellid_to_RAI(g_pars.bssgp_cell_id[1]),
ran_index := 1);
+ f_routing_area_update(old_ra := g_pars.ra, ran_index := 1);
f_detach_mo(c_GMM_DTT_MO_GPRS, true, true, 1);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36613?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: Ib16985cb08834a238ca4f7a747c43097f430ed6f
Gerrit-Change-Number: 36613
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: fixup: sgsn: fix unused param in f_routing_area_update()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36613?usp=email ) Change subject: fixup: sgsn: fix unused param in f_routing_area_update() .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Merging myself to fix ttcn3-sgsn-test on Jenkins. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36613?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: Ib16985cb08834a238ca4f7a747c43097f430ed6f Gerrit-Change-Number: 36613 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 22 Apr 2024 09:52:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: vty: fix 'write file FILE' breaking 'show startup-config'
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/36617?usp=email )
Change subject: vty: fix 'write file FILE' breaking 'show startup-config'
..
vty: fix 'write file FILE' breaking 'show startup-config'
Change-Id: I224ae41096c12f544dfe35a2c3f381b3bb3ba75e
Related: OS#6440
---
M src/vty/command.c
1 file changed, 17 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/36617/1
diff --git a/src/vty/command.c b/src/vty/command.c
index 1719690..d37516a 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -3490,6 +3490,7 @@
"Write to configuration file\n"
"Set file path to store the config, or replace if already exists\n")
{
+ const char *config_file;
char *failed_file;
int rc;
@@ -3503,15 +3504,16 @@
}
if (argc == 1)
- host_config_set(argv[0]);
-
- if (host.config == NULL) {
+ config_file = argv[0];
+ else /* write to the startup config file */
+ config_file = host_config_file();
+ if (config_file == NULL) {
vty_out(vty, "Can't save to configuration file, using vtysh.%s",
VTY_NEWLINE);
return CMD_WARNING;
}
- rc = write_config_file(host.config, _file);
+ rc = write_config_file(config_file, _file);
switch (rc) {
case -1:
vty_out(vty, "Can't open configuration file %s.%s",
@@ -3544,7 +3546,7 @@
rc = CMD_WARNING;
break;
default:
- vty_out(vty, "Configuration saved to %s%s", host.config,
VTY_NEWLINE);
+ vty_out(vty, "Configuration saved to %s%s", config_file,
VTY_NEWLINE);
rc = CMD_SUCCESS;
break;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36617?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I224ae41096c12f544dfe35a2c3f381b3bb3ba75e
Gerrit-Change-Number: 36617
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: vty: fix memleak in host_config_set()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/36616?usp=email )
Change subject: vty: fix memleak in host_config_set()
..
vty: fix memleak in host_config_set()
Not only we call this function from vty_read_config_file(), but
also from config_write_file_cmd. Thus we leak memory when doing
'write file FILE' in the VTY.
Change-Id: I356818aae3addab6db39de9a625453b7435b7cc1
---
M src/vty/command.c
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/36616/1
diff --git a/src/vty/command.c b/src/vty/command.c
index a3e0e36..1719690 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -4297,7 +4297,7 @@
/* Set config filename. Called from vty.c */
void host_config_set(const char *filename)
{
- host.config = talloc_strdup(tall_vty_cmd_ctx, filename);
+ osmo_talloc_replace_string(tall_vty_cmd_ctx, , filename);
}
const char *host_config_file(void)
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36616?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I356818aae3addab6db39de9a625453b7435b7cc1
Gerrit-Change-Number: 36616
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: tests: do not copy *.cfg files to the build directory
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/36614?usp=email )
Change subject: tests: do not copy *.cfg files to the build directory
..
tests: do not copy *.cfg files to the build directory
When running 'make check' in-tree ($builddir == $srcdir), those
*.cfg files end up in tests/ and show up as git-add candidates.
Instead of copying them, just let the test binaries know where
to find those files via the cmdline parameters.
Change-Id: I74e428f0548418fdecada3d25049d6e110e790fe
---
M tests/Makefile.am
M tests/msgfile/msgfile_test.c
M tests/testsuite.at
M tests/vty/vty_test.c
4 files changed, 32 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/36614/1
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8b1731d..45490f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -550,8 +550,7 @@
gea/gea_test \
>$(srcdir)/gea/gea_test.ok
if ENABLE_MSGFILE
- cp $(srcdir)/msgfile/msgconfig.cfg .
- msgfile/msgfile_test \
+ msgfile/msgfile_test $(srcdir)/msgfile/msgconfig.cfg \
>$(srcdir)/msgfile/msgfile_test.ok
endif
sms/sms_test \
@@ -606,8 +605,7 @@
strrb/strrb_test \
>$(srcdir)/strrb/strrb_test.ok
if ENABLE_VTY
- cp $(srcdir)/vty/*.cfg .
- vty/vty_test \
+ vty/vty_test $(srcdir)/vty \
>$(srcdir)/vty/vty_test.ok \
2>$(srcdir)/vty/vty_test.err
endif
diff --git a/tests/msgfile/msgfile_test.c b/tests/msgfile/msgfile_test.c
index 3fe173d..ec58816 100644
--- a/tests/msgfile/msgfile_test.c
+++ b/tests/msgfile/msgfile_test.c
@@ -17,6 +17,7 @@
#include
#include
+#include
#include
@@ -39,8 +40,8 @@
{
struct osmo_config_list *entries;
- /* todo use msgfile_test.c.in and replace the path */
- entries = osmo_config_list_parse(NULL, "msgconfig.cfg");
+ OSMO_ASSERT(argc > 1);
+ entries = osmo_config_list_parse(NULL, argv[1]);
dump_entries(entries);
talloc_free(entries);
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 9ff64ac..9f17ba3 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -84,9 +84,8 @@
if ENABLE_MSGFILE
AT_SETUP([msgfile])
AT_KEYWORDS([msgfile])
-cp $abs_srcdir/msgfile/msgconfig.cfg .
cat $abs_srcdir/msgfile/msgfile_test.ok > expout
-AT_CHECK([$abs_top_builddir/tests/msgfile/msgfile_test], [0], [expout])
+AT_CHECK([$abs_top_builddir/tests/msgfile/msgfile_test
$abs_srcdir/msgfile/msgconfig.cfg], [0], [expout])
AT_CLEANUP
endif
@@ -243,8 +242,7 @@
AT_KEYWORDS([vty])
cat $abs_srcdir/vty/vty_test.ok > expout
cat $abs_srcdir/vty/vty_test.err > experr
-cp $abs_srcdir/vty/*.cfg .
-AT_CHECK([$abs_top_builddir/tests/vty/vty_test], [0], [expout], [experr])
+AT_CHECK([$abs_top_builddir/tests/vty/vty_test $abs_srcdir/vty], [0],
[expout], [experr])
AT_CLEANUP
AT_SETUP([gprs-bssgp])
diff --git a/tests/vty/vty_test.c b/tests/vty/vty_test.c
index 01e323e..a3f8489 100644
--- a/tests/vty/vty_test.c
+++ b/tests/vty/vty_test.c
@@ -39,6 +39,7 @@
#include
static enum event last_vty_connection_event = -1;
+static const char *cfg_path = NULL;
void *ctx = NULL;
static void test_cmd_string_from_valstr(void)
@@ -292,9 +293,12 @@
void test_exit_by_indent(const char *fname, int expect_rc)
{
+ char fpath[PATH_MAX];
int rc;
+
printf("reading file %s, expecting rc=%d\n", fname, expect_rc);
- rc = vty_read_config_file(fname, NULL);
+ snprintf([0], sizeof(fpath), "%s/%s", cfg_path, fname);
+ rc = vty_read_config_file(fpath, NULL);
printf("got rc=%d\n", rc);
OSMO_ASSERT(rc == expect_rc);
}
@@ -618,6 +622,12 @@
};
void *stats_ctx;
+ if (argc < 2) {
+ fprintf(stderr, "Usage: %s CFG_PATH\n", argv[0]);
+ return 1;
+ }
+ cfg_path = argv[1];
+
ctx = talloc_named_const(NULL, 0, "stats test context");
stats_ctx = talloc_named_const(ctx, 1, "stats test context");
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36614?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I74e428f0548418fdecada3d25049d6e110e790fe
Gerrit-Change-Number: 36614
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in libosmocore[master]: tests: rename logging_test_gsmtap -> logging_gsmtap_test
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36615?usp=email ) Change subject: tests: rename logging_test_gsmtap -> logging_gsmtap_test .. tests: rename logging_test_gsmtap -> logging_gsmtap_test This way the naming is consistent with existing tests and matches the 'tests/*/*_test' pattern in .gitignore. Change-Id: I280fc0cc1bda9ba445af71f00bc8f1ccfd2b2091 --- M tests/Makefile.am R tests/logging/logging_gsmtap_test.c R tests/logging/logging_gsmtap_test.err M tests/testsuite.at 4 files changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/36615/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 45490f2..3b4325e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,7 @@ gsm0808/gsm0808_test gsm0408/gsm0408_test \ gprs/gprs_test kasumi/kasumi_test gea/gea_test \ logging/logging_test codec/codec_test \ -logging/logging_test_gsmtap\ +logging/logging_gsmtap_test\ loggingrb/loggingrb_test strrb/strrb_test \ comp128/comp128_test \ bitvec/bitvec_test msgb/msgb_test bits/bitcomp_test\ @@ -246,7 +246,7 @@ logging_logging_vty_test_SOURCES = logging/logging_vty_test.c logging_logging_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) -logging_logging_test_gsmtap_SOURCES = logging/logging_test_gsmtap.c +logging_logging_gsmtap_test_SOURCES = logging/logging_gsmtap_test.c vty_vty_transcript_test_SOURCES = vty/vty_transcript_test.c vty_vty_transcript_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD) @@ -431,7 +431,7 @@ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ logging/logging_test.ok logging/logging_test.err \ logging/logging_vty_test.vty \ -logging/logging_test_gsmtap.err\ +logging/logging_gsmtap_test.err\ fr/fr_test.ok loggingrb/logging_test.ok \ loggingrb/logging_test.errstrrb/strrb_test.ok \ codec/codec_test.ok \ @@ -589,8 +589,8 @@ logging/logging_test \ >$(srcdir)/logging/logging_test.ok \ 2>$(srcdir)/logging/logging_test.err - logging/logging_test_gsmtap \ - 2>&1 |grep -v "enqueueing message failed" >$(srcdir)/logging/logging_test_gsmtap.err + logging/logging_gsmtap_test \ + 2>&1 |grep -v "enqueueing message failed" >$(srcdir)/logging/logging_gsmtap_test.err codec/codec_test \ >$(srcdir)/codec/codec_test.ok codec/codec_ecu_fr_test \ diff --git a/tests/logging/logging_test_gsmtap.c b/tests/logging/logging_gsmtap_test.c similarity index 100% rename from tests/logging/logging_test_gsmtap.c rename to tests/logging/logging_gsmtap_test.c diff --git a/tests/logging/logging_test_gsmtap.err b/tests/logging/logging_gsmtap_test.err similarity index 100% rename from tests/logging/logging_test_gsmtap.err rename to tests/logging/logging_gsmtap_test.err diff --git a/tests/testsuite.at b/tests/testsuite.at index 9f17ba3..e721b93 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -202,8 +202,8 @@ AT_SETUP([logging_gsmtap]) AT_KEYWORDS([logging_gsmtap]) -cat $abs_srcdir/logging/logging_test_gsmtap.err > experr -AT_CHECK([$abs_top_builddir/tests/logging/logging_test_gsmtap 3>&1 1>&2 2>&3 |grep -v "enqueueing message failed" 3>&1 1>&2 2>&3 ], [], [ignore], [experr]) +cat $abs_srcdir/logging/logging_gsmtap_test.err > experr +AT_CHECK([$abs_top_builddir/tests/logging/logging_gsmtap_test 3>&1 1>&2 2>&3 |grep -v "enqueueing message failed" 3>&1 1>&2 2>&3 ], [], [ignore], [experr]) AT_CLEANUP AT_SETUP([codec]) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I280fc0cc1bda9ba445af71f00bc8f1ccfd2b2091 Gerrit-Change-Number: 36615 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: fixup: sgsn: fix unused param in f_routing_area_update()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36613?usp=email )
Change subject: fixup: sgsn: fix unused param in f_routing_area_update()
..
fixup: sgsn: fix unused param in f_routing_area_update()
In 1ee1edd2 I changed f_routing_area_update() to actually use the
given RAI as Old RAI in the Routing Area Update Request. Not only
this broke the testcase scenario (Old RAI shall remain unchanged!),
but also started triggering a use-after-free bug in osmo-sgsn.
Passing 'ran_index := 1' is enough for the second Routing Area Update
Request to show up with a different RAI (at BSSGP level), however the
Old RAI IE shall obviously indicate the *old* RAI, not the new one.
A follow-up commit will add a separate testcase to reproduce the
use-after-free problem in osmo-sgsn.
Change-Id: Ib16985cb08834a238ca4f7a747c43097f430ed6f
Fixes: 1ee1edd2 "sgsn: fix unused param in f_routing_area_update()"
Related: OS#6439
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/13/36613/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 67e815b..0371e29 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2734,7 +2734,7 @@
f_bssgp_client_register(g_pars.imsi, g_pars.tlli, BSSGP_PROC[1]);
log("sending second RAU via different RA");
- f_routing_area_update(f_cellid_to_RAI(g_pars.bssgp_cell_id[1]),
ran_index := 1);
+ f_routing_area_update(old_ra := g_pars.ra, ran_index := 1);
f_detach_mo(c_GMM_DTT_MO_GPRS, true, true, 1);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36613?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: Ib16985cb08834a238ca4f7a747c43097f430ed6f
Gerrit-Change-Number: 36613
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. Patch Set 6: (1 comment) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/85b736fc_6f301e27 PS6, Line 3748: f_pdp_ctx_act(apars); > afaiu this addressInfo should be updated by f_pdp_ctx_act when received from > the GGSN. Not really. In the current implementation `apars.addr` is the static address the [virtual] MS is requesting in `PDP Context Request`, the [virtual] GGSN is confirming, and finally the SGSN/IUT is assigning in `PDP Context Accept`. Don't ask me why, it was not me writing this. But this is enough to achieve the goal of this testcase. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Sat, 20 Apr 2024 19:25:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library/IPA_Types: WIP codec for IPA UnitID (site/bts/trx)
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?usp=email ) Change subject: library/IPA_Types: WIP codec for IPA UnitID (site/bts/trx) .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26458?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: I68eb0d9e28bbf5d2d8ffe916aae5a66a0fdb9bd0 Gerrit-Change-Number: 26458 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 19 Apr 2024 20:29:51 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: bsc: make use of IpaUnitId codec
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?usp=email )
Change subject: bsc: make use of IpaUnitId codec
..
bsc: make use of IpaUnitId codec
Change-Id: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727
---
M bsc/BSC_Tests.ttcn
1 file changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/12/36612/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 5e4ebbc..8dcff83 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -981,7 +981,7 @@
clnt.vc_IPA := IPA_Emulation_CT.create(clnt.id & "-IPA") alive;
clnt.ccm_pars := c_IPA_default_ccm_pars;
clnt.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator";
- clnt.ccm_pars.unit_id := int2str(1234 + idx.bts) & "/0/" &
int2str(idx.trx);
+ clnt.ccm_pars.unit_id := enc_IpaUnitId({1234 + idx.bts, 0, idx.trx});
if (handler_mode) {
clnt.vc_RSL := RSL_Emulation_CT.create(clnt.id & "-RSL") alive;
connect(clnt.vc_RSL:CCHAN_PT, self:RSL_CCHAN[idx.bts]);
@@ -3946,7 +3946,7 @@
client.vc_IPA := IPA_Emulation_CT.create(client.id & "-IPA") alive;
client.ccm_pars := c_IPA_default_ccm_pars;
client.ccm_pars.name := "Osmocom TTCN-3 BTS Simulator";
- client.ccm_pars.unit_id := "99/0/0"; /* value which is unknown at BTS */
+ client.ccm_pars.unit_id := enc_IpaUnitId({99, 0, 0}); /* value which is
unknown at BTS */
f_ipa_ctrl_start_client(mp_bsc_ip, mp_bsc_ctrl_port);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36612?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: Iaf38fdb0a1c3ada5af6f1a05c7a9008e4eae0727
Gerrit-Change-Number: 36612
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: library/RSL_Emulation: make use of IpaUnitId codec
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?usp=email )
Change subject: library/RSL_Emulation: make use of IpaUnitId codec
..
library/RSL_Emulation: make use of IpaUnitId codec
Change-Id: I20e1ac35707affc6aab60397a22e33fe2bd1106e
---
M library/RSL_Emulation.ttcn
1 file changed, 19 insertions(+), 20 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/11/36611/1
diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn
index 891e565..17e35ab 100644
--- a/library/RSL_Emulation.ttcn
+++ b/library/RSL_Emulation.ttcn
@@ -370,9 +370,7 @@
private function f_trx_conn_map_register(integer conn_id, in IpaCcmIdResp
id_resp)
runs on RSL_Emulation_CT return IpaStreamId {
- var template charstring unit_id_fmt := pattern "(\d+)/(\d+)/(\d+)";
- var charstring unit_id;
- var integer trx_nr;
+ var IpaUnitId unit_id;
var integer idx;
/* Check if we have room for a new connection */
@@ -386,29 +384,21 @@
testcase.stop("IPA IDENTITY RESPONSE contains no unit-id");
}
- /* Make sure that IPA unit-id is valid */
- unit_id := oct2char(id_resp[idx].data);
- if (not match(unit_id, unit_id_fmt)) {
- testcase.stop("IPA unit-id has unknown/unexpected format");
- }
+ /* Parse IPA unit-id */
+ unit_id := dec_IpaUnitId(oct2char(id_resp[idx].data));
- /* Parse transceiver number (site/bts/trx).
-* TODO: implement and use declaratice types. */
- unit_id := regexp(unit_id, unit_id_fmt, 2);
- trx_nr := str2int(unit_id);
-
- if (trx_nr >= sizeof(TrxConnMap)) {
- testcase.stop("Transceiver #", trx_nr, " does not fit");
- } else if (TrxConnMap[trx_nr] != -1) {
- testcase.stop("Transceiver #", trx_nr, " is already
connected?!?");
+ if (unit_id.trx_id >= sizeof(TrxConnMap)) {
+ testcase.stop("Transceiver #", unit_id.trx_id, " does not fit");
+ } else if (TrxConnMap[unit_id.trx_id] != -1) {
+ testcase.stop("Transceiver #", unit_id.trx_id, " is already
connected?!?");
}
/* Finally, store the connection ID */
- log("Mapped TRX#", trx_nr, " to TCP/IP conn_id=", conn_id);
- TrxConnMap[trx_nr] := conn_id;
+ log("Mapped TRX#", unit_id.trx_id, " to TCP/IP conn_id=", conn_id);
+ TrxConnMap[unit_id.trx_id] := conn_id;
TrxConnNum := TrxConnNum + 1;
- return f_streamId_by_trx(trx_nr);
+ return f_streamId_by_trx(unit_id.trx_id);
}
private function f_trx_conn_map_unregister(integer conn_id)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36611?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: I20e1ac35707affc6aab60397a22e33fe2bd1106e
Gerrit-Change-Number: 36611
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. sgsn: TC_sgsn_context_req_in: match PDP Context IE Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 84 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/36601/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: asterisk: Use Titan TEXT encoder to implement AMI record enc/dec
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36610?usp=email ) Change subject: asterisk: Use Titan TEXT encoder to implement AMI record enc/dec .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Nice! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36610?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: If179e45307a7e42b81b28db6ee4b7bf5eeb8b5f1 Gerrit-Change-Number: 36610 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 19 Apr 2024 16:55:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: sgsn: add testcases for SGSN Context Request procedure .. sgsn: add testcases for SGSN Context Request procedure Change-Id: If71de10897a8a9f6612cd46c760cd89c0299ac2c Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 176 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/36589/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. sgsn: TC_sgsn_context_req_in: match PDP Context IE Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 87 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/36601/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs .. sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs Change-Id: Ie68794c309e548279381d044a3e34dcdf405084f Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 55 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/36600/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?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: Ie68794c309e548279381d044a3e34dcdf405084f Gerrit-Change-Number: 36600 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email ) Change subject: sgsn: add testcases for SGSN Context Request procedure .. Patch Set 3: (1 comment) Patchset: PS3: > Waiting for @vyanitskiy@sysmocom. […] I first misunderstood your requests to remove the `log()` statements and removed printing the unexpected messages from `setverdict()` statements. I prefer to keep the `log()` statements (and even added a few more) to better understand the testcase execution process/progress (e.g. when it gets stuck), but removed printing message bodies from them. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 19 Apr 2024 10:40:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. Patch Set 4: (2 comments) File library/GTPv1C_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/b0dc5427_7e8ae552 PS3, Line 473: lengthf := ?, /* overwritten */ > These overwritten stuff doesn't make much sense here, should be dropped. Done File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601/comment/d8d6f76f_dd84395a PS3, Line 3765: pdp_ctx.pdp_typeorg := apars.addr.pdpTypeOrg; > All these should be passed in tr_PDP_Context_GTPC. This is not critical and can be improved later. I am leaving it as-is. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 19 Apr 2024 10:37:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email ) Change subject: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?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: Ie68794c309e548279381d044a3e34dcdf405084f Gerrit-Change-Number: 36600 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 19 Apr 2024 10:10:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?usp=email )
Change subject: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
..
library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
Set the values according to 3GPP TS 29.060 version 17.4.0 Release 17.
* Field 'spare' is defined as 'Spare ' in Table 40 (missing '1').
* Field 'spare1' is defined as 'Spare 111' in Table 41.
* Field 'security' must be set as per Table 47.
Change-Id: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Fixes: f95460b55 "GTP_Templates: Add templates for some GTPv1C IEs"
Fixes: fdde16846 "library: GTPv1C add ts_MM_ContextGSM"
---
M library/GTPv1C_Templates.ttcn
1 file changed, 22 insertions(+), 5 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 0dc30be..e9cf797 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -346,10 +346,10 @@
mmcontGSM := {
lengthf := 0, /* overwritten */
cksn := cksn,
- spare := '0'B,
+ spare := '1'B,
usedCipher := gea,
- noofVectors := 0,
- security := '00'B, /* XXX */
+ noofVectors := 0, /* overwritten */
+ security := '01'B, /* GSM key and triplets */
kc := kc,
triplet := ''O,
drx_par := ''O,
@@ -372,9 +372,9 @@
usedGPRSIntegrityAlgorithm := '000'B,
ugipai := '1'B, /* Integrity Protection not
required */
gupii := '1'B, /* Ignore "Used GPRS integrity
protection algorithm" field" */
- spare1 := '000'B,
+ spare1 := '111'B,
noofVectors := 0, /* TODO: fill quintpuplets*/
- security := '01'B, /* UMTS key and quintuplets
*/
+ security := '10'B, /* UMTS key and quintuplets
*/
ck := ck,
ik := ik,
quintupletlength := 0, /* overwritten */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?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: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Gerrit-Change-Number: 36599
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email )
Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
..
library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Change-Id: I9b0c948f295fd73fad79c8d09b45fd992c90a015
---
M library/GTPv1C_Templates.ttcn
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index dcb8e60..0dc30be 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -1360,8 +1360,9 @@
private_extension_gtpc := omit
}
}
+
template (value) Gtp1cUnitdata ts_GTPC_SGSNContextAck(Gtp1cPeer peer,
OCT4 teid, uint16_t seq,
- template (value)
GTPC_PDUs SGSNContextAckPDU :=
ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED)) := {
+ template (value)
GTPC_PDUs SGSNContextAckPDU := ts_SGSNContextAckPDU) := {
peer := peer,
gtpc := ts_GTP1C_PDU(sgsnContextAcknowledge, teid,
valueof(SGSNContextAckPDU), seq)
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015
Gerrit-Change-Number: 36598
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sgsn: add testcases for SGSN Context Request procedure .. sgsn: add testcases for SGSN Context Request procedure Change-Id: If71de10897a8a9f6612cd46c760cd89c0299ac2c Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 171 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/36589/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: osmith, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email )
Change subject: sgsn: add testcases for SGSN Context Request procedure
..
Patch Set 2:
(2 comments)
File sgsn/SGSN_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/6377ced0_fd15be8d
PS2, Line 3807: log("Rx SGSN Context Request from SGSN: ",
gtpc_ud.gtpc);
> This log is most probably not needed, only polluting output.
Done
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/b778b835_2170f575
PS2, Line 3852: log("Rx SGSN Context ACK from SGSN: ",
gtpc_ud.gtpc);
> same, not needed.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c
Gerrit-Change-Number: 36589
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: osmith
Gerrit-Attention: pespin
Gerrit-Comment-Date: Fri, 19 Apr 2024 09:56:22 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email ) Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015 Gerrit-Change-Number: 36598 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Comment-Date: Fri, 19 Apr 2024 07:12:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE .. sgsn: TC_sgsn_context_req_in: match PDP Context IE Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 87 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/36601/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?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: I965c0200ea380c55dc0cd8d3f8e5110883ce2646 Gerrit-Change-Number: 36601 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs .. sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs Change-Id: Ie68794c309e548279381d044a3e34dcdf405084f Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 55 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/00/36600/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?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: Ie68794c309e548279381d044a3e34dcdf405084f Gerrit-Change-Number: 36600 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email ) Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact .. Patch Set 1: (1 comment) File library/GTPv1C_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598/comment/b6034b8b_b9d0f2dc PS1, Line 1353: cause := GTP_CAUSE_REQUEST_ACCEPTED Note it's the default value here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015 Gerrit-Change-Number: 36598 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 20:53:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email ) Change subject: sgsn: add testcases for SGSN Context Request procedure .. Patch Set 2: (3 comments) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/127b479d_9cdf6fa3 PS1, Line 3772: Contect > Context Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/2a90776b_d051ec7d PS1, Line 3814: Contect > Context Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/ab469934_806e1b52 PS1, Line 3950: execute( TC_sgsn_context_req_in() ); > Ah indeed, there's no RAT type being sent in there, good point. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 20:52:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email )
Change subject: sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
..
sgsn: TC_sgsn_context_req_in: match MM Context & GSN Address IEs
Change-Id: Ie68794c309e548279381d044a3e34dcdf405084f
Related: SYS#6603, OS#6294
---
M library/GTPv1C_Templates.ttcn
M sgsn/SGSN_Tests.ttcn
2 files changed, 55 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/00/36600/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 0907c5e..2eb1d7e 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -341,7 +341,8 @@
/* 7.7.28 MM Context */
template (value) MM_Context ts_MM_ContextGSM(template (value) OCT8 kc,
template (value) BIT3 cksn
:= '000'B,
-template (value) BIT3 gea
:= '000'B) := {
+template (value) BIT3 gea
:= '000'B,
+template (value)
octetstring triplet := ''O) := {
type_gtpc := '81'O,
context := {
mmcontGSM := {
@@ -352,7 +353,7 @@
noofVectors := 0, /* overwritten */
security := '01'B, /* GSM key and triplets */
kc := kc,
- triplet := ''O,
+ triplet := triplet,
drx_par := ''O,
msNetW_cap_length := 0, /* overwritten */
msNetw_cap := omit,
@@ -363,6 +364,32 @@
}
}
}
+ template (present) MM_Context tr_MM_ContextGSM(template (present) OCT8
kc := ?,
+ template (present) BIT3
cksn := ?,
+ template (present) BIT3
gea := ?,
+ template (present)
octetstring triplet := ?) := {
+ type_gtpc := '81'O,
+ context := {
+ mmcontGSM := {
+ lengthf := ?,
+ cksn := cksn,
+ spare := ?,
+ usedCipher := gea,
+ noofVectors := ?,
+ security := '01'B, /* GSM key and triplets */
+ kc := kc,
+ triplet := triplet,
+ drx_par := ?,
+ msNetW_cap_length := ?,
+ msNetw_cap := *,
+ containerLength := ?,
+ container := *,
+ access_restriction_data_length := ?,
+ access_restriction_data := *
+ }
+ }
+ }
+
template (value) MM_Context ts_MM_ContextUMTS(template (value) OCT16 ck,
template (value) OCT16
ik) := {
type_gtpc := '81'O,
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 08ae9bc..da1511b 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -3757,7 +3757,22 @@
var template (present) GTPC_PDUs ctx_rsp;
ctx_rsp := tr_SGSNContextRespPDU(cause := GTP_CAUSE_REQUEST_ACCEPTED,
imsi := g_pars.imsi);
- /* TODO: match MM/PDP Context, GSN Address */
+
+ /* SGSN Address for Control Plane */
+ var octetstring sgsn_addr := f_inet_addr(mp_sgsn_gtp_ip);
+ ctx_rsp.sgsn_ContextResponse.sgsn_addr_controlPlane :=
tr_GsnAddr(mp_sgsn_gtp_ip);
+
+ /* Match MM Context */
+ if (ispresent(g_pars.vec)) {
+ /* XXX: this is only valid for GERAN */
+ var octetstring triplet := g_pars.vec.rand & g_pars.vec.sres &
g_pars.vec.kc;
+ ctx_rsp.sgsn_ContextResponse.mm_Context := tr_MM_ContextGSM(kc
:= g_pars.vec.kc,
+
triplet := triplet);
+ /* TODO: 7.5.4 "The IMEISV shall, if available, be included in
the MM Context".
+* See also 3GPP TS 29.060, section 7.7.28 and Table 47A */
+ }
+
+ /* TODO: match PDP Context */
T.start(2.0);
alt {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36600?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?usp=email )
Change subject: library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
..
library: GTPv1C: make ts_GTPC_SGSNContextAck more compact
Change-Id: I9b0c948f295fd73fad79c8d09b45fd992c90a015
---
M library/GTPv1C_Templates.ttcn
1 file changed, 11 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/98/36598/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index dcb8e60..0dc30be 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -1360,8 +1360,9 @@
private_extension_gtpc := omit
}
}
+
template (value) Gtp1cUnitdata ts_GTPC_SGSNContextAck(Gtp1cPeer peer,
OCT4 teid, uint16_t seq,
- template (value)
GTPC_PDUs SGSNContextAckPDU :=
ts_SGSNContextAckPDU(GTP_CAUSE_REQUEST_ACCEPTED)) := {
+ template (value)
GTPC_PDUs SGSNContextAckPDU := ts_SGSNContextAckPDU) := {
peer := peer,
gtpc := ts_GTP1C_PDU(sgsnContextAcknowledge, teid,
valueof(SGSNContextAckPDU), seq)
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36598?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: I9b0c948f295fd73fad79c8d09b45fd992c90a015
Gerrit-Change-Number: 36598
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?usp=email )
Change subject: library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
..
library: GTPv1C: fix ts_MM_Context{GSM,UMTS} templates
Set the values according to 3GPP TS 29.060 version 17.4.0 Release 17.
* Field 'spare' is defined as 'Spare ' in Table 40 (missing '1').
* Field 'spare1' is defined as 'Spare 111' in Table 41.
* Field 'security' must be set as per Table 47.
Change-Id: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Fixes: f95460b55 "GTP_Templates: Add templates for some GTPv1C IEs"
Fixes: fdde16846 "library: GTPv1C add ts_MM_ContextGSM"
---
M library/GTPv1C_Templates.ttcn
1 file changed, 22 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/99/36599/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 0dc30be..e9cf797 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -346,10 +346,10 @@
mmcontGSM := {
lengthf := 0, /* overwritten */
cksn := cksn,
- spare := '0'B,
+ spare := '1'B,
usedCipher := gea,
- noofVectors := 0,
- security := '00'B, /* XXX */
+ noofVectors := 0, /* overwritten */
+ security := '01'B, /* GSM key and triplets */
kc := kc,
triplet := ''O,
drx_par := ''O,
@@ -372,9 +372,9 @@
usedGPRSIntegrityAlgorithm := '000'B,
ugipai := '1'B, /* Integrity Protection not
required */
gupii := '1'B, /* Ignore "Used GPRS integrity
protection algorithm" field" */
- spare1 := '000'B,
+ spare1 := '111'B,
noofVectors := 0, /* TODO: fill quintpuplets*/
- security := '01'B, /* UMTS key and quintuplets
*/
+ security := '10'B, /* UMTS key and quintuplets
*/
ck := ck,
ik := ik,
quintupletlength := 0, /* overwritten */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36599?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: Ic8abb048f7c1fa795ee472820c5b88de0073dc66
Gerrit-Change-Number: 36599
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
[M] Change in osmo-ttcn3-hacks[master]: sgsn: TC_sgsn_context_req_in: match PDP Context IE
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36601?usp=email )
Change subject: sgsn: TC_sgsn_context_req_in: match PDP Context IE
..
sgsn: TC_sgsn_context_req_in: match PDP Context IE
Change-Id: I965c0200ea380c55dc0cd8d3f8e5110883ce2646
Related: SYS#6603, OS#6294
---
M library/GTPv1C_Templates.ttcn
M sgsn/SGSN_Tests.ttcn
2 files changed, 82 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/01/36601/1
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 2eb1d7e..ecc84ad 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -464,6 +464,51 @@
pdp_addresslength2 := omit,
pdp_Address2 := omit
}
+ template (present) PDP_Context_GTPC tr_PDP_Context_GTPC(template
(present) octetstring pdp_addr := ?,
+ template
(present) octetstring ggsn_gsn_addr := ?,
+ template
(present) octetstring apn := ?,
+ template
(present) OCT4 ggsn_teic := ?,
+ template
(present) OCT4 ggsn_teid := ?) := {
+ type_gtpc := '82'O,
+ lengthf := ?, /* overwritten */
+ nsapi := ?,
+ order := ?,
+ asi := ?,
+ vaa := ?,
+ ea := ?,
+ sapi := ?,
+ spare1 := ?,
+ qos_subLength := ?, /* overwritten */
+ qos_sub := ?,
+ qos_reqLength := ?, /* overwritten */
+ qos_req := ?,
+ qos_negLength := ?, /* overwritten */
+ qos_neg := ?,
+ snd := ?,
+ snu := ?,
+ sendNPDUnum := ?,
+ receiveNPDUnum := ?,
+ uteidControlPlane := ggsn_teic,
+ uteidData1 := ggsn_teid,
+ pdpcontext := ?,
+ pdp_typeorg := ?,
+ spare2 := ?,
+ pdp_typenum := ?,
+ pdp_addressLength := ?, /* overwritten */
+ pdp_address := pdp_addr,
+ ggsn_addressControlPlaneLength := ?, /* overwritten */
+ ggsn_addressControlPlane := ggsn_gsn_addr,
+ ggsn_addressUserPlaneLength := ?, /* overwritten */
+ ggsn_addressUserPlane := ggsn_gsn_addr,
+ apnLength := ?, /* overwritten */
+ apn := apn,
+ transactionId := ?,
+ spare3 := ?,
+ transactionID_cont := ?,
+ pdp_typenum2 := *,
+ pdp_addresslength2 := *,
+ pdp_Address2 := *
+ }
/* template matching reception of GTP-C unit-data */
@@ -1280,7 +1325,9 @@
/* SGSN Context Response - 7.5.4 */
template (present) GTPC_PDUs tr_SGSNContextRespPDU(template (present)
GTP_Cause cause := ?,
- template hexstring
imsi := *) := {
+ template hexstring
imsi := *,
+ template MM_Context
mm_context := *,
+ template
PDP_Context_GTPC_List pdp_ctx_list := *) := {
sgsn_ContextResponse := {
cause := tr_Cause_gtpc(cause),
imsi := f_tr_Imsi(imsi),
@@ -1290,8 +1337,8 @@
radioPriority := *,
packetFlowID := *,
charging_char := *,
- mm_Context := *,
- pdp_Context := *,
+ mm_Context := mm_context,
+ pdp_Context := pdp_ctx_list,
sgsn_addr_controlPlane := *,
pdpContextPriorization := *,
radioPriority_LCS := *,
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index da1511b..6d7079e 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -3730,6 +3730,7 @@
/* SGSN terminated SGSN Context Request procedure (we request, SGSN responds)
* 3GPP TS 23.401, Figure D.3.6-1: "Gn/Gp SGSN to MME Tracking Area Update
procedure" */
private function f_TC_sgsn_context_req_in(charstring id) runs on
BSSGP_ConnHdlr {
+ var PdpActPars apars := valueof(t_PdpActPars(mp_ggsn_ip));
var integer seq_nr := f_rnd_int(65535);
var Gtp1cUnitdata gtpc_ud;
timer T;
@@ -3742,6 +3743,8 @@
/* The MS attaches to GERAN/UTRAN and enjoys the service */
f_gmm_attach(false, false);
+ /* The MS activates a PDP context */
+ f_pdp_ctx
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: sgsn: add testcases for SGSN Context Request procedure .. sgsn: add testcases for SGSN Context Request procedure Change-Id: If71de10897a8a9f6612cd46c760cd89c0299ac2c Related: SYS#6603, OS#6294 --- M library/GTPv1C_Templates.ttcn M sgsn/SGSN_Tests.ttcn 2 files changed, 170 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/89/36589/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email )
Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
..
ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Recent commits applied changes to the default scenario, but forgot to
apply them to the 'with-pfcp' subdir.
Fixes: 6de89a5fb529928ce9b7b3320e0ca2e3e568d458
Fixes: 3736d31fc0314cb5d39c707374eecdcfe33241c9
Fixes: 0bdbcd6815358a7b1c4b0bb4575a585c45a01e57
Fixes: 2c22a96355b8e057dbd85ac1922ae84cc63f8b1e
Fixes: d3711e67103691171d7ed3e224c050e78c1f5bc4
Change-Id: Ie02a0754a6ca985e60e08f1f171f532b6cc16264
---
M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
M ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
2 files changed, 35 insertions(+), 4 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
index 16173de..ac6141f 100644
--- a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
@@ -11,11 +11,13 @@
[TESTPORT_PARAMETERS]
*.HNBGWVTY.CTRL_HOSTNAME := "172.18.35.20"
+*.STATSVTY.CTRL_HOSTNAME := "172.18.35.20"
[MODULE_PARAMETERS]
HNBGW_Tests.mp_hnodeb_ip := "172.18.35.203";
HNBGW_Tests.mp_hnbgw_ip := "172.18.35.20";
HNBGW_Tests.mp_mgw_ip := "172.18.35.203";
+HNBGW_Tests.mp_local_statsd_ip := "172.18.35.203";
HNBGW_Tests.mp_cn_cfg := {
{
transport := RANAP_TRANSPORT_IuCS,
@@ -114,6 +116,8 @@
HNBGW_Tests.mp_pfcp_ip_local := "172.18.35.203";
HNBGW_Tests.mp_pfcp_ip_remote := "172.18.35.20";
HNBGW_Tests.mp_validate_talloc_asn1 := true;
+# keep in sync with osmo-hnbgw.cfg "timer hnbgw x31":
+HNBGW_Tests.mp_hnbgw_timer_x31 := 5;
[MAIN_CONTROLLER]
diff --git a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
index d10ea6d..50ac7bf 100644
--- a/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/osmo-hnbgw.cfg
@@ -8,7 +8,7 @@
!
log stderr
logging filter all 1
- logging color 0
+ logging color 1
logging print category-hex 0
logging print category 1
logging print level 1
@@ -19,10 +19,20 @@
!
line vty
no login
- bind 0.0.0.0
+ bind 172.18.35.20
ctrl
- bind 0.0.0.0
+ bind 172.18.35.20
!
+stats interval 0
+stats reporter statsd
+ prefix TTCN3
+ level subscriber
+ remote-ip 172.18.35.203
+ remote-port 8125
+ flush-period 1
+ mtu 1024
+ enable
+
cs7 instance 0
asp asp-clnt-msc-0 2905 2905 m3ua
local-ip 172.18.35.20
@@ -68,7 +78,7 @@
local-ip 172.18.35.20
local-port 29169
hnbap-allow-tmsi 1
- mgcp
+ mgw 0
mgw local-ip 172.18.35.20
mgw remote-ip 172.18.35.203
# don't spam RANAP RESET messages for up to eight CN links across all tests
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264
Gerrit-Change-Number: 36590
Gerrit-PatchSet: 3
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: neels
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: neels Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 18 Apr 2024 18:07:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bsc[master]: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update somo_stream read_cb2 functions to accommodate for new API param .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 18:05:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email ) Change subject: asterisk: Split SIPConnHdlr to its own file .. Patch Set 3: Code-Review+2 (1 comment) File asterisk/SIP_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596/comment/1cc172a9_f30df66c PS2, Line 707: } > `No newline at end of right file. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 17:57:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[XL] Change in osmo-ttcn3-hacks[master]: asterisk: Split SIPConnHdlr to its own file
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?usp=email ) Change subject: asterisk: Split SIPConnHdlr to its own file .. Patch Set 2: Code-Review+1 (1 comment) File asterisk/SIP_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596/comment/de90ac34_91ef5b88 PS2, Line 707: } `No newline at end of right file.` -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36596?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: I168920887bfd05c0a1785c5cb7ac485edaef0df2 Gerrit-Change-Number: 36596 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:38:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-sccp[master]: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new...
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email ) Change subject: ss7_asp: Update osmo_stream read_cb2 functions to accommodate for new API param .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I579f4101a9e2874e310ff78e4571f38cfe8dfab0 Gerrit-Change-Number: 36575 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:36:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for ...
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email ) Change subject: cbsp_link.c: Update stream_cli read_cb2 functions to accommodate for new API param .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36576?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4cce5cb6ca98bc28a67dd6e927e9cdfd2312851a Gerrit-Change-Number: 36576 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:35:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email ) Change subject: Asterisk: Initial AMI support .. Patch Set 2: (1 comment) File asterisk/AMI_Functions.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594/comment/0706ff2c_22efea22 PS2, Line 109: var integer pos := f_strstr(str, ": ", 0); > Looks like you could use TITAN's TEXT encoder for doing this: […] Damn, I am late to the party :( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee Gerrit-Change-Number: 36594 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:32:09 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
[L] Change in osmo-ttcn3-hacks[master]: Asterisk: Initial AMI support
Attention is currently required from: pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?usp=email )
Change subject: Asterisk: Initial AMI support
..
Patch Set 2:
(1 comment)
File asterisk/AMI_Functions.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594/comment/fbca309d_39ffd603
PS2, Line 109: var integer pos := f_strstr(str, ": ", 0);
Looks like you could use TITAN's TEXT encoder for doing this:
```
type record AMI_Field {
charstring key,
charstring val
} with {
encode "TEXT"
variant "SEPARATOR(':')"
};
type set of AMI_Field AMI_Msg with {
encode "TEXT"
variant "SEPARATOR('\r\n')"
variant "END('\r\n')"
};
external function enc_AMI_Msg(in AMI_Msg msg) return charstring
with { extension "prototype(convert) encode(TEXT)" }
external function dec_AMI_Msg(in charstring stream) return AMI_Msg
with { extension "prototype(convert) decode(TEXT)" }
```
See
https://gitlab.eclipse.org/eclipse/titan/titan.core/-/blob/master/usrguide/referenceguide/4-ttcn3_language_extensions.adoc?ref_type=heads#user-content-text-encoder-and-decoder.
Not saying you have to do it this way, but if we can offload some work to TITAN
- why not.
I have a small self-test:
```
private type component dummy_CT { };
testcase TC_tuwat() runs on dummy_CT {
var AMI_Msg msg := {
{ "field1", "value1" },
{ "field2", "value2" },
{ "field3", "value3" }
};
var charstring text := enc_AMI_Msg(msg);
log("AMI msg encoded: ", text);
var AMI_Msg msg_dec := dec_AMI_Msg(text);
log("AMI msg decoded: ", msg_dec);
}
```
and here is the output it produces:
```
MTC@LEGION: AMI msg encoded:
"field1:value1\r\nfield2:value2\r\nfield3:value3\r\n"
MTC@LEGION: AMI msg decoded: { { key := "field1", val := "value1" }, { key :=
"field2", val := "value2" }, { key := "field3", val := "value3" } }
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36594?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: I2c570e4d04e7ab8c44962cf484e4bbc946209aee
Gerrit-Change-Number: 36594
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 16:31:38 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36595?usp=email ) Change subject: ttcn3-asterisk: Set Asterisk AMI IP address in Asterisk_Tests .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36595?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: Ibb6af1cbfb652214b2fdd2a6eb9a4887c9a9cfb0 Gerrit-Change-Number: 36595 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 16:07:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email )
Change subject: sgsn: derive altsteps from f_routing_area_update()
..
sgsn: derive altsteps from f_routing_area_update()
Change-Id: I7d5ec9c42a37a5746c36745ac738fd77e1632675
Related: SYS#6603, OS#6294
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 57 insertions(+), 26 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, but someone else must approve
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index b8b5735..92b744f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2630,46 +2630,67 @@
f_cleanup();
}
-friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
integer ran_index := 0) runs on BSSGP_ConnHdlr {
+friend altstep as_routing_area_update_gb(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
var PDU_L3_SGSN_MS l3_mt;
- var PDU_DTAP_PS_MT mt;
- var template (omit) OCT4 p_tmsi := omit;
- if (is_iu(ran_index)) {
- p_tmsi := g_pars.p_tmsi;
- }
- /* then send RAU */
- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false,
omit, omit, p_tmsi), ran_index);
- alt {
- [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value
l3_mt {
+ [] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
f_send_l3(ts_GMM_RAU_COMPL, ran_index);
setverdict(pass);
}
- [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT))
-> value mt {
+ [] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {
+ setverdict(fail, "Unexpected RAU Reject");
+ mtc.stop;
+ }
+}
+friend altstep as_routing_area_update_iu(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
+ var PDU_DTAP_PS_MT mt;
+
+ [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt {
f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
f_send_l3(ts_GMM_RAU_COMPL, ran_index);
setverdict(pass);
}
-
- [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {
+ [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
setverdict(fail, "Unexpected RAU Reject");
mtc.stop;
}
- [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
- setverdict(fail, "Unexpected RAU Reject");
- mtc.stop;
- }
+ [] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?,
+ uia_key :=
oct2bit(g_pars.vec.ik),
+ key_sts := ?)) {
+ var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 =
standard_UMTS_integrity_algorithm_UIA1 */
+ BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
+ BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
+ repeat;
+ }
+}
+friend altstep as_routing_area_update(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
+ [is_gb(ran_index)] as_routing_area_update_gb(ran_index);
+ [is_iu(ran_index)] as_routing_area_update_iu(ran_index);
+}
- [is_iu(ran_index)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs :=
?, uia_key := oct2bit(g_pars.vec.ik),
- key_sts := ?)) {
- var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0
= standard_UMTS_integrity_algorithm_UIA1 */
- BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
-
BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
- repeat;
- }
+friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
+ GprsUpdateType upd_type := GPRS_UPD_T_RA,
+ integer ran_index := 0,
+ float Tval := 2.0) runs on BSSGP_ConnHdlr
{
+ var template (omit) OCT4 p_tmsi := omit;
+ timer T := Tval;
+
+ if (is_iu(ran_index)) {
+ p_tmsi := g_pars.p_tmsi;
+ }
+
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), upd_type, old_ra, p_tmsi :=
p_tmsi), ran_index);
+
+ T.start;
+ alt {
+ [] as_routing_area_update(ran_index) { setverdict(pass); }
[is_gb(ran_index)] BSSGP[ran_index].receive { repeat; }
[is_iu(ran_index)] BSSAP.receive { repeat; }
+ [] T.timeout {
+ se
[S] Change in osmo-ttcn3-hacks[master]: sgsn: fix unused param in f_routing_area_update()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?usp=email )
Change subject: sgsn: fix unused param in f_routing_area_update()
..
sgsn: fix unused param in f_routing_area_update()
Change-Id: I582b2836eba3188cfd4c640b1febbd25c50001e0
Related: SYS#6603, OS#6294
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 64ba981..b8b5735 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2630,7 +2630,7 @@
f_cleanup();
}
-friend function f_routing_area_update(RoutingAreaIdentificationV ra, integer
ran_index := 0) runs on BSSGP_ConnHdlr {
+friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
integer ran_index := 0) runs on BSSGP_ConnHdlr {
var PDU_L3_SGSN_MS l3_mt;
var PDU_DTAP_PS_MT mt;
var template (omit) OCT4 p_tmsi := omit;
@@ -2639,7 +2639,7 @@
p_tmsi := g_pars.p_tmsi;
}
/* then send RAU */
- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, g_pars.ra,
false, omit, omit, p_tmsi), ran_index);
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false,
omit, omit, p_tmsi), ran_index);
alt {
[is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value
l3_mt {
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?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: I582b2836eba3188cfd4c640b1febbd25c50001e0
Gerrit-Change-Number: 36587
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: library: GTPv1C add ts_MM_ContextGSM
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?usp=email )
Change subject: library: GTPv1C add ts_MM_ContextGSM
..
library: GTPv1C add ts_MM_ContextGSM
Change-Id: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b
Related: SYS#6603, OS#6294
---
M library/GTPv1C_Templates.ttcn
1 file changed, 34 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/GTPv1C_Templates.ttcn b/library/GTPv1C_Templates.ttcn
index 4a0c8b2..dcb8e60 100644
--- a/library/GTPv1C_Templates.ttcn
+++ b/library/GTPv1C_Templates.ttcn
@@ -338,6 +338,30 @@
}
/* 7.7.28 MM Context */
+ template (value) MM_Context ts_MM_ContextGSM(template (value) OCT8 kc,
+template (value) BIT3 cksn
:= '000'B,
+template (value) BIT3 gea
:= '000'B) := {
+ type_gtpc := '81'O,
+ context := {
+ mmcontGSM := {
+ lengthf := 0, /* overwritten */
+ cksn := cksn,
+ spare := '0'B,
+ usedCipher := gea,
+ noofVectors := 0,
+ security := '00'B, /* XXX */
+ kc := kc,
+ triplet := ''O,
+ drx_par := ''O,
+ msNetW_cap_length := 0, /* overwritten */
+ msNetw_cap := omit,
+ containerLength := 0, /* overwritten */
+ container := omit,
+ access_restriction_data_length := 0,
+ access_restriction_data := omit
+ }
+ }
+ }
template (value) MM_Context ts_MM_ContextUMTS(template (value) OCT16 ck,
template (value) OCT16
ik) := {
type_gtpc := '81'O,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36586?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: I483fdd0dee6e0ee92fcee798d8e85a80d1e0be8b
Gerrit-Change-Number: 36586
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in osmo-ttcn3-hacks[master]: library: cosmetic: fix code formatting
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36585?usp=email )
Change subject: library: cosmetic: fix code formatting
..
library: cosmetic: fix code formatting
Change-Id: Ic87f6e8dcb8e507d21082f28217c015ff2e5204b
Related: SYS#6603, OS#6294
---
M library/GTPv1C_CodecPort.ttcn
1 file changed, 11 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/library/GTPv1C_CodecPort.ttcn b/library/GTPv1C_CodecPort.ttcn
index 956a674..bf14723 100644
--- a/library/GTPv1C_CodecPort.ttcn
+++ b/library/GTPv1C_CodecPort.ttcn
@@ -28,7 +28,7 @@
/* Decoded GTP1C (Control Plane), used in send and receive direction */
type record Gtp1cUnitdata {
- Gtp1cPeer peer,
+ Gtp1cPeer peer,
PDU_GTPCgtpc
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36585?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: Ic87f6e8dcb8e507d21082f28217c015ff2e5204b
Gerrit-Change-Number: 36585
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email ) Change subject: sgsn: derive altsteps from f_routing_area_update() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?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: I7d5ec9c42a37a5746c36745ac738fd77e1632675 Gerrit-Change-Number: 36588 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:56:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: jolly, laforge, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 5: Code-Review+1
(1 comment)
Patchset:
PS5:
Letting the others to take a look at this patch (would do CR+2 otherwise).
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 5
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 18 Apr 2024 09:17:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email ) Change subject: tests/stream: Fix missing msgb_free() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 18 Apr 2024 09:16:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 17 Apr 2024 19:47:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in docker-playground[master]: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario
Attention is currently required from: daniel, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36590?usp=email ) Change subject: ttcn3-hnbgw: Apply latest changes to 'with-pfcp' scenario .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36590?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: Ie02a0754a6ca985e60e08f1f171f532b6cc16264 Gerrit-Change-Number: 36590 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 17 Apr 2024 19:18:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream_{cli,srv}: Add 'res' param to read_cb2
Attention is currently required from: jolly, laforge, pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email )
Change subject: stream_{cli,srv}: Add 'res' param to read_cb2
..
Patch Set 4: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36574?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: I395c75ff1e9904757ce1d767a9ac2f779593c4c8
Gerrit-Change-Number: 36574
Gerrit-PatchSet: 4
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: jolly
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-Attention: jolly
Gerrit-Attention: laforge
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 17 Apr 2024 19:16:49 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: tests/stream: Fix missing msgb_free()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email ) Change subject: tests/stream: Fix missing msgb_free() .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36583?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e7579175aa6a7c1c22eb3bc147a67f6f62ad6bc Gerrit-Change-Number: 36583 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 19:15:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmo-netif[master]: stream: Define types for each API callback
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36581?usp=email ) Change subject: stream: Define types for each API callback .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36581?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib0c4a9713fa4c755e457b8c2cbde6a7724d36e28 Gerrit-Change-Number: 36581 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 19:15:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmo-netif[master]: stream_cli: Remove unused write_cb field
Attention is currently required from: daniel, jolly, laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36580?usp=email ) Change subject: stream_cli: Remove unused write_cb field .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I50bee754d01d8de01f4a25c14abf90275a1ac78e Gerrit-Change-Number: 36580 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 17 Apr 2024 19:13:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: Move f_str_split() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36593?usp=email ) Change subject: Move f_str_split() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36593?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: I54eff3eea60ed0624919baebfe0ff7393414d6b8 Gerrit-Change-Number: 36593 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 19:12:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: Move f_strstr_count() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36592?usp=email ) Change subject: Move f_strstr_count() Osmocom_VTY_Functions.ttcn -> Misc_Helpers.ttcn .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36592?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: I105844d2bcab6c24624be1224c1ba78b69d4b44c Gerrit-Change-Number: 36592 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 19:10:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: .gitignore: Add .vscode/ directory
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?usp=email ) Change subject: .gitignore: Add .vscode/ directory .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36591?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: I8a5c5ca50591a0f531258dd59df462ec2ff5f81c Gerrit-Change-Number: 36591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 19:10:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email ) Change subject: sgsn: derive altsteps from f_routing_area_update() .. Patch Set 1: (1 comment) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588/comment/d41ad1c7_71250d49 PS1, Line 2737: f_routing_area_update(f_cellid_to_RAI(g_pars.bssgp_cell_id[1]), ran_index := 1); > this looks unrelated? Not really, there is now a new parameter `upd_type` preceding the `ran_index`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?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: I7d5ec9c42a37a5746c36745ac738fd77e1632675 Gerrit-Change-Number: 36588 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 16:21:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email ) Change subject: sgsn: add testcases for SGSN Context Request procedure .. Patch Set 1: (1 comment) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589/comment/3982843c_b840f833 PS1, Line 3950: execute( TC_sgsn_context_req_in() ); > I'd state somewhere in the name that it's from/to "EUTRAN". I am not 100% sure, but on the SGSN side you don't really know if it's E-UTRAN sending the `SGSN Context Req` or some other SGSN. This is why I did not state it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?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: If71de10897a8a9f6612cd46c760cd89c0299ac2c Gerrit-Change-Number: 36589 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 16:19:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[S] Change in osmo-ttcn3-hacks[master]: sgsn: fix unused param in f_routing_area_update()
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?usp=email ) Change subject: sgsn: fix unused param in f_routing_area_update() .. Patch Set 1: (2 comments) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587/comment/243ed0da_98d729f5 PS1, Line 2633: RoutingAreaIdentificationV ra @pes...@sysmocom.de this param is currently unused. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587/comment/6219c279_ed61ea36 PS1, Line 2642: g_pars.ra ... so we pass RA from `g_pars` instead. Looks like a mistake to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36587?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: I582b2836eba3188cfd4c640b1febbd25c50001e0 Gerrit-Change-Number: 36587 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 17 Apr 2024 14:55:24 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmo-sccp[master]: Fix wrong string prefix in log line
Attention is currently required from: daniel, jolly, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36584?usp=email ) Change subject: Fix wrong string prefix in log line .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifd16ff671d842ae90ec70c2e819a43174f3aa09a Gerrit-Change-Number: 36584 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: jolly Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: jolly Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Comment-Date: Wed, 17 Apr 2024 14:39:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-ttcn3-hacks[master]: sgsn: derive altsteps from f_routing_area_update()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36588?usp=email )
Change subject: sgsn: derive altsteps from f_routing_area_update()
..
sgsn: derive altsteps from f_routing_area_update()
Change-Id: I7d5ec9c42a37a5746c36745ac738fd77e1632675
Related: SYS#6603, OS#6294
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 57 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/88/36588/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index b8b5735..92b744f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -2630,46 +2630,67 @@
f_cleanup();
}
-friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
integer ran_index := 0) runs on BSSGP_ConnHdlr {
+friend altstep as_routing_area_update_gb(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
var PDU_L3_SGSN_MS l3_mt;
- var PDU_DTAP_PS_MT mt;
- var template (omit) OCT4 p_tmsi := omit;
- if (is_iu(ran_index)) {
- p_tmsi := g_pars.p_tmsi;
- }
- /* then send RAU */
- f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), GPRS_UPD_T_RA, old_ra, false,
omit, omit, p_tmsi), ran_index);
- alt {
- [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value
l3_mt {
+ [] BSSGP[ran_index].receive(tr_GMM_RAU_ACCEPT) -> value l3_mt {
f_process_rau_accept(l3_mt.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
f_send_l3(ts_GMM_RAU_COMPL, ran_index);
setverdict(pass);
}
- [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT))
-> value mt {
+ [] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {
+ setverdict(fail, "Unexpected RAU Reject");
+ mtc.stop;
+ }
+}
+friend altstep as_routing_area_update_iu(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
+ var PDU_DTAP_PS_MT mt;
+
+ [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_ACCEPT)) -> value mt {
f_process_rau_accept(mt.dtap.msgs.gprs_mm.routingAreaUpdateAccept, ran_index);
f_send_l3(ts_GMM_RAU_COMPL, ran_index);
setverdict(pass);
}
-
- [is_gb(ran_index)] BSSGP[ran_index].receive(tr_GMM_RAU_REJECT) {
+ [] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
setverdict(fail, "Unexpected RAU Reject");
mtc.stop;
}
- [is_iu(ran_index)] BSSAP.receive(tr_PDU_DTAP_PS_MT(tr_GMM_RAU_REJECT)) {
- setverdict(fail, "Unexpected RAU Reject");
- mtc.stop;
- }
+ [] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs := ?,
+ uia_key :=
oct2bit(g_pars.vec.ik),
+ key_sts := ?)) {
+ var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0 =
standard_UMTS_integrity_algorithm_UIA1 */
+ BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
+ BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
+ repeat;
+ }
+}
+friend altstep as_routing_area_update(integer ran_index := 0) runs on
BSSGP_ConnHdlr {
+ [is_gb(ran_index)] as_routing_area_update_gb(ran_index);
+ [is_iu(ran_index)] as_routing_area_update_iu(ran_index);
+}
- [is_iu(ran_index)] BSSAP.receive(tr_RANAP_SecurityModeCmd(uia_algs :=
?, uia_key := oct2bit(g_pars.vec.ik),
- key_sts := ?)) {
- var IntegrityProtectionAlgorithm uia_chosen := 0; /* 0
= standard_UMTS_integrity_algorithm_UIA1 */
- BSSAP.send(ts_RANAP_SecurityModeComplete(uia_chosen));
-
BSSAP.receive(tr_RANAP_CommonId(imsi_hex2oct(g_pars.imsi)))
- repeat;
- }
+friend function f_routing_area_update(RoutingAreaIdentificationV old_ra,
+ GprsUpdateType upd_type := GPRS_UPD_T_RA,
+ integer ran_index := 0,
+ float Tval := 2.0) runs on BSSGP_ConnHdlr
{
+ var template (omit) OCT4 p_tmsi := omit;
+ timer T := Tval;
+
+ if (is_iu(ran_index)) {
+ p_tmsi := g_pars.p_tmsi;
+ }
+
+ f_send_l3(ts_GMM_RAU_REQ(f_mi_get_lv(), upd_type, old_ra, p_tmsi :=
p_tmsi), ran_index);
+
+ T.start;
+ alt {
+ [] as_routing_area_update(ran_index) { setverdict(pass); }
[is_gb(ran_index)] BSSGP[ran_index].receive { repeat; }
[is_iu(ran_index)] BSSAP.receive { repeat; }
+ [] T.timeout {
+ setverdict(fail, "Timeout completing the RAU procedure");
+ mtc.stop;
[M] Change in osmo-ttcn3-hacks[master]: sgsn: add testcases for SGSN Context Request procedure
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36589?usp=email )
Change subject: sgsn: add testcases for SGSN Context Request procedure
..
sgsn: add testcases for SGSN Context Request procedure
Change-Id: If71de10897a8a9f6612cd46c760cd89c0299ac2c
Related: SYS#6603, OS#6294
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 157 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/89/36589/1
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 92b744f..0e0874f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -3727,6 +3727,150 @@
f_cleanup();
}
+/* SGSN terminated SGSN Context Request procedure (we request, SGSN responds)
+ * 3GPP TS 23.401, Figure D.3.6-1: "Gn/Gp SGSN to MME Tracking Area Update
procedure" */
+private function f_TC_sgsn_context_req_in(charstring id) runs on
BSSGP_ConnHdlr {
+ var integer seq_nr := f_rnd_int(65535);
+ var Gtp1cUnitdata gtpc_ud;
+ timer T;
+
+ var Gtp1cPeer peer := {
+ connId := 1,
+ remName := mp_sgsn_gtp_ip,
+ remPort := GTP1C_PORT
+ }
+
+ /* The MS attaches to GERAN/UTRAN and enjoys the service */
+ f_gmm_attach(false, false);
+
+ /* The MS switches to an LTE cell and performs Tracking Area Update
Request there.
+* The MME requests information about the MS by sending SGSN Context
Request. */
+ var template (value) GTPC_PDUs ctx_req;
+ ctx_req := ts_SGSNContextReqPDU(rai := ts_RoutingAreaIdentity('250'H,
'F99'H, '4242'O, 'DE'O),
+ teic := '12345678'O,
+ sgsn_addr_control :=
f_inet_addr(mp_ggsn_ip),
+ ptmsi := ts_PTMSI(g_pars.p_tmsi),
+ ptmsi_sig := ts_PTMSI_sig('010203'O));
+ GTP.send(ts_GTPC_SGSNContextReq(peer, seq_nr, ctx_req));
+
+ /* The SGSN responds with subscriber's IMSI */
+ var template (present) GTPC_PDUs ctx_rsp;
+ ctx_rsp := tr_SGSNContextRespPDU(cause := GTP_CAUSE_REQUEST_ACCEPTED,
+imsi := g_pars.imsi);
+ /* TODO: match MM/PDP Context, GSN Address */
+
+ T.start(2.0);
+ alt {
+ [] GTP.receive(tr_GTPC_SGSNContextResp(?, ?, ctx_rsp)) -> value gtpc_ud
{
+ GTP.send(ts_GTPC_SGSNContextAck(gtpc_ud.peer, '12345678'O,
seq_nr));
+ setverdict(pass);
+ }
+ [] GTP.receive(tr_GTPC_SGSNContextResp) {
+ setverdict(fail, "Rx unexpected SGSN Context Resp");
+ }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for SGSN Contect Resp");
+ }
+ }
+
+ /* HLR/HSS tells SGSN to forget this MS/UE */
+ GSUP.send(ts_GSUP_CL_REQ(g_pars.imsi, OSMO_GSUP_CANCEL_TYPE_UPDATE));
+ GSUP.receive(tr_GSUP_CL_RES(g_pars.imsi));
+}
+testcase TC_sgsn_context_req_in() runs on test_CT {
+ var BSSGP_ConnHdlr vc_conn;
+ f_init();
+ f_sleep(1.0);
+ vc_conn := f_start_handler(refers(f_TC_sgsn_context_req_in),
testcasename(), g_gb, 72);
+ vc_conn.done;
+ f_cleanup();
+}
+
+/* SGSN originated SGSN Context Request procedure (SGSN requests, we respond)
+ * 3GPP TS 23.401, Figure D.3.5-1 "Routing Area Update procedure" */
+private function f_TC_sgsn_context_req_out(charstring id) runs on
BSSGP_ConnHdlr {
+ var integer seq_nr := f_rnd_int(65535);
+ var Gtp1cUnitdata gtpc_ud;
+ timer T;
+
+ /* The MS goes to GERAN/UTRAN from an LTE cell */
+ f_send_l3(ts_GMM_RAU_REQ(mi_lv := valueof(ts_MI_TMSI_LV('DE42DE42'O)),
+upd_type := GPRS_UPD_T_RA,
+old_ra := f_random_RAI()), 0);
+
+ /* The SGSN has no idea about the MS and inquires the MME about it */
+ T.start(2.0);
+ alt {
+ [] GTP.receive(tr_GTPC_SGSNContextReq(?, ?)) -> value gtpc_ud {
+ log("Rx SGSN Context Request from SGSN: ", gtpc_ud.gtpc);
+ setverdict(pass);
+ T.stop;
+ }
+ [] GTP.receive(tr_GTPC_SGSNContextResp) {
+ setverdict(fail, "Rx unexpected SGSN Context Req");
+ mtc.stop;
+ }
+ [] T.timeout {
+ setverdict(fail, "Timeout waiting for SGSN Contect Req");
+ mtc.stop;
+ }
+ }
+
+ /* The MME responds */
+ var OCT8 kc := f_rnd_octstring(8);
+
+ var template (value) PDP_Context_GTPC pdp_ctx;
+ pdp_ctx := ts_PDP_Context_GTPC(pdp_addr := f_inet_addr("10.10.10.10"),
+ ggsn_gsn_addr := f_inet_addr(mp_ggsn_ip),
+
