daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27109 )
Change subject: RAN_Emulation: Add f_ran_register_exp()
......................................................................
RAN_Emulation: Add f_ran_register_exp()
For some reason this helper function was misssing; we only had
the version to register an imsi.
Change-Id: I9d38dbdf589ed0f5999a5aeeb31b10ca5d07de16
---
M library/RAN_Emulation.ttcnpp
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/27109/1
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 9873245..295876e 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -1442,6 +1442,13 @@
}
}
+/* register an expect with the BSSMAP core */
+function f_ran_register_exp(octetstring l3_enc) runs on RAN_ConnHdlr {
+ BSSAP_PROC.call(RAN_register:{l3_enc, self}) {
+ [] BSSAP_PROC.getreply(RAN_register:{?, ?}) {};
+ }
+}
+
#ifdef RAN_EMULATION_RANAP
/* expect a IuReleaseCommand; Confirm that; expect SCCP-level N-DISCONNET.ind */
altstep as_iu_release_compl_disc(float t := 5.0) runs on RAN_ConnHdlr {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27109
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: I9d38dbdf589ed0f5999a5aeeb31b10ca5d07de16
Gerrit-Change-Number: 27109
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27108 )
Change subject: RAN_Emulation: Don't decode L3 if g_ran_ops.decode_dtap == false
......................................................................
RAN_Emulation: Don't decode L3 if g_ran_ops.decode_dtap == false
We must respect this flag not only in "normal" PDUs but also
in the code path processing the "expect" handling.
Change-Id: I04a9197ac0b68c2dcb7542d035dc70c9f2b90473
---
M library/RAN_Emulation.ttcnpp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/27108/1
diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp
index 3158dc4..9873245 100644
--- a/library/RAN_Emulation.ttcnpp
+++ b/library/RAN_Emulation.ttcnpp
@@ -569,7 +569,7 @@
runs on RAN_Emulation_CT {
/* decode + send decoded RANAP to client */
var template (omit) octetstring l3 := f_ranap_extract_l3(ranap);
- if (istemplatekind(l3, "omit")) {
+ if (istemplatekind(l3, "omit") or not g_ran_ops.decode_dtap) {
CLIENT.send(ranap) to client;
} else {
var template (omit) SAPI sapi := f_ranap_extract_sapi(ranap);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27108
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: I04a9197ac0b68c2dcb7542d035dc70c9f2b90473
Gerrit-Change-Number: 27108
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27107 )
Change subject: Iuh_Emulation: Introduce Iuh_ConnHdlr component type
......................................................................
Iuh_Emulation: Introduce Iuh_ConnHdlr component type
Like RAN_ConnHdlr, this contains the ports required for
a ConnHdlr attaching to Iuh_Emulaiton
Change-Id: Icbffedceb65f791306fde74f3bc5b8fe964148b9
---
M hnodeb/HNBGW_ConnectionHandler.ttcn
M library/Iuh_Emulation.ttcn
2 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/27107/1
diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn
index ac280b0..076cb82 100644
--- a/hnodeb/HNBGW_ConnectionHandler.ttcn
+++ b/hnodeb/HNBGW_ConnectionHandler.ttcn
@@ -40,10 +40,8 @@
import from GTPU_Types all;
/* this component represents a single Iuh connection at the HNBGW. */
-type component HNBGW_ConnHdlr extends StatsD_ConnHdlr, GTP_ConnHdlr {
+type component HNBGW_ConnHdlr extends Iuh_ConnHdlr, GTP_ConnHdlr, StatsD_ConnHdlr {
port TELNETasp_PT HNBVTY;
- port HNBAP_PT HNBAP;
- port RUA_PT RUA;
/* HNBLLIF Interface of HNodeB */
port HNBLLIF_CODEC_PT LLSK;
var integer g_llsk_conn_id;
diff --git a/library/Iuh_Emulation.ttcn b/library/Iuh_Emulation.ttcn
index bc8e7c3..e05afe5 100644
--- a/library/Iuh_Emulation.ttcn
+++ b/library/Iuh_Emulation.ttcn
@@ -38,6 +38,13 @@
import from IPL4asp_Types all;
import from DNS_Helpers all;
+/* General "base class" component definition, of which specific implementations
+ * derive themselves by means of the "extends" feature */
+type component Iuh_ConnHdlr {
+ port HNBAP_PT HNBAP;
+ port RUA_PT RUA;
+};
+
type enumerated IUHEM_EventUpDown {
IUHEM_EVENT_DOWN,
IUHEM_EVENT_UP
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27107
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: Icbffedceb65f791306fde74f3bc5b8fe964148b9
Gerrit-Change-Number: 27107
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27103 )
Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files
......................................................................
Patch Set 2:
(2 comments)
File jenkins-common.sh:
https://gerrit.osmocom.org/c/docker-playground/+/27103/comment/fcf6cb0b_9ee…
PS1, Line 422: name
'image' I guess?
https://gerrit.osmocom.org/c/docker-playground/+/27103/comment/ed13c689_cec…
PS1, Line 422: osmo-ttcn3-hacks
Do we have such a testsuite? Maybe rather use 'ttcn3-bts-test' as an example?
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9
Gerrit-Change-Number: 27103
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 09 Feb 2022 16:11:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27104 )
Change subject: avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor'
......................................................................
avoid pylint E0611: No name 'strxor' in module 'Crypto.Util.strxor'
At least on Debian 10 and unstable, I'm getting this error for pylint:
************* Module pySim.utils
pySim/utils.py:570:1: E0611: No name 'strxor' in module 'Crypto.Util.strxor' (no-name-in-module)
despite it clearly existing:
>>> import Crypto.Util.strxor
>>> Crypto.Util.strxor.strxor
<built-in function strxor>
So let's suppress the related pylint error.
Change-Id: Iea89e758782a569be953d19892028f083a92c2f1
---
M pySim/utils.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/pySim/utils.py b/pySim/utils.py
index 1806d0d..0a9be86 100644
--- a/pySim/utils.py
+++ b/pySim/utils.py
@@ -567,6 +567,7 @@
Run the milenage algorithm to calculate OPC from Ki and OP
"""
from Crypto.Cipher import AES
+ # pylint: disable=no-name-in-module
from Crypto.Util.strxor import strxor
from pySim.utils import b2h
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27104
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Iea89e758782a569be953d19892028f083a92c2f1
Gerrit-Change-Number: 27104
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged