Change in pysim[master]: [DO NOT MERGE YET] Python2 is deprecated, switch to Python3
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15504 ) Change subject: [DO NOT MERGE YET] Python2 is deprecated, switch to Python3 .. Patch Set 17: (1 comment) https://gerrit.osmocom.org/c/pysim/+/15504/17/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/15504/17/contrib/jenkins.sh@16 PS17, Line 16: pyscard > It should be installed by apt. Installing with pip would require us to > install python-dev, gcc, etc. […] See https://git.osmocom.org/osmo-ci/tree/ansible/setup-simtest.yml#n22. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff Gerrit-Change-Number: 15504 Gerrit-PatchSet: 17 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 04 Mar 2020 07:10:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in pysim[master]: [DO NOT MERGE YET] Python2 is deprecated, switch to Python3
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/15504 ) Change subject: [DO NOT MERGE YET] Python2 is deprecated, switch to Python3 .. Patch Set 17: (2 comments) https://gerrit.osmocom.org/c/pysim/+/15504/16/README.md File README.md: https://gerrit.osmocom.org/c/pysim/+/15504/16/README.md@43 PS16, Line 43: apt-get install python3-pyscard python3-serial python3-pip Why did you change this? https://gerrit.osmocom.org/c/pysim/+/15504/17/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/15504/17/contrib/jenkins.sh@16 PS17, Line 16: pyscard It should be installed by apt. Installing with pip would require us to install python-dev, gcc, etc... -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff Gerrit-Change-Number: 15504 Gerrit-PatchSet: 17 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 04 Mar 2020 07:08:52 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: [DO NOT MERGE YET] Python2 is deprecated, switch to Python3
Hello fixeria, neels, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/15504 to look at the new patch set (#17). Change subject: [DO NOT MERGE YET] Python2 is deprecated, switch to Python3 .. [DO NOT MERGE YET] Python2 is deprecated, switch to Python3 This also makes sure that the tests are run with python3. This shound't be merged yet as part of the code still needs to be converted to python3. While this seem to work fine with ./pySim-read.py -p 0, other transports like the the serial and the osmocom tranports still depend on having python2 string encoding. This is for instance visible mostly in the PDU encoding where it depends on ord() which is different between python2 and python3. For python2 we have: ord(c) -> integer Return the integer ordinal of a one-character string. whereas for python3 we have: ord(c, /) Return the Unicode code point for a one-character string. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff --- M README.md M contrib/jenkins.sh M pySim-prog.py M pySim-read.py M pySim/card_handler.py M pySim/cards.py M pySim/commands.py M pySim/exceptions.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_51_011.py M pySim/utils.py M tests/pysim-test.sh 15 files changed, 21 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/15504/17 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/15504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff Gerrit-Change-Number: 15504 Gerrit-PatchSet: 17 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gb: Print signalling and data weights on NS-VC creation.
ipse has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17331 ) Change subject: gb: Print signalling and data weights on NS-VC creation. .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 2 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: abandon
Change in libosmocore[master]: gb: Fix typos in gprs_ns.c comments
ipse has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: abandon
Change in simtrace2[master]: extend osmo_st2_cardem_inst with fields required by osmo-remsim
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17304 ) Change subject: extend osmo_st2_cardem_inst with fields required by osmo-remsim .. extend osmo_st2_cardem_inst with fields required by osmo-remsim Change-Id: Ib568e5212abfd1269a12c9e5672cdf23b4abff91 --- M host/include/osmocom/simtrace2/simtrace2_api.h 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/host/include/osmocom/simtrace2/simtrace2_api.h b/host/include/osmocom/simtrace2/simtrace2_api.h index 012b96c..aa1637d 100644 --- a/host/include/osmocom/simtrace2/simtrace2_api.h +++ b/host/include/osmocom/simtrace2/simtrace2_api.h @@ -33,6 +33,10 @@ const struct osim_cla_ins_card_profile *card_prof; /* libosmosim SIM card channel */ struct osim_chan_hdl *chan; + /* path of the underlying USB device */ + char *usb_path; + /* opaque data TBD by user */ + void *priv; }; int osmo_st2_transp_tx_msg(struct osmo_st2_transport *transp, struct msgb *msg); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib568e5212abfd1269a12c9e5672cdf23b4abff91 Gerrit-Change-Number: 17304 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in simtrace2[master]: cosmetic: Add missing CR to LF in dispatch_received_usb_msg()
laforge has submitted this change. (
https://gerrit.osmocom.org/c/simtrace2/+/17306 )
Change subject: cosmetic: Add missing CR to LF in dispatch_received_usb_msg()
..
cosmetic: Add missing CR to LF in dispatch_received_usb_msg()
Change-Id: Ie1fc38ed4412b806e37688e0f9719573df06fd9f
---
M firmware/libcommon/source/mode_cardemu.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/firmware/libcommon/source/mode_cardemu.c
b/firmware/libcommon/source/mode_cardemu.c
index 5b17f86..6a8d98f 100644
--- a/firmware/libcommon/source/mode_cardemu.c
+++ b/firmware/libcommon/source/mode_cardemu.c
@@ -679,7 +679,7 @@
}
if (mh->msg_len > msgb_length(msg)) {
- TRACE_ERROR("%u: Unexpected large message (%u bytes)\n",
+ TRACE_ERROR("%u: Unexpected large message (%u
bytes)\r\n",
ci->num, mh->msg_len);
usb_buf_free(segm);
break;
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17306
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Ie1fc38ed4412b806e37688e0f9719573df06fd9f
Gerrit-Change-Number: 17306
Gerrit-PatchSet: 3
Gerrit-Owner: laforge
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in libosmocore[master]: gb: Fix typos in gprs_ns.c comments
ipse has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/17337 ) Change subject: gb: Fix typos in gprs_ns.c comments .. gb: Fix typos in gprs_ns.c comments Change-Id: I24605c8616015b5f7d45297afc65d6a93d2edbaf --- M src/gb/gprs_ns.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/17337/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index ac39e4a..2701d72 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -51,7 +51,7 @@ * * There can be multiple BSSGP virtual connections over one (group of) NSVC's. BSSGP will * therefore identify the BSSGP virtual connection by a BVCI passed down to NS. - * NS then has to firgure out which NSVC's are responsible for this BVCI. + * NS then has to figure out which NSVC's are responsible for this BVCI. * Those mappings are administratively configured. * * This implementation has the following limitations: @@ -1078,7 +1078,7 @@ * \param[in] msg struct msgb to be trasnmitted * * This function obtains the NS-VC by the msgb_nsei(msg) and then checks - * if the NS-VC is ALIVEV and not BLOCKED. After that, it adds a NS + * if the NS-VC is ALIVE and not BLOCKED. After that, it adds a NS * header for the NS-UNITDATA message type and sends it off. * * Section 9.2.10: transmit side / NS-UNITDATA-REQUEST primitive -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I24605c8616015b5f7d45297afc65d6a93d2edbaf Gerrit-Change-Number: 17337 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-MessageType: newchange
Change in libosmocore[master]: gb: Print signalling and data weights on NS-VC creation.
ipse has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/17338 ) Change subject: gb: Print signalling and data weights on NS-VC creation. .. gb: Print signalling and data weights on NS-VC creation. Change-Id: Ieebec5487f5d995a453d15bc024931299d5cf5bf --- M src/gb/gprs_ns.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/17338/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index 2701d72..4e584ad 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -318,7 +318,8 @@ return NULL; } - LOGP(DNS, LOGL_INFO, "NSVCI=%u Creating NS-VC\n", nsvci); + LOGP(DNS, LOGL_INFO, "NSVCI=%u Creating NS-VC with Signal weight %u, Data weight %u\n", +nsvci, sig_weight, data_weight); nsvc = talloc_zero(nsi, struct gprs_nsvc); if (!nsvc) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieebec5487f5d995a453d15bc024931299d5cf5bf Gerrit-Change-Number: 17338 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-MessageType: newchange
Change in osmo-remsim[master]: client: ifd_handler (PC/SC reader driver) as remsim-client
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/17160 to look at the new patch set (#6). Change subject: client: ifd_handler (PC/SC reader driver) as remsim-client .. client: ifd_handler (PC/SC reader driver) as remsim-client This adds a "libifd_remsim_client.so" PC/SC driver that can be used to make normal PC/SC client programs (like pySim, sysmo-usim-tool, osmo-sim-test, osmo-usim-auth, ...) talk to a remote SIM bank. Change-Id: Ib8707c6e0e46407ab39a693adfec2fa71892f6ee --- M src/client/Makefile.am M src/client/client.h A src/client/user_ifdhandler.c 3 files changed, 949 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/60/17160/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ib8707c6e0e46407ab39a693adfec2fa71892f6ee Gerrit-Change-Number: 17160 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-remsim[master]: rspro_client_fsm: Add optional notifiation of parent on connect/disco...
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-remsim/+/17336 )
Change subject: rspro_client_fsm: Add optional notifiation of parent on
connect/disconnect
..
rspro_client_fsm: Add optional notifiation of parent on connect/disconnect
This will be useful once we introduce a 'main' client FSM that is a
parent to the rspro_client_fsms.
Change-Id: Ifddb8e0b5c991e5348392c9e44612669ce207bc4
---
M src/rspro_client_fsm.c
M src/rspro_client_fsm.h
2 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/36/17336/1
diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c
index 2c1c029..e55892c 100644
--- a/src/rspro_client_fsm.c
+++ b/src/rspro_client_fsm.c
@@ -244,6 +244,14 @@
}
}
+static void srvc_st_connected_onenter(struct osmo_fsm_inst *fi, uint32_t
prev_state)
+{
+ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv;
+
+ if (fi->proc.parent)
+ osmo_fsm_inst_dispatch(fi->proc.parent, srvc->parent_conn_evt,
NULL);
+}
+
static void srvc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void
*data)
{
struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv;
@@ -263,6 +271,14 @@
}
}
+static void srvc_st_connected_onleave(struct osmo_fsm_inst *fi, uint32_t
next_state)
+{
+ struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv;
+
+ if (fi->proc.parent)
+ osmo_fsm_inst_dispatch(fi->proc.parent, srvc->parent_disc_evt,
NULL);
+}
+
static int ipa_kaepalive_timeout_cb(struct osmo_fsm_inst *ka_fi, void *conn)
{
struct osmo_fsm_inst *fi = ka_fi->proc.parent;
@@ -396,6 +412,8 @@
.in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT) |
S(SRVC_E_RSPRO_TX),
.out_state_mask = S(SRVC_ST_REESTABLISH) | S(SRVC_ST_INIT),
.action = srvc_st_connected,
+ .onenter = srvc_st_connected_onenter,
+ .onleave = srvc_st_connected_onleave,
},
[SRVC_ST_REESTABLISH] = {
.name = "REESTABLISH",
diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h
index c1ae764..029fcd9 100644
--- a/src/rspro_client_fsm.h
+++ b/src/rspro_client_fsm.h
@@ -41,6 +41,10 @@
char *server_host;
uint16_t server_port;
+ /* FSM events we are to sent to the parent FSM on connect / disconnect
*/
+ uint32_t parent_conn_evt;
+ uint32_t parent_disc_evt;
+
/* only in case we are representing a bankd client */
struct {
uint16_t bank_id;
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17336
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: Ifddb8e0b5c991e5348392c9e44612669ce207bc4
Gerrit-Change-Number: 17336
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-remsim[master]: update .gitignore
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17334 ) Change subject: update .gitignore .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ifa91ec3e8c75becd5652be29c964b0865c2e7b5a Gerrit-Change-Number: 17334 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Mar 2020 20:16:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-remsim[master]: update .gitignore
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17334 ) Change subject: update .gitignore .. update .gitignore Change-Id: Ifa91ec3e8c75becd5652be29c964b0865c2e7b5a --- M .gitignore 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 00378bc..e2546a0 100644 --- a/.gitignore +++ b/.gitignore @@ -30,8 +30,8 @@ m4 gen_rspro.stamp -src/osmo-remsim-client -src/osmo-remsim-client-st2 +src/client/osmo-remsim-client-shell +src/client/osmo-remsim-client-st2 src/bankd/pcsc_test src/bankd/osmo-remsim-bankd src/server/osmo-remsim-server -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ifa91ec3e8c75becd5652be29c964b0865c2e7b5a Gerrit-Change-Number: 17334 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in simtrace2[master]: extend osmo_st2_cardem_inst with fields required by osmo-remsim
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/17304 ) Change subject: extend osmo_st2_cardem_inst with fields required by osmo-remsim .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/17304 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ib568e5212abfd1269a12c9e5672cdf23b4abff91 Gerrit-Change-Number: 17304 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Mar 2020 20:15:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-remsim[master]: update .gitignore
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/17334 ) Change subject: update .gitignore .. update .gitignore Change-Id: Ifa91ec3e8c75becd5652be29c964b0865c2e7b5a --- M .gitignore 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/34/17334/1 diff --git a/.gitignore b/.gitignore index 00378bc..e2546a0 100644 --- a/.gitignore +++ b/.gitignore @@ -30,8 +30,8 @@ m4 gen_rspro.stamp -src/osmo-remsim-client -src/osmo-remsim-client-st2 +src/client/osmo-remsim-client-shell +src/client/osmo-remsim-client-st2 src/bankd/pcsc_test src/bankd/osmo-remsim-bankd src/server/osmo-remsim-server -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Ifa91ec3e8c75becd5652be29c964b0865c2e7b5a Gerrit-Change-Number: 17334 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in osmo-remsim[master]: rspro_client_fsm: Migrate to ipa_client_conn_create2()
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-remsim/+/17335 )
Change subject: rspro_client_fsm: Migrate to ipa_client_conn_create2()
..
rspro_client_fsm: Migrate to ipa_client_conn_create2()
libosmo-abis 0.8.0 has deprecated ipa_client_conn_create() and this
follow-up patch avoids the related deprecation compiler warnings.
Change-Id: I0057c5b6a79e7226e87983c14eb2b0ed2af2a131
---
M configure.ac
M src/rspro_client_fsm.c
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/35/17335/1
diff --git a/configure.ac b/configure.ac
index 1c9cd72..f8dc0c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@
PKG_CHECK_MODULES(OSMOCORE, libosmocore >= 1.3.0)
PKG_CHECK_MODULES(OSMOGSM, libosmogsm >= 0.11.0)
-PKG_CHECK_MODULES(OSMOABIS, libosmoabis)
+PKG_CHECK_MODULES(OSMOABIS, libosmoabis >= 0.8.0)
AC_ARG_ENABLE([remsim-server],[AS_HELP_STRING([--disable-remsim-server],
[Build osmo-remsim-server])],
[osmo_ac_build_server="$enableval"],[osmo_ac_build_server="yes"])
diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c
index b006809..2c1c029 100644
--- a/src/rspro_client_fsm.c
+++ b/src/rspro_client_fsm.c
@@ -289,7 +289,7 @@
}
LOGPFSML(fi, LOGL_INFO, "Creating TCP connection to server at %s:%u\n",
srvc->server_host, srvc->server_port);
- srvc->conn = ipa_client_conn_create(fi, NULL, 0, srvc->server_host,
srvc->server_port,
+ srvc->conn = ipa_client_conn_create2(fi, NULL, 0, NULL, 0,
srvc->server_host, srvc->server_port,
srvc_updown_cb, srvc_read_cb,
NULL, srvc);
if (!srvc->conn) {
LOGPFSML(fi, LOGL_FATAL, "Unable to create socket: %s\n",
strerror(errno));
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/17335
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I0057c5b6a79e7226e87983c14eb2b0ed2af2a131
Gerrit-Change-Number: 17335
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in libosmocore.git[master]: gb: Print signalling and data weights on NS-VC creation.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Print signalling and data weights on NS-VC creation. .. Patch Set 2: Code-Review+2 looks good to me. As pespin stated in the other patch: You created a new project/repo called libosmocore.git here on gerrit. Please re-push to the correct repo name libosmocore and abandond the two patches for libosmocore.git. This way we'll get build verification and can actually merge it master. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 2 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 19:50:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Patch Set 1: As pespin stated: You created a new project/repo called libosmocore.git here on gerrit. Please re-push to the correct repo name libosmocore and abandond the two patches for libosmocore.git. This way we'll get build verification and can actually merge it master. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 03 Mar 2020 19:50:54 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Patch Set 1: > Patch Set 1: > > > Patch Set 1: > > > > I wonder why the jenkins build verification hasn't kicked in yet? > > Not sure if this helps but Gerrit also doesn't sync with cgit - I've pushed a > private brunch an hour ago and it's still not in cgit. The repository name you're pushing to looks odd. It should be 'libosmocore', without '.git'. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 03 Mar 2020 18:58:32 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
ipse has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Patch Set 1: > Patch Set 1: > > I wonder why the jenkins build verification hasn't kicked in yet? Not sure if this helps but Gerrit also doesn't sync with cgit - I've pushed a private brunch an hour ago and it's still not in cgit. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:40:51 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Print signalling and data weights on NS-VC creation.
ipse has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Print signalling and data weights on NS-VC creation. .. Patch Set 2: Ok, I've removed the second chunk and replaces %d with %u. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 2 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:34:48 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Print signalling and data weights on NS-VC creation.
Hello lynxis lazus, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 to look at the new patch set (#2). Change subject: gb: Print signalling and data weights on NS-VC creation. .. gb: Print signalling and data weights on NS-VC creation. Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 --- M src/gb/gprs_ns.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore.git refs/changes/31/17331/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 2 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-ci[master]: poky-sdk: Use first letter in caps (as in python bool)
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/17147 )
Change subject: poky-sdk: Use first letter in caps (as in python bool)
..
poky-sdk: Use first letter in caps (as in python bool)
Same as done in install-coverity/tasks/main.yml.
Change-Id: Ifbfe678e89bef3acd33e562888ad81093fa1230d
---
M ansible/roles/install-poky-sdk/tasks/main.yml
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Verified
diff --git a/ansible/roles/install-poky-sdk/tasks/main.yml
b/ansible/roles/install-poky-sdk/tasks/main.yml
index 7f95dce..ff65c1b 100644
--- a/ansible/roles/install-poky-sdk/tasks/main.yml
+++ b/ansible/roles/install-poky-sdk/tasks/main.yml
@@ -21,7 +21,7 @@
command: "/tmp/{{ poky_installer_file }} -y -d '{{ poky_dest }}'"
args:
creates: "{{ poky_dest }}"
- when: poky_copy.failed == false
+ when: poky_copy.failed == False
tags: [poky]
- name: change owner/group to jenkins user
@@ -30,18 +30,18 @@
owner: "{{ jenkins_user }}"
group: "{{ jenkins_user }}"
recurse: yes
- when: poky_copy.failed == false
+ when: poky_copy.failed == False
tags: [poky]
- name: remove poky installer
file:
path: "/tmp/{{ poky_installer_file }}"
state: absent
- when: poky_copy.failed == false
+ when: poky_copy.failed == False
tags: [poky]
- name: "Please download {{ poky_installer_file }} to your ansible directory
to allow ansible to install poky"
debug:
msg: "Ansible can not find or copy {{ poky_installer_file }}"
- when: poky_copy.failed
+ when: poky_copy.failed == True
tags: [poky]
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17147
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ifbfe678e89bef3acd33e562888ad81093fa1230d
Gerrit-Change-Number: 17147
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: poky-sdk: Use first letter in caps (as in python bool)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17147 ) Change subject: poky-sdk: Use first letter in caps (as in python bool) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifbfe678e89bef3acd33e562888ad81093fa1230d Gerrit-Change-Number: 17147 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:26:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/17329 )
Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
..
contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
Some jenkins slaves may not need docker (or even have it installed).
Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 275fc69..3ab942a 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -10,6 +10,6 @@
git rev-parse HEAD
git status
-if [ `uname` = "Linux" ]; then
+if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" != "x1" ]; then
scripts/osmo-ci-docker-rebuild.sh
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97
Gerrit-Change-Number: 17329
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17329 ) Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97 Gerrit-Change-Number: 17329 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:25:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: parity: add amr crc14 definition
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17325 ) Change subject: parity: add amr crc14 definition .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900 Gerrit-Change-Number: 17325 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:25:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: conv: add convolutional coder for AMR SID UPDATE frames
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17326 ) Change subject: conv: add convolutional coder for AMR SID UPDATE frames .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Gerrit-Change-Number: 17326 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:24:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Patch Set 1: I wonder why the jenkins build verification hasn't kicked in yet? -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:24:04 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Logging improvements.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Logging improvements. .. Patch Set 1: Code-Review-1 (2 comments) unless I'm missing something, this actually removes useful features (like sending a NS-STATUS in response to the unexpected NS-ALIVE) and just moves the loggign around? https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c@321 PS1, Line 321: %d, Data weight % formally correct would be %u as it's unsigned integers. Sure, with uint8_t an int should never overflow, so no practical issue. https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c@1678 PS1, Line 1678: return GPRS_NS_CS_REJECTED; > I'm just trying to understand the patch in relation to your issue > description. […] I agree with pespin here, from INFO level it should have shown up exactly in line 1655 above "Rejecting NS PDU type ...". The advantage of the old log line is that you could use the log filters (as it sets the nsvc context). Also, it actually returns a NS-STATUS informing the peer about the cause of the reject. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:23:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: ipse Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Logging improvements.
ipse has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Logging improvements. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c@1678 PS1, Line 1678: return GPRS_NS_CS_REJECTED; > I'm just trying to understand the patch in relation to your issue > description. […] Good point. I now also wonder why didn't I see this, maybe several things got combined. I'll re-submit this patch without the NS-ALIVE specific logging . -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:15:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: ipse Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gitignore: Add *.d files
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332 ) Change subject: gitignore: Add *.d files .. gitignore: Add *.d files my ggsn_tests directory becomes bull of those files after make ggsn_tests. Change-Id: Iece4dc883db95c2ea3b6c50a55ff34022a4c0bd6 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 41add91..5c8caa5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ !deps/Makefile .*.sw? *.netcat.stderr +*.d -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332 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: Iece4dc883db95c2ea3b6c50a55ff34022a4c0bd6 Gerrit-Change-Number: 17332 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 16:05:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: ggsn: Terminate immediately on pipong altstep failure
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17333 )
Change subject: ggsn: Terminate immediately on pipong altstep failure
..
ggsn: Terminate immediately on pipong altstep failure
Change-Id: I1ae66afc562c6bf968b0b3bfa9a254fac0bd7404
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 40506df..be0e565 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -14,6 +14,7 @@
import from General_Types all;
import from Osmocom_Types all;
+ import from Misc_Helpers all;
import from IPL4asp_PortType all;
import from IPL4asp_Types all;
import from GTP_CodecPort all;
@@ -209,9 +210,13 @@
repeat;
};
[not g_use_echo] GTPC.receive(tr_GTPC_PING(?)) {
- setverdict(fail, "GTP Echo Req rceived but not enabled
in VTY");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "GTP Echo Req rceived but not
enabled in VTY");
};
- [] T_default.timeout { setverdict(fail); };
+ [] T_default.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "pinpong T_default timeout");
+ };
}
/* 'internet' in DNS encoding */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17333
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: I1ae66afc562c6bf968b0b3bfa9a254fac0bd7404
Gerrit-Change-Number: 17333
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: gitignore: Add *.d files
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332 ) Change subject: gitignore: Add *.d files .. Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332/1//COMMIT_MSG@9 PS1, Line 9: bull and what about horses? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332 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: Iece4dc883db95c2ea3b6c50a55ff34022a4c0bd6 Gerrit-Change-Number: 17332 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Mar 2020 16:04:35 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: ggsn: Terminate immediately on pipong altstep failure
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17333 ) Change subject: ggsn: Terminate immediately on pipong altstep failure .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17333 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: I1ae66afc562c6bf968b0b3bfa9a254fac0bd7404 Gerrit-Change-Number: 17333 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Mar 2020 16:05:06 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: gitignore: Add *.d files
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332 ) Change subject: gitignore: Add *.d files .. gitignore: Add *.d files my ggsn_tests directory becomes bull of those files after make ggsn_tests. Change-Id: Iece4dc883db95c2ea3b6c50a55ff34022a4c0bd6 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/17332/1 diff --git a/.gitignore b/.gitignore index 41add91..5c8caa5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ !deps/Makefile .*.sw? *.netcat.stderr +*.d -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17332 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: Iece4dc883db95c2ea3b6c50a55ff34022a4c0bd6 Gerrit-Change-Number: 17332 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: ggsn: Terminate immediately on pipong altstep failure
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17333 )
Change subject: ggsn: Terminate immediately on pipong altstep failure
..
ggsn: Terminate immediately on pipong altstep failure
Change-Id: I1ae66afc562c6bf968b0b3bfa9a254fac0bd7404
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/33/17333/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 40506df..be0e565 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -14,6 +14,7 @@
import from General_Types all;
import from Osmocom_Types all;
+ import from Misc_Helpers all;
import from IPL4asp_PortType all;
import from IPL4asp_Types all;
import from GTP_CodecPort all;
@@ -209,9 +210,13 @@
repeat;
};
[not g_use_echo] GTPC.receive(tr_GTPC_PING(?)) {
- setverdict(fail, "GTP Echo Req rceived but not enabled
in VTY");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "GTP Echo Req rceived but not
enabled in VTY");
};
- [] T_default.timeout { setverdict(fail); };
+ [] T_default.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "pinpong T_default timeout");
+ };
}
/* 'internet' in DNS encoding */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17333
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: I1ae66afc562c6bf968b0b3bfa9a254fac0bd7404
Gerrit-Change-Number: 17333
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in libosmocore.git[master]: gb: Logging improvements.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Logging improvements. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c@1678 PS1, Line 1678: return GPRS_NS_CS_REJECTED; > In practice, it was ignored silently, i.e. no error messages were sent. […] I'm just trying to understand the patch in relation to your issue description. If you have INFO level enabled you should have seen the log message in line 1664 anyway right? I'm not very knowledgeable on gprs-ns, so I'll wait for someone else to comment. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 15:38:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: ipse Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Logging improvements.
ipse has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Logging improvements. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c@1678 PS1, Line 1678: return GPRS_NS_CS_REJECTED; > iiuc it was returning over this path before? so it wasn't silently ignored. In practice, it was ignored silently, i.e. no error messages were sent. I guess because an NSVC is not yet established, so we don't know where to send them. But I haven't bug into this deep - I just observed this in Wireshark. We can change the return code above to GPRS_NS_CS_REJECTED if you think it makes more sense in the cases I haven't observed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: ipse Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 15:32:14 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Logging improvements.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17331 ) Change subject: gb: Logging improvements. .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c File src/gb/gprs_ns.c: https://gerrit.osmocom.org/c/libosmocore.git/+/17331/1/src/gb/gprs_ns.c@1678 PS1, Line 1678: return GPRS_NS_CS_REJECTED; iiuc it was returning over this path before? so it wasn't silently ignored. -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91 Gerrit-Change-Number: 17331 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 15:18:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 15:15:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore.git[master]: gb: Fix typos in gprs_ns.c comments
ipse has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore.git/+/17330 ) Change subject: gb: Fix typos in gprs_ns.c comments .. gb: Fix typos in gprs_ns.c comments Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 --- M src/gb/gprs_ns.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore.git refs/changes/30/17330/1 diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index ac39e4a..2701d72 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -51,7 +51,7 @@ * * There can be multiple BSSGP virtual connections over one (group of) NSVC's. BSSGP will * therefore identify the BSSGP virtual connection by a BVCI passed down to NS. - * NS then has to firgure out which NSVC's are responsible for this BVCI. + * NS then has to figure out which NSVC's are responsible for this BVCI. * Those mappings are administratively configured. * * This implementation has the following limitations: @@ -1078,7 +1078,7 @@ * \param[in] msg struct msgb to be trasnmitted * * This function obtains the NS-VC by the msgb_nsei(msg) and then checks - * if the NS-VC is ALIVEV and not BLOCKED. After that, it adds a NS + * if the NS-VC is ALIVE and not BLOCKED. After that, it adds a NS * header for the NS-UNITDATA message type and sends it off. * * Section 9.2.10: transmit side / NS-UNITDATA-REQUEST primitive -- To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore.git Gerrit-Branch: master Gerrit-Change-Id: Ibfb974b3bd1faf6df0c8fa7a1f7a5309c93d9e50 Gerrit-Change-Number: 17330 Gerrit-PatchSet: 1 Gerrit-Owner: ipse Gerrit-MessageType: newchange
Change in libosmocore.git[master]: gb: Logging improvements.
ipse has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore.git/+/17331 )
Change subject: gb: Logging improvements.
..
gb: Logging improvements.
1. Print signalling and data weights on NS-VC creation.
2. Print an INFO message when we receive a NS-ALIVE from an unknown
IP:port. Before that it was ignored silently which was making
configuration debugging difficult for standard-compliant Gb over IP.
Now you can easily see that an SGSN is trying to connect to us.
Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91
---
M src/gb/gprs_ns.c
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore.git
refs/changes/31/17331/1
diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c
index 2701d72..26c80c4 100644
--- a/src/gb/gprs_ns.c
+++ b/src/gb/gprs_ns.c
@@ -318,7 +318,8 @@
return NULL;
}
- LOGP(DNS, LOGL_INFO, "NSVCI=%u Creating NS-VC\n", nsvci);
+ LOGP(DNS, LOGL_INFO, "NSVCI=%u Creating NS-VC Signal weight %d, Data
weight %d\n",
+nsvci, sig_weight, data_weight);
nsvc = talloc_zero(nsi, struct gprs_nsvc);
if (!nsvc)
@@ -1632,6 +1633,14 @@
return GPRS_NS_CS_SKIPPED;
}
+ if (nsh->pdu_type == NS_PDUT_ALIVE) {
+ /* Ignore this, see 3GPP TS 08.16, 7.4.1 */
+ LOGP(DNS, LOGL_INFO, "Ignoring NS ALIVE from %s "
+"for non-existing NS-VC\n",
+gprs_ns_ll_str(fallback_nsvc));
+ return GPRS_NS_CS_SKIPPED;
+ }
+
if (nsh->pdu_type == NS_PDUT_ALIVE_ACK) {
/* Ignore this, see 3GPP TS 08.16, 7.4.1 */
LOGP(DNS, LOGL_INFO, "Ignoring NS ALIVE ACK from %s "
--
To view, visit https://gerrit.osmocom.org/c/libosmocore.git/+/17331
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore.git
Gerrit-Branch: master
Gerrit-Change-Id: Ic145bcc54e3f0779ea9e284216831b17ab22eb91
Gerrit-Change-Number: 17331
Gerrit-PatchSet: 1
Gerrit-Owner: ipse
Gerrit-MessageType: newchange
Change in osmo-ccid-firmware[master]: generic improvements for the testsbed
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 ) Change subject: generic improvements for the testsbed .. Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1//COMMIT_MSG@7 PS1, Line 7: generic improvements for the testsbed: > first line of the commit log message should be brief one-line summary > followed by empty line before […] done https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.out File tests/sysmo-octsim/05_flash_dfu_from_app.out: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.out@12 PS1, Line 12: Run-time device DFU version 0100 > this kind of matching of the full stdout will break every time the > distribution updates dfu-util... […] i think this is ok, since we do not update that often (0.9 is in there for ages) and the output lets us find out which way dfu was run (from app mode or from bootloader - we test both) https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.sh File tests/sysmo-octsim/05_flash_dfu_from_app.sh: https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257/1/tests/sysmo-octsim/05_flash_dfu_from_app.sh@3 PS1, Line 3: > is it intentional that we continue this script even if one of the called > scripts return error? Othe […] changed all scripts but the main testwalker to use set -e -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 Gerrit-Change-Number: 17257 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roh Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 03 Mar 2020 12:54:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-ccid-firmware[master]: generic improvements for the testsbed
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 to look at the new patch set (#2). Change subject: generic improvements for the testsbed .. generic improvements for the testsbed * fix run-tests so it can return != 0 * bail out if prepare fails * add more sanity checks to prepare * generalize usb-ids, paths * add test for flashing from application mode * add test reading simcards via pysim Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 --- M tests/run-tests M tests/sysmo-octsim/01_check_rig.sh M tests/sysmo-octsim/02_flash_dfu.sh M tests/sysmo-octsim/03_check_lsusb.sh M tests/sysmo-octsim/04_check_dfu_lsusb.sh A tests/sysmo-octsim/05_flash_dfu_from_app.out A tests/sysmo-octsim/05_flash_dfu_from_app.sh A tests/sysmo-octsim/06_test_simcards.out A tests/sysmo-octsim/06_test_simcards.sh M tests/sysmo-octsim/README A tests/sysmo-octsim/ctl_get_relay_sn.sh M tests/sysmo-octsim/ctl_reset_target.sh M tests/sysmo-octsim/ctl_reset_to_dfu.sh M tests/sysmo-octsim/fetch_image.sh M tests/sysmo-octsim/flash_octsim_dfu.sh M tests/sysmo-octsim/get_installed_version.sh M tests/sysmo-octsim/prepare M tests/sysmo-octsim/regen M tests/sysmo-octsim/run-tests M tests/sysmo-octsim/test-data 20 files changed, 214 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/57/17257/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/17257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I246224e29e5936b4fe40cf7d7a5ff83c9940d121 Gerrit-Change-Number: 17257 Gerrit-PatchSet: 2 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in libosmocore[master]: parity: add amr crc14 definition
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17325 ) Change subject: parity: add amr crc14 definition .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900 Gerrit-Change-Number: 17325 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 11:54:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: conv: add convolutional coder for AMR SID UPDATE frames
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17326 ) Change subject: conv: add convolutional coder for AMR SID UPDATE frames .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Gerrit-Change-Number: 17326 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 11:52:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17329 ) Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1 .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97 Gerrit-Change-Number: 17329 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 11:49:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17329 ) Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1 .. Patch Set 2: Code-Review+1 I was wondering whether it makes sense to run the job at all for these slaves, because what else does it do? But the remaining bit is checking out osmo-ci scripts to ~/osmo-ci, so it makes sense. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97 Gerrit-Change-Number: 17329 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 11:40:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17329 ) Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1 .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97 Gerrit-Change-Number: 17329 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 11:35:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/17329 )
Change subject: contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
..
contrib/jenkins: Avoid docker setup if OSMO_CI_NO_DOCKER=1
Some jenkins slaves may not need docker (or even have it installed).
Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/17329/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 275fc69..e8716c4 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -10,6 +10,6 @@
git rev-parse HEAD
git status
-if [ `uname` = "Linux" ]; then
+if [ `uname` = "Linux" ] && [ "x${OSMO_CI_NO_DOCKER}" = "x1" ]; then
scripts/osmo-ci-docker-rebuild.sh
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17329
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ibfc4a81d3d621503b40204b7452ead56c726af97
Gerrit-Change-Number: 17329
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs: update-osmo-python-on-slaves: osmo-python not required in simte...
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17328 ) Change subject: jobs: update-osmo-python-on-slaves: osmo-python not required in simtester node .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia3728cf9296eab8db49274e4da64249e497726d1 Gerrit-Change-Number: 17328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 03 Mar 2020 11:27:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: update-osmo-python-on-slaves: osmo-python not required in simte...
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17328 ) Change subject: jobs: update-osmo-python-on-slaves: osmo-python not required in simtester node .. jobs: update-osmo-python-on-slaves: osmo-python not required in simtester node Change-Id: Ia3728cf9296eab8db49274e4da64249e497726d1 --- M jobs/update-osmo-python-on-slaves.yml 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 5ef3fd5..ab433a6 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -6,7 +6,6 @@ type: slave name: label values: -- simtester - admin2-deb8build - admin2-deb9build - host2-deb8build-ansible -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia3728cf9296eab8db49274e4da64249e497726d1 Gerrit-Change-Number: 17328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in osmo-ci[master]: jobs: update-osmo-python-on-slaves: osmo-python not required in simte...
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17328 ) Change subject: jobs: update-osmo-python-on-slaves: osmo-python not required in simtester node .. jobs: update-osmo-python-on-slaves: osmo-python not required in simtester node Change-Id: Ia3728cf9296eab8db49274e4da64249e497726d1 --- M jobs/update-osmo-python-on-slaves.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/17328/1 diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 5ef3fd5..ab433a6 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -6,7 +6,6 @@ type: slave name: label values: -- simtester - admin2-deb8build - admin2-deb9build - host2-deb8build-ansible -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17328 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia3728cf9296eab8db49274e4da64249e497726d1 Gerrit-Change-Number: 17328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ci[master]: jobs: jenkins simtest node is named simtester
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17327 ) Change subject: jobs: jenkins simtest node is named simtester .. jobs: jenkins simtest node is named simtester simtest node doesn't exist, it's called simtester. Fixes: 3935743127633815b068cd57469775722c3710e3 Change-Id: Id703a85298b163e7e95bb89f6a69ab51e29effb4 --- M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Verified diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 0a42f6b..16c4ceb 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -6,7 +6,7 @@ type: slave name: label values: -- simtest +- simtester - admin2-deb8build - admin2-deb9build - host2-deb8build-ansible diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 91113b3..5ef3fd5 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -6,7 +6,7 @@ type: slave name: label values: -- simtest +- simtester - admin2-deb8build - admin2-deb9build - host2-deb8build-ansible -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id703a85298b163e7e95bb89f6a69ab51e29effb4 Gerrit-Change-Number: 17327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: jobs: jenkins simtest node is named simtester
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17327 ) Change subject: jobs: jenkins simtest node is named simtester .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id703a85298b163e7e95bb89f6a69ab51e29effb4 Gerrit-Change-Number: 17327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 03 Mar 2020 11:06:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: jenkins simtest node is named simtester
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17327 ) Change subject: jobs: jenkins simtest node is named simtester .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id703a85298b163e7e95bb89f6a69ab51e29effb4 Gerrit-Change-Number: 17327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 11:06:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: jenkins simtest node is named simtester
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/17327 ) Change subject: jobs: jenkins simtest node is named simtester .. jobs: jenkins simtest node is named simtester simtest node doesn't exist, it's called simtester. Fixes: 3935743127633815b068cd57469775722c3710e3 Change-Id: Id703a85298b163e7e95bb89f6a69ab51e29effb4 --- M jobs/update-osmo-ci-on-slaves.yml M jobs/update-osmo-python-on-slaves.yml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/27/17327/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 0a42f6b..16c4ceb 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -6,7 +6,7 @@ type: slave name: label values: -- simtest +- simtester - admin2-deb8build - admin2-deb9build - host2-deb8build-ansible diff --git a/jobs/update-osmo-python-on-slaves.yml b/jobs/update-osmo-python-on-slaves.yml index 91113b3..5ef3fd5 100644 --- a/jobs/update-osmo-python-on-slaves.yml +++ b/jobs/update-osmo-python-on-slaves.yml @@ -6,7 +6,7 @@ type: slave name: label values: -- simtest +- simtester - admin2-deb8build - admin2-deb9build - host2-deb8build-ansible -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17327 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id703a85298b163e7e95bb89f6a69ab51e29effb4 Gerrit-Change-Number: 17327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in libosmocore[master]: osmo-sim-test: check tlv_parsed struct tp before access
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17269 ) Change subject: osmo-sim-test: check tlv_parsed struct tp before access .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Gerrit-Change-Number: 17269 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 10:39:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: parity: add amr crc14 definition
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/17325 to look at the new patch set (#2). Change subject: parity: add amr crc14 definition .. parity: add amr crc14 definition AMR not only specifies a 6 bit CRC for regular voice information. It also specifies a 14 bit CRC to protect the comfort noise updates contained in the SID_UPDATE frames. Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900 Related: OS#2978 --- M include/osmocom/coding/gsm0503_parity.h M src/coding/gsm0503_parity.c M src/coding/libosmocoding.map 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/17325/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900 Gerrit-Change-Number: 17325 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: conv: add convolutional coder for AMR SID UPDATE frames
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/17326 to look at the new patch set (#2). Change subject: conv: add convolutional coder for AMR SID UPDATE frames .. conv: add convolutional coder for AMR SID UPDATE frames AMR SID update frames are protected using an 1/4 convolutional coder, wich is similar to the one used with 6,7 kbit voice frames. Except that there is no puncturing and the length is different. Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Related: OS#2978 --- M src/gsm/libosmogsm.map M tests/conv/conv_gsm0503_test.ok M utils/conv_codes_gsm.py 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/17326/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Gerrit-Change-Number: 17326 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: osmo-sim-test: check tlv_parsed struct tp before access
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/17269 to look at the new patch set (#4). Change subject: osmo-sim-test: check tlv_parsed struct tp before access .. osmo-sim-test: check tlv_parsed struct tp before access The variable struct tlv_parsed tp in dump_file() conditionally initalized by tlv_parse() but later it is accessed under a different condition without a check that makes sure that tp is only accessed when tlv_parse() was called beforehand. Lets introduce a check that makes sure tp can not be accessed when it is uninitalized. Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Fixes: CID#208435 --- M utils/osmo-sim-test.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/17269/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Gerrit-Change-Number: 17269 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: osmo-sim-test: check tlv_parsed struct tp before access
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/17269 to look at the new patch set (#3). Change subject: osmo-sim-test: check tlv_parsed struct tp before access .. osmo-sim-test: check tlv_parsed struct tp before access The variable struct tlv_parsed tp in dump_file() conditionally initalized by tlv_parse() but later it is accessed under a different condition without a check that makes sure that tp is only accessed when tlv_parse() was called beforehand. Lets introduce a check that makes sure tp can not be accessed when it is uninitalized. Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Fixes: CID#208435 --- M utils/osmo-sim-test.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/17269/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Gerrit-Change-Number: 17269 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: osmo-sim-test: initalize tlv_parsed structure with zeros
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/17269 to look at the new patch set (#2). Change subject: osmo-sim-test: initalize tlv_parsed structure with zeros .. osmo-sim-test: initalize tlv_parsed structure with zeros The variable struct tlv_parsed tp in dump_file() is not pre-initalized. Lets make sure that it is pre-initalized to avoid accessing uninitalized memory in error/corner cases. Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Fixes: CID#208435 --- M utils/osmo-sim-test.c 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/17269/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17269 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b0209b966127a4195e6f4bcb43d49387c7646ce Gerrit-Change-Number: 17269 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: conv: add convolutional coder for AMR SID UPDATE frames
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17326 ) Change subject: conv: add convolutional coder for AMR SID UPDATE frames .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/17326/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/17326/1//COMMIT_MSG@11 PS1, Line 11: there is no puncturing and the length is differen. typo: different. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Gerrit-Change-Number: 17326 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 10:19:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: parity: add amr crc14 definition
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/17325 ) Change subject: parity: add amr crc14 definition .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/17325/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/17325/1//COMMIT_MSG@10 PS1, Line 10: specifies a 16 bit CRC to protect the comfort noise updates contained in it says 16 here but 14 in the first line. One of them is wrong? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17325 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900 Gerrit-Change-Number: 17325 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 10:18:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ggsn[master]: lib/netns: fix open_ns(): return fd from open()
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17324 ) Change subject: lib/netns: fix open_ns(): return fd from open() .. lib/netns: fix open_ns(): return fd from open() Looks like a bug introduced by I9b9c8fd6eeaaa7d190b8e2a34ca82088904c7708. Change-Id: I38caf5541ca90638ed10714adfbb08120e5397b9 Fixes: CID#208656 --- M lib/netns.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/lib/netns.c b/lib/netns.c index bd2076b..58ae036 100644 --- a/lib/netns.c +++ b/lib/netns.c @@ -96,7 +96,7 @@ return -rc; } - return 0; + return fd; } int socket_ns(int nsfd, int domain, int type, int protocol) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I38caf5541ca90638ed10714adfbb08120e5397b9 Gerrit-Change-Number: 17324 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ggsn[master]: lib/netns: fix open_ns(): return fd from open()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17324 ) Change subject: lib/netns: fix open_ns(): return fd from open() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I38caf5541ca90638ed10714adfbb08120e5397b9 Gerrit-Change-Number: 17324 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:23:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: utils: Add limits.d dir with sample config files
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17318 ) Change subject: utils: Add limits.d dir with sample config files .. utils: Add limits.d dir with sample config files Same as the ones described in osmo-gsm-tester User Manual and same as ones deployed by ansible scripts. Let's rather keep them here. Change-Id: I8b124a8a1637666536772439b920e7b91e61533c --- A utils/limits.d/osmo-gsm-tester_allow-rtprio.conf A utils/limits.d/osmo-gsm-tester_allowcore.conf 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/utils/limits.d/osmo-gsm-tester_allow-rtprio.conf b/utils/limits.d/osmo-gsm-tester_allow-rtprio.conf new file mode 100644 index 000..7fa6136 --- /dev/null +++ b/utils/limits.d/osmo-gsm-tester_allow-rtprio.conf @@ -0,0 +1 @@ +@osmo-gsm-tester - rtprio 99 diff --git a/utils/limits.d/osmo-gsm-tester_allowcore.conf b/utils/limits.d/osmo-gsm-tester_allowcore.conf new file mode 100644 index 000..5eee2f9 --- /dev/null +++ b/utils/limits.d/osmo-gsm-tester_allowcore.conf @@ -0,0 +1 @@ +@osmo-gsm-tester - core unlimited -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8b124a8a1637666536772439b920e7b91e61533c Gerrit-Change-Number: 17318 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: update-osmo-ci-slaves: Fail jenkins jobs on script failure
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17275 ) Change subject: update-osmo-ci-slaves: Fail jenkins jobs on script failure .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab9bc49eebee0f42657ff3ab5ffaa10315446440 Gerrit-Change-Number: 17275 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: update-osmo-ci-slaves: Fail jenkins jobs on script failure
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17275 ) Change subject: update-osmo-ci-slaves: Fail jenkins jobs on script failure .. update-osmo-ci-slaves: Fail jenkins jobs on script failure It's been noted that jenkins job update-osmo-ci-on-slaves succeeds even if make script called by some children function fails: """ ../make/Makefile:57: recipe for target 'docker-build' failed make: *** [docker-build] Terminated make: Leaving directory '/home/osmocom-build/osmo-ci/_docker_playground/debian-stretch-jenkins' + exit 1 Finished: SUCCESS """ Change-Id: Iab9bc49eebee0f42657ff3ab5ffaa10315446440 --- M scripts/common.sh M scripts/osmo-ci-docker-rebuild.sh 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve pespin: Verified diff --git a/scripts/common.sh b/scripts/common.sh index 1c2dfe0..af7c354 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -153,6 +153,7 @@ # Subshell: run docker_images_require from jenkins-common.sh, pass all arguments (. ../jenkins-common.sh; docker_images_require "$@") - + ret=$? cd "$oldpwd" + return $ret } diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 943b5a0..6a1cc27 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e -x cd "$(dirname "$0")/.." . scripts/common.sh docker_images_require \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17275 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iab9bc49eebee0f42657ff3ab5ffaa10315446440 Gerrit-Change-Number: 17275 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: utils: Add limits.d dir with sample config files
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17318 ) Change subject: utils: Add limits.d dir with sample config files .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17318 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8b124a8a1637666536772439b920e7b91e61533c Gerrit-Change-Number: 17318 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:22:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue: Enable pcap through config file
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17311 ) Change subject: srsue: Enable pcap through config file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I15219d707aea778fefa8911362278442fa09550c Gerrit-Change-Number: 17311 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue, srsenb: Fix zmq base_rate calculation and share value
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17312 ) Change subject: srsue,srsenb: Fix zmq base_rate calculation and share value .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I3e7817e822fb4d1f8bc9ef798162edf95a74d442 Gerrit-Change-Number: 17312 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue: Remove old comment not longer applying
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17309 ) Change subject: srsue: Remove old comment not longer applying .. srsue: Remove old comment not longer applying Change-Id: I1718dbb701c5dcd5a4081d3d91ae9f192418e7df --- M src/osmo_gsm_tester/srs_ue.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py index 0accaea..38e2baf 100644 --- a/src/osmo_gsm_tester/srs_ue.py +++ b/src/osmo_gsm_tester/srs_ue.py @@ -211,7 +211,6 @@ return self._addr def run_node(self): -# TODO: move to an object return RunNode(RunNode.T_REM_SSH, self._addr, self.remote_user, self._addr) def run_netns_wait(self, name, popen_args): -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17309 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I1718dbb701c5dcd5a4081d3d91ae9f192418e7df Gerrit-Change-Number: 17309 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: tests: Improve logging of iperf3 results
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17316 )
Change subject: tests: Improve logging of iperf3 results
..
tests: Improve logging of iperf3 results
Change-Id: I6563c11f4ad6e9519400268e63944cdf8973dad0
---
M suites/4g/iperf3.py
M suites/gprs/lib/testlib.py
2 files changed, 18 insertions(+), 17 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/suites/4g/iperf3.py b/suites/4g/iperf3.py
index cc7bca0..371376f 100755
--- a/suites/4g/iperf3.py
+++ b/suites/4g/iperf3.py
@@ -1,16 +1,16 @@
#!/usr/bin/env python3
from osmo_gsm_tester.testenv import *
-def print_results(cli_res, srv_res):
-cli_sent = cli_res['end']['sum_sent']
-cli_recv = cli_res['end']['sum_received']
-print("RESULT client:")
-print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" %
(cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000,
cli_sent['seconds'], cli_sent['retransmits']))
-print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000,
cli_recv['bits_per_second']/1000, cli_recv['seconds']))
-print("RESULT server:")
-print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000,
cli_sent['bits_per_second']/1000, cli_sent['seconds']))
-print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000,
cli_recv['bits_per_second']/1000, cli_recv['seconds']))
+def print_result_node(result, node_str):
+sent = result['end']['sum_sent']
+recv = result['end']['sum_received']
+print("Result %s:" % node_str)
+print("\tSEND: %d KB, %d kbps, %d seconds (%s retrans)" %
(sent['bytes']/1000, sent['bits_per_second']/1000, sent['seconds'],
str(sent.get('retransmits', 'unknown'
+print("\tRECV: %d KB, %d kbps, %d seconds" % (recv['bytes']/1000,
recv['bits_per_second']/1000, recv['seconds']))
+def print_results(cli_res, srv_res):
+print_result_node(cli_res, 'client')
+print_result_node(srv_res, 'server')
epc = suite.epc()
enb = suite.enb()
diff --git a/suites/gprs/lib/testlib.py b/suites/gprs/lib/testlib.py
index c0af372..c1a1bc1 100644
--- a/suites/gprs/lib/testlib.py
+++ b/suites/gprs/lib/testlib.py
@@ -1,15 +1,16 @@
#!/usr/bin/env python3
from osmo_gsm_tester.testenv import *
+def print_result_node(result, node_str):
+sent = result['end']['sum_sent']
+recv = result['end']['sum_received']
+print("Result %s:" % node_str)
+print("\tSEND: %d KB, %d kbps, %d seconds (%s retrans)" %
(sent['bytes']/1000, sent['bits_per_second']/1000, sent['seconds'],
str(sent.get('retransmits', 'unknown'
+print("\tRECV: %d KB, %d kbps, %d seconds" % (recv['bytes']/1000,
recv['bits_per_second']/1000, recv['seconds']))
+
def print_results(cli_res, srv_res):
-cli_sent = cli_res['end']['sum_sent']
-cli_recv = cli_res['end']['sum_received']
-print("RESULT client:")
-print("\tSEND: %d KB, %d kbps, %d seconds (%d retrans)" %
(cli_sent['bytes']/1000, cli_sent['bits_per_second']/1000,
cli_sent['seconds'], cli_sent['retransmits']))
-print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000,
cli_recv['bits_per_second']/1000, cli_recv['seconds']))
-print("RESULT server:")
-print("\tSEND: %d KB, %d kbps, %d seconds" % (cli_sent['bytes']/1000,
cli_sent['bits_per_second']/1000, cli_sent['seconds']))
-print("\tRECV: %d KB, %d kbps, %d seconds" % (cli_recv['bytes']/1000,
cli_recv['bits_per_second']/1000, cli_recv['seconds']))
+print_result_node(cli_res, 'client')
+print_result_node(srv_res, 'server')
def run_iperf3_cli_parallel(iperf3clients, ms_li, ready_cb):
assert len(iperf3clients) == len(ms_li)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17316
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I6563c11f4ad6e9519400268e63944cdf8973dad0
Gerrit-Change-Number: 17316
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: iperf3: Support configuring data direction (dl vs ul)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17315 ) Change subject: iperf3: Support configuring data direction (dl vs ul) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17315 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6b5b740beac22015c952ce826c034031ad4c4465 Gerrit-Change-Number: 17315 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue, srsenb: Fix zmq base_rate calculation and share value
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17312 )
Change subject: srsue,srsenb: Fix zmq base_rate calculation and share value
..
srsue,srsenb: Fix zmq base_rate calculation and share value
Change-Id: I3e7817e822fb4d1f8bc9ef798162edf95a74d442
---
M src/osmo_gsm_tester/srs_enb.py
M src/osmo_gsm_tester/srs_ue.py
2 files changed, 52 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_gsm_tester/srs_enb.py b/src/osmo_gsm_tester/srs_enb.py
index 85180e4..1cfd212 100644
--- a/src/osmo_gsm_tester/srs_enb.py
+++ b/src/osmo_gsm_tester/srs_enb.py
@@ -25,6 +25,25 @@
def rf_type_valid(rf_type_str):
return rf_type_str in ('zmq', 'UHD', 'soapy', 'bladeRF')
+#reference: srsLTE.git srslte_symbol_sz()
+def num_prb2symbol_sz(num_prb):
+if num_prb <= 6:
+return 128
+if num_prb <= 15:
+return 256
+if num_prb <= 25:
+return 384
+if num_prb <= 50:
+return 768
+if num_prb <= 75:
+return 1024
+if num_prb <= 110:
+return 1536
+raise log.Error('invalid num_prb %r', num_prb)
+
+def num_prb2base_srate(num_prb):
+return num_prb2symbol_sz(num_prb) * 15 * 1000
+
class srsENB(log.Origin):
REMOTE_DIR = '/osmo-gsm-tester-srsenb'
@@ -56,6 +75,7 @@
self.remote_config_rr_file = None
self.remote_config_drb_file = None
self.remote_log_file = None
+self._num_prb = 0
self.suite_run = suite_run
self.remote_user = conf.get('remote_user', None)
if not rf_type_valid(conf.get('rf_dev_type', None)):
@@ -161,15 +181,12 @@
# We need to set some specific variables programatically here to match
IP addresses:
if self._conf.get('rf_dev_type') == 'zmq':
-num_prb = values['enb'].get('num_prb', None)
-assert num_prb
-if num_prb == 75:
- base_srate=15.36e6
-else:
- base_srate=23.04e6
+self._num_prb = int(values['enb'].get('num_prb', None))
+assert self._num_prb
+base_srate = num_prb2base_srate(self._num_prb)
rf_dev_args = 'fail_on_disconnect=true,tx_port=tcp://' +
self.addr() \
-+ ':2000,rx_port=tcp://'+ self.ue.addr() \
-+ ':2001,id=enb,base_srate='+ str(base_srate)
++ ':2000,rx_port=tcp://' + self.ue.addr() \
++ ':2001,id=enb,base_srate=' + str(base_srate)
config.overlay(values, dict(enb=dict(rf_dev_args=rf_dev_args)))
self.dbg('srsENB ' + filename + ':\n' + pprint.pformat(values))
@@ -202,4 +219,7 @@
def addr(self):
return self._addr
+def num_prb(self):
+return self._num_prb
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 8c6f73a..cbd8a68 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -27,6 +27,25 @@
def rf_type_valid(rf_type_str):
return rf_type_str in ('zmq', 'UHD', 'soapy', 'bladeRF')
+#reference: srsLTE.git srslte_symbol_sz()
+def num_prb2symbol_sz(num_prb):
+if num_prb <= 6:
+return 128
+if num_prb <= 15:
+return 256
+if num_prb <= 25:
+return 384
+if num_prb <= 50:
+return 768
+if num_prb <= 75:
+return 1024
+if num_prb <= 110:
+return 1536
+raise log.Error('invalid num_prb %r', num_prb)
+
+def num_prb2base_srate(num_prb):
+return num_prb2symbol_sz(num_prb) * 15 * 1000
+
class srsUE(MS):
REMOTE_DIR = '/osmo-gsm-tester-srsue'
@@ -54,11 +73,6 @@
self.remote_pcap_file = None
self.remote_metrics_file = None
self.suite_run = suite_run
-self.nof_prb=50
-if self.nof_prb == 75:
- self.base_srate=15.36e6
-else:
- self.base_srate=23.04e6
self.remote_user = conf.get('remote_user', None)
if not rf_type_valid(conf.get('rf_dev_type', None)):
raise log.Error('Invalid rf_dev_type=%s' % conf.get('rf_dev_type',
None))
@@ -198,7 +212,11 @@
# We need to set some specific variables programatically here to match
IP addresses:
if self._conf.get('rf_dev_type') == 'zmq':
-config.overlay(values, dict(ue=dict(rf_dev_args='tx_port=tcp://'+
self.addr() +':2001,rx_port=tcp://'+ self.enb.addr()
+':2000,id=ue,base_srate='+ str(self.base_srate
+base_srate = num_prb2base_srate(self.enb.num_prb())
+config.overlay(values, dict(ue=dict(rf_dev_args='tx_port=tcp://' +
self.addr()
+
+':2001,rx_port=tcp://' + self.enb.addr()
+
Change in osmo-gsm-tester[master]: iperf3: Support setting run time
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17322 )
Change subject: iperf3: Support setting run time
..
iperf3: Support setting run time
Change-Id: I93e857bd682c733c3ba36234b9bf1e1cc85eddef
---
M src/osmo_gsm_tester/iperf3.py
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py
index 78dc140..be4dd6f 100644
--- a/src/osmo_gsm_tester/iperf3.py
+++ b/src/osmo_gsm_tester/iperf3.py
@@ -154,17 +154,17 @@
locally = not self._run_node or self._run_node.is_local()
return locally
-def prepare_test_proc(self, downlink=False, netns=None):
+def prepare_test_proc(self, downlink=False, netns=None, time_sec=10):
self.log('Starting iperf3-client connecting to %s:%d' %
(self.server.addr(), self.server.port()))
self.log_copied = False
self.run_dir =
util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)
if self.runs_locally():
-return self.prepare_test_proc_locally(downlink, netns)
+return self.prepare_test_proc_locally(downlink, netns, time_sec)
else:
-return self.prepare_test_proc_remotely(downlink, netns)
+return self.prepare_test_proc_remotely(downlink, netns, time_sec)
-def prepare_test_proc_remotely(self, downlink, netns):
+def prepare_test_proc_remotely(self, downlink, netns, time_sec):
self.rem_host = remote.RemoteHost(self.run_dir,
self._run_node.ssh_user(), self._run_node.ssh_addr())
remote_prefix_dir = util.Dir(IPerf3Client.REMOTE_DIR)
@@ -175,7 +175,8 @@
popen_args = ('iperf3', '-c', self.server.addr(),
'-p', str(self.server.port()), '-J',
- '--logfile', self.remote_log_file)
+ '--logfile', self.remote_log_file,
+ '-t', str(time_sec))
if downlink:
popen_args += ('-R',)
@@ -185,13 +186,14 @@
self.process = self.rem_host.RemoteProcess(self.name(),
popen_args, env={})
return self.process
-def prepare_test_proc_locally(self, downlink, netns):
+def prepare_test_proc_locally(self, downlink, netns, time_sec):
pcap_recorder.PcapRecorder(self.suite_run,
self.run_dir.new_dir('pcap'), None,
'host %s and port not 22' %
self.server.addr(), netns)
popen_args = ('iperf3', '-c', self.server.addr(),
'-p', str(self.server.port()), '-J',
- '--logfile', os.path.abspath(self.log_file))
+ '--logfile', os.path.abspath(self.log_file),
+ '-t', str(time_sec))
if downlink:
popen_args += ('-R',)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17322
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I93e857bd682c733c3ba36234b9bf1e1cc85eddef
Gerrit-Change-Number: 17322
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srsue: Enable pcap through config file
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17311 ) Change subject: srsue: Enable pcap through config file .. srsue: Enable pcap through config file Change-Id: I15219d707aea778fefa8911362278442fa09550c --- M src/osmo_gsm_tester/srs_ue.py M src/osmo_gsm_tester/templates/srsue.conf.tmpl 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py index 11a6966..8c6f73a 100644 --- a/src/osmo_gsm_tester/srs_ue.py +++ b/src/osmo_gsm_tester/srs_ue.py @@ -141,7 +141,6 @@ '--phy.nof_phy_threads=1', '--gw.netns=' + self.netns(), '--log.filename=' + 'stdout', #self.remote_log_file, -'--pcap.enable=true', '--pcap.filename=' + self.remote_pcap_file, '--general.metrics_csv_filename=' + self.remote_metrics_file) @@ -178,7 +177,6 @@ '--phy.nof_phy_threads=1', '--gw.netns=' + self.netns(), '--log.filename=' + self.log_file, -'--pcap.enable=true', '--pcap.filename=' + self.pcap_file, '--general.metrics_csv_filename=' + self.metrics_file) diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl b/src/osmo_gsm_tester/templates/srsue.conf.tmpl index 5cca60c..627f592 100644 --- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl +++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl @@ -71,7 +71,7 @@ # nas_filename: File path to use for NAS packet captures # [pcap] -enable = false +enable = true filename = /tmp/ue.pcap nas_enable = false nas_filename = /tmp/nas.pcap -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I15219d707aea778fefa8911362278442fa09550c Gerrit-Change-Number: 17311 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: ansible: gsm-tester: Install osmo-gsm-tester dependency python3-numpy
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17313 ) Change subject: ansible: gsm-tester: Install osmo-gsm-tester dependency python3-numpy .. ansible: gsm-tester: Install osmo-gsm-tester dependency python3-numpy Change-Id: I1a162607288a50d2376c4ed7760a8e6fb07f6a89 --- M ansible/roles/gsm-tester/tasks/main.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index fc3def9..c4be6ef 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -216,6 +216,7 @@ - python3-yaml - python3-mako - python3-gi +- python3-numpy - ofono - patchelf - libcap2-bin -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1a162607288a50d2376c4ed7760a8e6fb07f6a89 Gerrit-Change-Number: 17313 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: iperf3: Support setting run time
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17322 ) Change subject: iperf3: Support setting run time .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I93e857bd682c733c3ba36234b9bf1e1cc85eddef Gerrit-Change-Number: 17322 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue: Enable metrics csv file generation
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17310 ) Change subject: srsue: Enable metrics csv file generation .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I393afc49f553d9ebda29717c27d5eb907b3c5b60 Gerrit-Change-Number: 17310 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:20:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ansible: gsm-tester: Install osmo-gsm-tester dependency python3-numpy
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17313 ) Change subject: ansible: gsm-tester: Install osmo-gsm-tester dependency python3-numpy .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1a162607288a50d2376c4ed7760a8e6fb07f6a89 Gerrit-Change-Number: 17313 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: tests: Improve logging of iperf3 results
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17316 ) Change subject: tests: Improve logging of iperf3 results .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17316 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6563c11f4ad6e9519400268e63944cdf8973dad0 Gerrit-Change-Number: 17316 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 03 Mar 2020 09:21:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue: Enable metrics csv file generation
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17310 )
Change subject: srsue: Enable metrics csv file generation
..
srsue: Enable metrics csv file generation
Change-Id: I393afc49f553d9ebda29717c27d5eb907b3c5b60
---
M src/osmo_gsm_tester/srs_ue.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
2 files changed, 14 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_gsm_tester/srs_ue.py b/src/osmo_gsm_tester/srs_ue.py
index 38e2baf..11a6966 100644
--- a/src/osmo_gsm_tester/srs_ue.py
+++ b/src/osmo_gsm_tester/srs_ue.py
@@ -34,6 +34,7 @@
CFGFILE = 'srsue.conf'
PCAPFILE = 'srsue.pcap'
LOGFILE = 'srsue.log'
+METRICSFILE = 'srsue_metrics.csv'
def __init__(self, suite_run, conf):
self._addr = conf.get('addr', None)
@@ -45,11 +46,13 @@
self.config_file = None
self.log_file = None
self.pcap_file = None
+self.metrics_file = None
self.process = None
self.rem_host = None
self.remote_config_file = None
self.remote_log_file = None
self.remote_pcap_file = None
+self.remote_metrics_file = None
self.suite_run = suite_run
self.nof_prb=50
if self.nof_prb == 75:
@@ -74,6 +77,10 @@
self.rem_host.scpfrom('scp-back-pcap', self.remote_pcap_file,
self.pcap_file)
except Exception as e:
self.log(repr(e))
+try:
+self.rem_host.scpfrom('scp-back-metrics',
self.remote_metrics_file, self.metrics_file)
+except Exception as e:
+self.log(repr(e))
def setup_runs_locally(self):
return self.remote_user is None
@@ -106,6 +113,7 @@
self.remote_config_file = remote_run_dir.child(srsUE.CFGFILE)
self.remote_log_file = remote_run_dir.child(srsUE.LOGFILE)
self.remote_pcap_file = remote_run_dir.child(srsUE.PCAPFILE)
+self.remote_metrics_file = remote_run_dir.child(srsUE.METRICSFILE)
self.rem_host.recreate_remote_dir(remote_inst)
self.rem_host.scp('scp-inst-to-remote', str(self.inst),
remote_prefix_dir)
@@ -134,7 +142,8 @@
'--gw.netns=' + self.netns(),
'--log.filename=' + 'stdout', #self.remote_log_file,
'--pcap.enable=true',
-'--pcap.filename=' + self.remote_pcap_file)
+'--pcap.filename=' + self.remote_pcap_file,
+'--general.metrics_csv_filename=' + self.remote_metrics_file)
self.process =
self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE,
util.Dir(srsUE.REMOTE_DIR), args)
#self.process =
self.rem_host.RemoteProcessFixIgnoreSIGHUP(srsUE.BINFILE, remote_run_dir, args,
remote_lib)
@@ -170,7 +179,8 @@
'--gw.netns=' + self.netns(),
'--log.filename=' + self.log_file,
'--pcap.enable=true',
-'--pcap.filename=' + self.pcap_file)
+'--pcap.filename=' + self.pcap_file,
+'--general.metrics_csv_filename=' + self.metrics_file)
self.dbg(run_dir=self.run_dir, binary=binary, env=env)
self.process = process.Process(self.name(), self.run_dir, args,
env=env)
@@ -181,6 +191,7 @@
self.config_file = self.run_dir.new_file(srsUE.CFGFILE)
self.log_file = self.run_dir.child(srsUE.LOGFILE)
self.pcap_file = self.run_dir.new_file(srsUE.PCAPFILE)
+self.metrics_file = self.run_dir.child(srsUE.METRICSFILE)
self.dbg(config_file=self.config_file)
values = dict(ue=config.get_defaults('srsue'))
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index eef5a7e..5cca60c 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -344,6 +344,6 @@
#
#
[general]
-#metrics_csv_enable = false
+metrics_csv_enable = true
#metrics_period_secs = 1
#metrics_csv_filename = /tmp/ue_metrics.csv
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17310
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I393afc49f553d9ebda29717c27d5eb907b3c5b60
Gerrit-Change-Number: 17310
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: iperf3: Support configuring data direction (dl vs ul)
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17315 )
Change subject: iperf3: Support configuring data direction (dl vs ul)
..
iperf3: Support configuring data direction (dl vs ul)
Change-Id: I6b5b740beac22015c952ce826c034031ad4c4465
---
M src/osmo_gsm_tester/iperf3.py
M suites/4g/iperf3.py
M suites/gprs/lib/testlib.py
3 files changed, 13 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/osmo_gsm_tester/iperf3.py b/src/osmo_gsm_tester/iperf3.py
index 1b13ffe..78dc140 100644
--- a/src/osmo_gsm_tester/iperf3.py
+++ b/src/osmo_gsm_tester/iperf3.py
@@ -154,17 +154,17 @@
locally = not self._run_node or self._run_node.is_local()
return locally
-def prepare_test_proc(self, netns=None):
+def prepare_test_proc(self, downlink=False, netns=None):
self.log('Starting iperf3-client connecting to %s:%d' %
(self.server.addr(), self.server.port()))
self.log_copied = False
self.run_dir =
util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
self.log_file = self.run_dir.new_file(IPerf3Client.LOGFILE)
if self.runs_locally():
-return self.prepare_test_proc_locally(netns)
+return self.prepare_test_proc_locally(downlink, netns)
else:
-return self.prepare_test_proc_remotely(netns)
+return self.prepare_test_proc_remotely(downlink, netns)
-def prepare_test_proc_remotely(self, netns):
+def prepare_test_proc_remotely(self, downlink, netns):
self.rem_host = remote.RemoteHost(self.run_dir,
self._run_node.ssh_user(), self._run_node.ssh_addr())
remote_prefix_dir = util.Dir(IPerf3Client.REMOTE_DIR)
@@ -176,19 +176,25 @@
popen_args = ('iperf3', '-c', self.server.addr(),
'-p', str(self.server.port()), '-J',
'--logfile', self.remote_log_file)
+if downlink:
+popen_args += ('-R',)
+
if netns:
self.process = self.rem_host.RemoteNetNSProcess(self.name(),
netns, popen_args, env={})
else:
self.process = self.rem_host.RemoteProcess(self.name(),
popen_args, env={})
return self.process
-def prepare_test_proc_locally(self, netns):
+def prepare_test_proc_locally(self, downlink, netns):
pcap_recorder.PcapRecorder(self.suite_run,
self.run_dir.new_dir('pcap'), None,
'host %s and port not 22' %
self.server.addr(), netns)
popen_args = ('iperf3', '-c', self.server.addr(),
'-p', str(self.server.port()), '-J',
'--logfile', os.path.abspath(self.log_file))
+if downlink:
+popen_args += ('-R',)
+
if netns:
self.process = process.NetNSProcess(self.name(), self.run_dir,
netns, popen_args, env={})
else:
diff --git a/suites/4g/iperf3.py b/suites/4g/iperf3.py
index 5ccc922..cc7bca0 100755
--- a/suites/4g/iperf3.py
+++ b/suites/4g/iperf3.py
@@ -32,7 +32,7 @@
ue.connect(enb)
iperf3srv.start()
-proc = iperf3cli.prepare_test_proc(ue.netns())
+proc = iperf3cli.prepare_test_proc(False, ue.netns())
print('waiting for UE to attach...')
wait(ue.is_connected, None)
diff --git a/suites/gprs/lib/testlib.py b/suites/gprs/lib/testlib.py
index 284ca63..c0af372 100644
--- a/suites/gprs/lib/testlib.py
+++ b/suites/gprs/lib/testlib.py
@@ -16,7 +16,7 @@
procs = []
for i in range(len(iperf3clients)):
print("Running iperf3 client to %s through %r" %
(str(iperf3clients[i]), repr(ms_li[i].tmp_ctx_id)))
-procs.append(iperf3clients[i].prepare_test_proc(ms_li[i].netns()))
+procs.append(iperf3clients[i].prepare_test_proc(False,
ms_li[i].netns()))
try:
for proc in procs:
proc.launch()
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17315
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I6b5b740beac22015c952ce826c034031ad4c4465
Gerrit-Change-Number: 17315
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: osmo-gsm-tester: Add missing srsLTE dependencies (soapy)
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17319 ) Change subject: osmo-gsm-tester: Add missing srsLTE dependencies (soapy) .. osmo-gsm-tester: Add missing srsLTE dependencies (soapy) Currently srsLTE trials link against soapySDR library to have LimeSDR support. We need to move installation of those new packages further below in the Dockerfiler because that lib version is only available with osmocom repositories (which were added at a later point in the file). Change-Id: Ia0e506954ffebd94adb75fec6bf481e41f9ec436 --- M osmo-gsm-tester/Dockerfile 1 file changed, 16 insertions(+), 13 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index cd42daa..6ed992e 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -38,19 +38,6 @@ pyusb \ pysispm -# install srsLTE runtime dependencies -RUNapt-get update && \ - apt-get install -y --no-install-recommends \ - cmake \ - libfftw3-dev \ - libmbedtls-dev \ - libboost-program-options-dev \ - libconfig++-dev \ - libsctp-dev \ - libpcsclite-dev \ - libuhd-dev \ - libczmq-dev - # Intall sshd: RUNapt-get update && apt-get install -y openssh-server RUNmkdir /var/run/sshd @@ -109,6 +96,22 @@ libasn1c-dev && \ apt-get clean +# install srsLTE runtime dependencies +RUNapt-get update && \ + apt-get install -y --no-install-recommends \ + cmake \ + libfftw3-dev \ + libmbedtls-dev \ + libboost-program-options-dev \ + libconfig++-dev \ + libsctp-dev \ + libpcsclite-dev \ + libuhd-dev \ + libczmq-dev \ + libsoapysdr-dev \ + soapysdr0.7-module-lms7 && \ + apt-get clean + WORKDIR/tmp ARGOSMO_GSM_TESTER_BRANCH="master" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17319 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia0e506954ffebd94adb75fec6bf481e41f9ec436 Gerrit-Change-Number: 17319 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: osmo-gsm-tester: Improvements anv fixes to run 4G network with latest...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/17320 )
Change subject: osmo-gsm-tester: Improvements anv fixes to run 4G network with
latest ogt version
..
osmo-gsm-tester: Improvements anv fixes to run 4G network with latest ogt
version
* Fix wrong KI.
* Add an extra IP address to slave so that ENB and EPC can be run on
different IP addresses and their GTP ports don't collide.
* Add required rf parameters to resources.conf
Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9
---
M osmo-gsm-tester/Dockerfile
M osmo-gsm-tester/jenkins.sh
R osmo-gsm-tester/osmo-gsm-tester-master.sh
A osmo-gsm-tester/osmo-gsm-tester-slave.sh
M osmo-gsm-tester/resources.conf
5 files changed, 14 insertions(+), 5 deletions(-)
Approvals:
pespin: Verified
laforge: Looks good to me, approved
diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile
index 6ed992e..859f0b1 100644
--- a/osmo-gsm-tester/Dockerfile
+++ b/osmo-gsm-tester/Dockerfile
@@ -134,6 +134,6 @@
ENV OSMO_GSM_TESTER_CONF /tmp/osmo-gsm-tester/example
WORKDIR/data
-CMD["/bin/sh", "-c", "/data/osmo-gsm-tester.sh >/data/osmo-gsm-tester.log
2>&1"]
+CMD["/bin/sh", "-c", "/data/osmo-gsm-tester-master.sh
>/data/osmo-gsm-tester.log 2>&1"]
EXPOSE 22/tcp
diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh
index 16552f9..248a10b 100755
--- a/osmo-gsm-tester/jenkins.sh
+++ b/osmo-gsm-tester/jenkins.sh
@@ -21,9 +21,10 @@
network_create 172.18.50.0/24
mkdir $VOL_BASE_DIR/ogt-slave
+cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/
mkdir $VOL_BASE_DIR/ogt-master
-cp osmo-gsm-tester.sh $VOL_BASE_DIR/ogt-master/
+cp osmo-gsm-tester-master.sh $VOL_BASE_DIR/ogt-master/
echo Starting container with osmo-gsm-tester slave
docker run --rm \
@@ -35,7 +36,7 @@
-v $VOL_BASE_DIR/ogt-slave:/data \
--name ${BUILD_TAG}-ogt-slave -d \
$REPO_USER/osmo-gsm-tester \
- /bin/sh -c "/usr/sbin/sshd -D -e >/data/sshd.log 2>&1"
+ /bin/sh -c "/data/osmo-gsm-tester-slave.sh >/data/sshd.log 2>&1"
echo Starting container with osmo-gsm-tester main unit
docker run --rm \
diff --git a/osmo-gsm-tester/osmo-gsm-tester.sh
b/osmo-gsm-tester/osmo-gsm-tester-master.sh
similarity index 100%
rename from osmo-gsm-tester/osmo-gsm-tester.sh
rename to osmo-gsm-tester/osmo-gsm-tester-master.sh
diff --git a/osmo-gsm-tester/osmo-gsm-tester-slave.sh
b/osmo-gsm-tester/osmo-gsm-tester-slave.sh
new file mode 100755
index 000..3170922
--- /dev/null
+++ b/osmo-gsm-tester/osmo-gsm-tester-slave.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Add local IP addresses required by osmo-gsm-tester resources:
+ip addr add 172.18.50.101/24 dev eth0
+
+/usr/sbin/sshd -D -e
diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf
index 1120178..a81d92a 100644
--- a/osmo-gsm-tester/resources.conf
+++ b/osmo-gsm-tester/resources.conf
@@ -36,8 +36,9 @@
enb:
- label: srsENB-zmq
type: srsenb
+ rf_dev_type: zmq
remote_user: jenkins
- addr: 172.18.50.100
+ addr: 172.18.50.101
arfcn:
- arfcn: 512
@@ -53,8 +54,9 @@
- label: srsUE-zmq_1
type: srsue
+ rf_dev_type: zmq
remote_user: jenkins
addr: 172.18.50.100
imsi: '001010123456789'
- ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146'
+ ki: '00112233445566778899aabbccddeeff'
auth_algo: 'xor'
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17320
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9
Gerrit-Change-Number: 17320
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in docker-playground[master]: osmo-gsm-tester: new versions require python3-numpy
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17317 ) Change subject: osmo-gsm-tester: new versions require python3-numpy .. osmo-gsm-tester: new versions require python3-numpy Change-Id: Ic1a9edbaf4151aabd157f859ec6fbec30d4f27b0 --- M osmo-gsm-tester/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 40e7e1a..cd42daa 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -20,6 +20,7 @@ python3-yaml \ python3-mako \ python3-gi \ + python3-numpy \ python3-wheel \ ofono \ patchelf \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1a9edbaf4151aabd157f859ec6fbec30d4f27b0 Gerrit-Change-Number: 17317 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: osmo-gsm-tester: Copy limits.d files to docker image
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17321 ) Change subject: osmo-gsm-tester: Copy limits.d files to docker image .. osmo-gsm-tester: Copy limits.d files to docker image These are required to allow setting rt prio for jenkins user inside the docker container, as well as for being allowed to create coredump files. Change-Id: I8ed6193196d739c1416976d431d07b8a0c55ee2a --- M osmo-gsm-tester/Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile index 859f0b1..bed641c 100644 --- a/osmo-gsm-tester/Dockerfile +++ b/osmo-gsm-tester/Dockerfile @@ -127,6 +127,7 @@ # Copy several scripts and permission for osmo-gsm-tester: RUN mkdir -p /usr/local/bin/ && cp osmo-gsm-tester/utils/bin/* /usr/local/bin/ RUN mkdir -p /etc/sudoers.d/ && cp osmo-gsm-tester/utils/sudoers.d/* /etc/sudoers.d/ +RUN mkdir -p /etc/security/limits.d/ && cp osmo-gsm-tester/utils/limits.d/* /etc/security/limits.d/ VOLUME /data COPY resources.conf /tmp/osmo-gsm-tester/example/resources.conf -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17321 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I8ed6193196d739c1416976d431d07b8a0c55ee2a Gerrit-Change-Number: 17321 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: parity: add amr crc14 definition
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/17325 )
Change subject: parity: add amr crc14 definition
..
parity: add amr crc14 definition
AMR not only specifies a 6 bit CRC for regular voice information. It also
specifies a 16 bit CRC to protect the comfort noise updates contained in
the SID_UPDATE frames.
Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900
Related: OS#2978
---
M include/osmocom/coding/gsm0503_parity.h
M src/coding/gsm0503_parity.c
M src/coding/libosmocoding.map
3 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/17325/1
diff --git a/include/osmocom/coding/gsm0503_parity.h
b/include/osmocom/coding/gsm0503_parity.h
index 28a5444..c35477f 100644
--- a/include/osmocom/coding/gsm0503_parity.h
+++ b/include/osmocom/coding/gsm0503_parity.h
@@ -19,5 +19,6 @@
const struct osmo_crc8gen_code gsm0503_tch_fr_crc3;
const struct osmo_crc8gen_code gsm0503_tch_efr_crc8;
const struct osmo_crc8gen_code gsm0503_amr_crc6;
+const struct osmo_crc16gen_code gsm0503_amr_crc14;
/*! @} */
diff --git a/src/coding/gsm0503_parity.c b/src/coding/gsm0503_parity.c
index 874114f..a8daacc 100644
--- a/src/coding/gsm0503_parity.c
+++ b/src/coding/gsm0503_parity.c
@@ -134,4 +134,15 @@
.remainder = 0x3f,
};
+/*! GSM AMR parity (SID_UPDATE)
+ *
+ * g(x) = x^14 + x^13 + x^5 + x^3 + x^2 + 1
+ */
+const struct osmo_crc16gen_code gsm0503_amr_crc14 = {
+ .bits = 14,
+ .poly = 0x202d,
+ .init = 0x,
+ .remainder = 0x3fff,
+};
+
/*! @} */
diff --git a/src/coding/libosmocoding.map b/src/coding/libosmocoding.map
index 87b3886..7f88111 100644
--- a/src/coding/libosmocoding.map
+++ b/src/coding/libosmocoding.map
@@ -56,6 +56,7 @@
gsm0503_tch_fr_crc3;
gsm0503_tch_efr_crc8;
gsm0503_amr_crc6;
+gsm0503_amr_crc14;
gsm0503_xcch_burst_unmap;
gsm0503_xcch_burst_map;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17325
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I5cfd8ca806aba8d42cb9787f69605cea7de6e900
Gerrit-Change-Number: 17325
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in libosmocore[master]: conv: add convolutional coder for AMR SID UPDATE frames
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/17326 ) Change subject: conv: add convolutional coder for AMR SID UPDATE frames .. conv: add convolutional coder for AMR SID UPDATE frames AMR SID update frames are protected using an 1/4 convolutional coder, wich is similar to the one used with 6,7 kbit voice frames. Except that there is no puncturing and the length is differen. Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Related: OS#2978 --- M src/gsm/libosmogsm.map M tests/conv/conv_gsm0503_test.ok M utils/conv_codes_gsm.py 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/26/17326/1 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index efca0a5..a518b28 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -135,6 +135,7 @@ gsm0503_tch_ahs_5_9; gsm0503_tch_ahs_5_15; gsm0503_tch_ahs_4_75; +gsm0503_tch_axs_sid_update; gsm0503_mcs1_dl_hdr; gsm0503_mcs1_ul_hdr; gsm0503_mcs1; diff --git a/tests/conv/conv_gsm0503_test.ok b/tests/conv/conv_gsm0503_test.ok index 39480ca..764bd43 100644 --- a/tests/conv/conv_gsm0503_test.ok +++ b/tests/conv/conv_gsm0503_test.ok @@ -190,6 +190,14 @@ [..] Encoding / Decoding cycle : OK [..] Encoding / Decoding cycle : OK +[+] Testing: gsm0503_tch_axs_sid_update +[.] Input length : ret = 49 exp = 49 -> OK +[.] Output length : ret = 212 exp = 212 -> OK +[.] Random vector checks: +[..] Encoding / Decoding cycle : OK +[..] Encoding / Decoding cycle : OK +[..] Encoding / Decoding cycle : OK + [+] Testing: gsm0503_mcs1_dl_hdr [.] Input length : ret = 36 exp = 36 -> OK [.] Output length : ret = 108 exp = 108 -> OK diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py index e189985..42f340b 100644 --- a/utils/conv_codes_gsm.py +++ b/utils/conv_codes_gsm.py @@ -522,6 +522,25 @@ description = ["TCH/AHS 4.75 kbits convolutional code"] ), + # TCH_AXS SID UPDATE definition + ConvolutionalCode( + 49, + [ + ( G1, G3 ), + ( G2, G3 ), + ( 1, 1 ), + ( 1, 1 ), + ], + name = 'tch_axs_sid_update', + description = [ + "TCH/AFS and TCH/AHS SID UPDATE convolutional code:", + "G1/G3 = 1 + D + D3 + D4 / 1 + D + D2 + D3 + D4", + "G2/G3 = 1 + D2 + D4 / 1 + D + D2 + D3 + D4", + "G3/G3 = 1", + "G3/G3 = 1", + ] + ), + # EDGE MCS1_DL_HDR definition ConvolutionalCode( 36, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/17326 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia35ed4178a7f0d816052b7e5d6478b93a1d9744f Gerrit-Change-Number: 17326 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in osmo-ggsn[master]: lib/netns: fix open_ns(): return fd from open()
Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17324 ) Change subject: lib/netns: fix open_ns(): return fd from open() .. lib/netns: fix open_ns(): return fd from open() Looks like a bug introduced by I9b9c8fd6eeaaa7d190b8e2a34ca82088904c7708. Change-Id: I38caf5541ca90638ed10714adfbb08120e5397b9 Fixes: CID#208656 --- M lib/netns.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/24/17324/1 diff --git a/lib/netns.c b/lib/netns.c index bd2076b..58ae036 100644 --- a/lib/netns.c +++ b/lib/netns.c @@ -96,7 +96,7 @@ return -rc; } - return 0; + return fd; } int socket_ns(int nsfd, int domain, int type, int protocol) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I38caf5541ca90638ed10714adfbb08120e5397b9 Gerrit-Change-Number: 17324 Gerrit-PatchSet: 1 Gerrit-Owner: Vadim Yanitskiy Gerrit-MessageType: newchange
