Change in pysim[master]: Py2 -> Py3: use the floor division operator // where possible
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/17152 )
Change subject: Py2 -> Py3: use the floor division operator // where possible
..
Py2 -> Py3: use the floor division operator // where possible
In Python 3, traditional division operator returns a float,
while we need a floor integer in the most cases.
Change-Id: I5565eb64a1ddea7075cbb142eaacaa5d494c87bb
---
M pySim/cards.py
M pySim/commands.py
M pySim/transport/serial.py
3 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/17152/1
diff --git a/pySim/cards.py b/pySim/cards.py
index faaeca3..b30e449 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -89,7 +89,7 @@
"""
# get size and write EF.OPLMNwAcT
data = self._scc.read_binary(EF['OPLMNwAcT'], length=None,
offset=0)
- size = len(data[0])/2
+ size = len(data[0]) // 2
hplmn = enc_plmn(mcc, mnc)
content = hplmn + access_tech
data, sw = self._scc.update_binary(EF['OPLMNwAcT'], content +
'ff' * (size/5-1))
@@ -101,7 +101,7 @@
"""
# get size and write EF.PLMNwAcT
data = self._scc.read_binary(EF['PLMNwAcT'], length=None,
offset=0)
- size = len(data[0])/2
+ size = len(data[0]) // 2
hplmn = enc_plmn(mcc, mnc)
content = hplmn + access_tech
data, sw = self._scc.update_binary(EF['PLMNwAcT'], content +
'ff' * (size/5-1))
@@ -109,7 +109,7 @@
def update_plmnsel(self, mcc, mnc):
data = self._scc.read_binary(EF['PLMNsel'], length=None,
offset=0)
- size = len(data[0])/2
+ size = len(data[0]) // 2
hplmn = enc_plmn(mcc, mnc)
data, sw = self._scc.update_binary(EF['PLMNsel'], hplmn + 'ff'
* (size-3))
return sw
@@ -127,7 +127,7 @@
raise RuntimeError('unable to calculate proper mnclen')
data = self._scc.read_binary(EF['AD'], length=None, offset=0)
- size = len(data[0])/2
+ size = len(data[0]) // 2
content = data[0][0:6] + "%02X" % mnclen
data, sw = self._scc.update_binary(EF['AD'], content)
return sw
diff --git a/pySim/commands.py b/pySim/commands.py
index 385cacf..ff64ed2 100644
--- a/pySim/commands.py
+++ b/pySim/commands.py
@@ -49,11 +49,11 @@
# what we get in the length field.
# See also ETSI TS 102 221, chapter 11.1.1.3.0 Base coding.
exp_tlv_len = int(fcp[2:4], 16)
- if len(fcp[4:])/2 == exp_tlv_len:
+ if len(fcp[4:]) // 2 == exp_tlv_len:
skip = 4
else:
exp_tlv_len = int(fcp[2:6], 16)
- if len(fcp[4:])/2 == exp_tlv_len:
+ if len(fcp[4:]) // 2 == exp_tlv_len:
skip = 6
# Skip FCP tag and length
@@ -108,7 +108,7 @@
return rv
def select_adf(self, aid):
- aidlen = ("0" + format(len(aid)/2, 'x'))[-2:]
+ aidlen = ("0" + format(len(aid) // 2, 'x'))[-2:]
return self._tp.send_apdu_checksw(self.cla_byte + "a4" + "0404"
+ aidlen + aid)
def read_binary(self, ef, length=None, offset=0):
@@ -126,7 +126,7 @@
if not hasattr(type(ef), '__iter__'):
ef = [ef]
self.select_file(ef)
- pdu = self.cla_byte + 'd6%04x%02x' % (offset, len(data)/2) +
data
+ pdu = self.cla_byte + 'd6%04x%02x' % (offset, len(data) // 2) +
data
return self._tp.send_apdu_checksw(pdu)
def read_record(self, ef, rec_no):
@@ -143,10 +143,10 @@
r = self.select_file(ef)
if not force_len:
rec_length = self.__record_len(r)
- if (len(data)/2 != rec_length):
- raise ValueError('Invalid data length (expected
%d, got %d)' % (rec_length, len(data)/2))
+ if (len(data) // 2 != rec_length):
+ raise ValueError('Invalid data length (expected
%d, got %d)' % (rec_length, len(data) // 2))
else:
- rec_length = len(data)/2
+ rec_length = len(data) // 2
pdu = (self.cla_byte + 'dc%02x04%02x' % (rec_no, rec_length)) +
data
return self._tp.send_apdu_checksw(pdu)
diff --git a/pySim/transport/serial.py b/pySim/transport/serial.py
index f672be2..11fcd6a 100644
--- a/pySim/transport/serial.py
+++ b/pySim/transport/serial.py
@@ -213,7 +213,7 @@
Change in pysim[master]: pySim-prog.py: add support for MSISDN programming
fixeria has uploaded a new patch set (#11) to the change originally created by
herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16946 )
Change subject: pySim-prog.py: add support for MSISDN programming
..
pySim-prog.py: add support for MSISDN programming
This change implements programming of EF.MSISDN as per 3GPP TS 31.102,
sections 4.2.26 and 4.4.2.3, excluding the following fields:
- Alpha Identifier (currently 'FF'O * 20),
- Capability/Configuration1 Record Identifier ('FF'O),
- Extension1 Record Identifier ('FF'O).
This feature is introduced exclusively for sysmoUSIM-SJS1.
Othere SIM card types need to be tested.
Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
---
M pySim-prog.py
M pySim/cards.py
M pySim/utils.py
M pysim-testdata/sysmoUSIM-SJS1.data
M pysim-testdata/sysmoUSIM-SJS1.ok
M tests/pysim-test.sh
M tests/sysmoUSIM-SJS1.data.example
7 files changed, 57 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/11
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/16946
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
Gerrit-Change-Number: 16946
Gerrit-PatchSet: 11
Gerrit-Owner: herlesupreeth
Gerrit-Assignee: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-CC: dexter
Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: fix reading and parsing of EF.MSISDN
fixeria has uploaded a new patch set (#19) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: pySim-read.py: fix reading and parsing of EF.MSISDN .. pySim-read.py: fix reading and parsing of EF.MSISDN This change implements parsing of EF.MSISDN (and thus EF.ADN) as per 3GPP TS 31.102, sections 4.2.26 and 4.4.2.3. Example (commercial SIM card from 401/02): EF.MSISDN: 07917787028982f7 Decoded (NPI=1 ToN=1): +77782098287 Note that sysmoUSIM-SJS1 in the test setup has malformed EF.MSISDN, so that's why the test output is changed. Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pySim/utils.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 4 files changed, 48 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/19 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 19 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in pysim[master]: Python2 is deprecated, switch to Python3
fixeria has uploaded a new patch set (#7) to the change originally created by gnutoo. ( https://gerrit.osmocom.org/c/pysim/+/15504 ) Change subject: Python2 is deprecated, switch to Python3 .. Python2 is deprecated, switch to Python3 Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff --- M contrib/jenkins.sh M pySim-prog.py M pySim-read.py M pySim/card_handler.py 4 files changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/15504/7 -- 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: 7 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset
Change in pysim[master]: Python2 is deprecated, switch to Python3
fixeria has uploaded a new patch set (#6) to the change originally created by gnutoo. ( https://gerrit.osmocom.org/c/pysim/+/15504 ) Change subject: Python2 is deprecated, switch to Python3 .. Python2 is deprecated, switch to Python3 Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff --- M contrib/jenkins.sh M pySim-prog.py M pySim-read.py M pySim/card_handler.py 4 files changed, 5 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/15504/6 -- 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: 6 Gerrit-Owner: gnutoo Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: do not import json, it is not needed
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/17151 ) Change subject: pySim-read.py: do not import json, it is not needed .. pySim-read.py: do not import json, it is not needed Change-Id: I4ae1d71c5695c9cd8ddebea514847b0be6a24c6c --- M pySim-read.py 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/51/17151/1 diff --git a/pySim-read.py b/pySim-read.py index 853e924..c93d2e9 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -30,12 +30,6 @@ import sys from pySim.ts_51_011 import EF, DF -try: - import json -except ImportError: - # Python < 2.5 - import simplejson as json - from pySim.commands import SimCardCommands from pySim.utils import h2b, swap_nibbles, rpad, dec_imsi, dec_iccid, format_xplmn_w_act, dec_spn -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4ae1d71c5695c9cd8ddebea514847b0be6a24c6c Gerrit-Change-Number: 17151 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in pysim[master]: pySim-read.py: print meaningful message when SPN is not set
fixeria has uploaded a new patch set (#5) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16981 ) Change subject: pySim-read.py: print meaningful message when SPN is not set .. pySim-read.py: print meaningful message when SPN is not set Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmosim-gr1.ok 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/16981/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca Gerrit-Change-Number: 16981 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: fix reading and parsing of EF.MSISDN
fixeria has uploaded a new patch set (#18) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: pySim-read.py: fix reading and parsing of EF.MSISDN .. pySim-read.py: fix reading and parsing of EF.MSISDN This change implements parsing of EF.MSISDN (and thus EF.ADN) as per 3GPP TS 31.102, sections 4.2.26 and 4.4.2.3. Example (commercial SIM card from 401/02): EF.MSISDN: 07917787028982f7 Decoded (NPI=1 ToN=1): +77782098287 Note that sysmoUSIM-SJS1 in the test setup has malformed EF.MSISDN, so that's why the test output is changed. Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pySim/utils.py M pysim-testdata/sysmoUSIM-SJS1.ok 3 files changed, 47 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/18 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 18 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-prog.py: add support for MSISDN programming
fixeria has uploaded a new patch set (#9) to the change originally created by
herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16946 )
Change subject: pySim-prog.py: add support for MSISDN programming
..
pySim-prog.py: add support for MSISDN programming
This change implements programming of EF.MSISDN as per 3GPP TS 31.102,
sections 4.2.26 and 4.4.2.3, excluding the following fields:
- Alpha Identifier (currently 'FF'O * 20),
- Capability/Configuration1 Record Identifier ('FF'O),
- Extension1 Record Identifier ('FF'O).
This feature is introduced exclusively for sysmoUSIM-SJS1.
Othere SIM card types need to be tested.
Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
---
M pySim-prog.py
M pySim/cards.py
M pySim/utils.py
M pysim-testdata/sysmoUSIM-SJS1.data
M pysim-testdata/sysmoUSIM-SJS1.ok
M tests/pysim-test.sh
M tests/sysmoUSIM-SJS1.data.example
7 files changed, 57 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/9
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/16946
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
Gerrit-Change-Number: 16946
Gerrit-PatchSet: 9
Gerrit-Owner: herlesupreeth
Gerrit-Assignee: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-CC: dexter
Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: gsm_rlcmac: improve dissection of Packet Resource Request message
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17050 ) Change subject: gsm_rlcmac: improve dissection of Packet Resource Request message .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/17050/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/17050/2//COMMIT_MSG@11 PS2, Line 11: This commit breaks a unit test. > so what do we do about this? Is the test wrong? Is it sane to simply adjust > the expected test output […] I did a quick investigation using Pycrate (https://osmocom.org/issues/4382#note-1). Decoding results look good, but the encoder generates a different vector that Pycrate fails to decode... -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibb4cbd3f5865415fd547e95fc24ff31df1aed4c0 Gerrit-Change-Number: 17050 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:48:54 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-pcu[master]: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17051 ) Change subject: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 .. gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 Port from wireshark.git 07fc801684ebff7aff02505cdb2c120caea846e0. Ported-by: Pau Espin Pedrol Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 295 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index 8d846a1..546e7fb 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -1097,6 +1097,152 @@ CSN_DESCR_END (EGPRS_BEP_LinkQualityMeasurements_t) static const +CSN_DESCR_BEGIN(IU_Mode_Channel_Request_Desk_t) + + M_UINT (IU_Mode_Channel_Request_Desk_t, RB_ID, 5), + M_UINT (IU_Mode_Channel_Request_Desk_t, RADIO_PRIORITY, 2), + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_RLC_BLOCK_COUNT, 1), + M_UINT (IU_Mode_Channel_Request_Desk_t, RLC_BLOCK_COUNT, 8), + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_Iu_Mode_ChRequestDesk, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + +CSN_DESCR_END (IU_Mode_Channel_Request_Desk_t) + +static const +CSN_DESCR_BEGIN(IU_Mode_Channel_Request_Desk_RNTI_t) + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_RNTI_t, Exist_G_RNTI_Extension, 1), + M_UINT (IU_Mode_Channel_Request_Desk_RNTI_t, G_RNTI_Extension, 4), + + M_TYPE (IU_Mode_Channel_Request_Desk_RNTI_t, IU_Mode_Channel_Request_Desk, IU_Mode_Channel_Request_Desk_t), + +CSN_DESCR_END (IU_Mode_Channel_Request_Desk_RNTI_t) + + +static const +CSN_DESCR_BEGIN(Ext_Channel_Request_desc_t) + + M_UINT (Ext_Channel_Request_desc_t, PFI, 7), + M_UINT (Ext_Channel_Request_desc_t, RADIO_PRIORITY, 2), + M_UINT (Ext_Channel_Request_desc_t, RLC_Mode, 1), + + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_LCC_PDU, 1), + M_UINT (Ext_Channel_Request_desc_t, LCC_PDU, 1), + + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_Ext_Channel_Request_desc, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + +CSN_DESCR_END (Ext_Channel_Request_desc_t) + +static const +CSN_DESCR_BEGIN(EGPRS_BEP_LinkQualityMeasurements_type2_t) + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_CV_BEP, 3), + +CSN_DESCR_END (EGPRS_BEP_LinkQualityMeasurements_type2_t) + +static const +CSN_DESCR_BEGIN(BEP_MeasurementReport_type2_t) + M_NEXT_EXIST (BEP_MeasurementReport_type2_t, Exist, 1), + M_UINT (BEP_MeasurementReport_type2_t, REPORTED_MODULATION, 2), + M_UINT (BEP_MeasurementReport_type2_t, MEAN_BEP_TN, 4), +CSN_DESCR_END (BEP_MeasurementReport_type2_t) + +static const +CSN_DESCR_BEGIN(InterferenceMeasurementReport_type2_t) + M_NEXT_EXIST (InterferenceMeasurementReport_type2_t, Exist, 1), + M_UINT (InterferenceMeasurementReport_type2_t, I_LEVEL, 4), +CSN_DESCR_END (InterferenceMeasurementReport_type2_t) +static const +CSN_DESCR_BEGIN(EGPRS_TimeslotLinkQualityMeasurements_type2_t) + M_NEXT_EXIST
Change in osmo-pcu[master]: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17051 ) Change subject: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 Gerrit-Change-Number: 17051 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:38:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: gsm_rlcmac: improve dissection of Packet Resource Request message
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17050 ) Change subject: gsm_rlcmac: improve dissection of Packet Resource Request message .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/17050/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/17050/2//COMMIT_MSG@11 PS2, Line 11: This commit breaks a unit test. so what do we do about this? Is the test wrong? Is it sane to simply adjust the expected test output? Missing --verbose :) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibb4cbd3f5865415fd547e95fc24ff31df1aed4c0 Gerrit-Change-Number: 17050 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:38:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in docker-playground[master]: Introduce osmo-gsm-tester docker setup
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17143 ) Change subject: Introduce osmo-gsm-tester docker setup .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iac7c0b613048ce332642d3957c55cc7c53b56d42 Gerrit-Change-Number: 17143 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 19:36:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ansible: Install libsoapysdr-dev as dependency for srsLTE
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17144 ) Change subject: ansible: Install libsoapysdr-dev as dependency for srsLTE .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idd8baf934cb9245e0f897e84754905172b659e40 Gerrit-Change-Number: 17144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 19:35:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gsm-tester: Manual build and install of patchelf v0.10
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17128 ) Change subject: gsm-tester: Manual build and install of patchelf v0.10 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I28825d723b85900fb51cc5b8a9d14c6ef346e667 Gerrit-Change-Number: 17128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 19:35:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gsm-tester: Install helper scripts and sudoers.d files from git repo
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17131 ) Change subject: gsm-tester: Install helper scripts and sudoers.d files from git repo .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbdd291f4c3f7aecdd5118cc2b3b35edaddf7c09 Gerrit-Change-Number: 17131 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 19:35:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gsm-tester: Manual build and install of patchelf v0.10
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/17128 )
Change subject: gsm-tester: Manual build and install of patchelf v0.10
..
gsm-tester: Manual build and install of patchelf v0.10
Due to [1], we require both debian9 patchelf v0.9 and v0.10 to be
available and used by osmo-gsm-teser depending on the binary to be
patched.
[1] https://github.com/NixOS/patchelf/issues/192
Related: OS#4389
Change-Id: I28825d723b85900fb51cc5b8a9d14c6ef346e667
---
M ansible/roles/gsm-tester/tasks/main.yml
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
pespin: Verified
laforge: Looks good to me, approved
diff --git a/ansible/roles/gsm-tester/tasks/main.yml
b/ansible/roles/gsm-tester/tasks/main.yml
index 88f072e..0a5a838 100644
--- a/ansible/roles/gsm-tester/tasks/main.yml
+++ b/ansible/roles/gsm-tester/tasks/main.yml
@@ -129,6 +129,31 @@
tags:
- ofono
+# patchelf 0.9 available in debian has bugs with certain binaries. Version 0.10
+# fails on other binaries, so we need both 0.9 and 0.10 versions installed.
+- name: setup patchelf v0.10 repository
+ git:
+repo: 'https://github.com/NixOS/patchelf.git'
+dest: /root/patchelf
+version: "0.10"
+clone: yes
+update: no
+ tags:
+- patchelf
+
+- name: build patchelf v0.10
+ shell: |
+ autoreconf -fi && \
+ ./configure --prefix=/opt && \
+ make && \
+ mkdir -p /opt/bin/ && \
+ cp src/patchelf /opt/bin/patchelf-v0.10
+ args:
+chdir: /root/patchelf
+creates: /opt/bin/patchelf-v0.10
+ tags:
+- patchelf
+
- name: install gsm tester dependencies
apt:
name: "{{ item }}"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17128
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I28825d723b85900fb51cc5b8a9d14c6ef346e667
Gerrit-Change-Number: 17128
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: gsm-tester: Install helper scripts and sudoers.d files from git repo
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/17131 )
Change subject: gsm-tester: Install helper scripts and sudoers.d files from git
repo
..
gsm-tester: Install helper scripts and sudoers.d files from git repo
Let's avoid duplicating and having to add manually the files here every
time a new helper is required by osmo-gsm-tester.
Change-Id: Ibbdd291f4c3f7aecdd5118cc2b3b35edaddf7c09
---
D ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh
D ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_setup.sh
D ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_admin.sh
D ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_raw.sh
M ansible/roles/gsm-tester/tasks/main.yml
5 files changed, 25 insertions(+), 81 deletions(-)
Approvals:
pespin: Verified
laforge: Looks good to me, approved
diff --git a/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh
b/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh
deleted file mode 100755
index 336b746..000
--- a/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_exec.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-netns="$1"
-shift
-#TODO: Later on I may want to call myself with specific ENV and calling sudo
in order to run inside the netns but with dropped privileges
-ip netns exec $netns "$@"
diff --git a/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_setup.sh
b/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_setup.sh
deleted file mode 100755
index 1600c44..000
--- a/ansible/roles/gsm-tester/files/osmo-gsm-tester_netns_setup.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-
-ifname="$1"
-netns="$2"
-shift
-shift
-
-
-
-if [ -f "/var/run/netns/${netns}" ]; then
-echo "netns $netns already exists"
-else
-echo "Creating netns $netns"
-ip netns add "$netns"
-fi
-
-if [ -d "/sys/class/net/${ifname}" ]; then
-echo "Moving iface $ifname to netns $netns"
-ip link set $ifname netns $netns
-else
-ip netns exec $netns ls "/sys/class/net/${ifname}" >/dev/null && echo
"iface $ifname already in netns $netns"
-fi
diff --git a/ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_admin.sh
b/ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_admin.sh
deleted file mode 100644
index 60e527a..000
--- a/ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_admin.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/sbin/setcap cap_net_admin+ep "$1"
diff --git a/ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_raw.sh
b/ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_raw.sh
deleted file mode 100755
index 1f3a727..000
--- a/ansible/roles/gsm-tester/files/osmo-gsm-tester_setcap_net_raw.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/sbin/setcap cap_net_raw+ep "$1"
diff --git a/ansible/roles/gsm-tester/tasks/main.yml
b/ansible/roles/gsm-tester/tasks/main.yml
index 0a5a838..309c187 100644
--- a/ansible/roles/gsm-tester/tasks/main.yml
+++ b/ansible/roles/gsm-tester/tasks/main.yml
@@ -262,57 +262,33 @@
content: "@osmo-gsm-tester - rtprio 99"
dest: /etc/security/limits.d/osmo-gsm-tester_rtprio.conf
-- name: create a wrapper script to add CAP_NET_RAW
- copy:
-src: osmo-gsm-tester_setcap_net_raw.sh
-dest: /usr/local/bin/osmo-gsm-tester_setcap_net_raw.sh
-mode: 0755
+- name: setup osmo-gsm-tester repository
+ git:
+repo: 'git://git.osmocom.org/osmo-gsm-tester'
+dest: /root/osmo-gsm-tester
+version: master
+clone: yes
+update: no
+ tags:
+- osmo-gsm-tester
-- name: allow osmo-gsm-tester sudo osmo-gsm-tester_setcap_net_raw.sh
- copy:
-content: |
- %osmo-gsm-tester ALL=(root) NOPASSWD:
/usr/local/bin/osmo-gsm-tester_setcap_net_raw.sh
-dest: /etc/sudoers.d/osmo-gsm-tester_setcap_net_raw
-mode: 0440
+- name: Install osmo-gsm-tester script helpers to /usr/local/bin (PATH)
+ shell: |
+ mkdir -p /usr/local/bin/ && \
+ cp utils/bin/*.sh /usr/local/bin/
+ args:
+chdir: /root/osmo-gsm-tester
+ tags:
+- osmo-gsm-tester
-- name: create a wrapper script to add CAP_NET_ADMIN
- copy:
-src: osmo-gsm-tester_setcap_net_admin.sh
-dest: /usr/local/bin/osmo-gsm-tester_setcap_net_admin.sh
-mode: 0755
-
-- name: allow osmo-gsm-tester sudo osmo-gsm-tester_setcap_net_admin.sh
- copy:
-content: |
- %osmo-gsm-tester ALL=(root) NOPASSWD:
/usr/local/bin/osmo-gsm-tester_setcap_net_admin.sh
-dest: /etc/sudoers.d/osmo-gsm-tester_setcap_net_admin
-mode: 0440
-
-- name: create a wrapper script to run processes on modem netns
- copy:
-src: osmo-gsm-tester_netns_exec.sh
-dest: /usr/local/bin/osmo-gsm-tester_netns_exec.sh
-mode: 0755
-
-- name: allow osmo-gsm-tester sudo osmo-gsm-tester_netns_exec.sh
- copy:
-content: |
- %osmo-gsm-tester ALL=(root) NOPASSWD:
/usr/local/bin/osmo-gsm-tester_netns_exec.sh
-dest: /etc/sudoers.d/osmo-gsm-tester_netns_exec
-
Change in osmo-ci[master]: ansible: Install libsoapysdr-dev as dependency for srsLTE
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17144 ) Change subject: ansible: Install libsoapysdr-dev as dependency for srsLTE .. ansible: Install libsoapysdr-dev as dependency for srsLTE srsLTE supports using LimeSDR devices through SoapySDR. Change-Id: Idd8baf934cb9245e0f897e84754905172b659e40 --- M ansible/roles/gsm-tester/tasks/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/ansible/roles/gsm-tester/tasks/main.yml b/ansible/roles/gsm-tester/tasks/main.yml index 309c187..ef51178 100644 --- a/ansible/roles/gsm-tester/tasks/main.yml +++ b/ansible/roles/gsm-tester/tasks/main.yml @@ -57,6 +57,7 @@ - libpcsclite-dev - libuhd-dev - libczmq-dev +- libsoapysdr-dev - name: install ofono build dependencies apt: diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index bfa9715..bc90aae 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -149,3 +149,4 @@ - libpcsclite-dev - libuhd-dev - libczmq-dev +- libsoapysdr-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idd8baf934cb9245e0f897e84754905172b659e40 Gerrit-Change-Number: 17144 Gerrit-PatchSet: 1 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+1 -- 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-Comment-Date: Fri, 14 Feb 2020 19:35:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-read.py: fix reading and parsing of EF.MSISDN
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: pySim-read.py: fix reading and parsing of EF.MSISDN .. Patch Set 17: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 17 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-Comment-Date: Fri, 14 Feb 2020 19:33:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards/sysmoUSIM-SJS1: support programming of EF.HPLMNwAcT
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: cards/sysmoUSIM-SJS1: support programming of EF.HPLMNwAcT .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:32:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards/sysmoUSIM-SJS1: support programming of ACC bits
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16950 ) Change subject: cards/sysmoUSIM-SJS1: support programming of ACC bits .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0ed9e5654dc0a70a4732bbe5787f1900789d580 Gerrit-Change-Number: 16950 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Fri, 14 Feb 2020 19:32:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: Fix MCC and MCC representation in the output of pySim-read
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fix MCC and MCC representation in the output of pySim-read .. Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 8 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:33:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-prog.py: add presence/length checks for user-provided SPN
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: pySim-prog.py: add presence/length checks for user-provided SPN .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 5 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:31:54 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards: fix reading of EF.HPLMNwAcT in Card.update_hplmn_act()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: cards: fix reading of EF.HPLMNwAcT in Card.update_hplmn_act() .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 9 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Fri, 14 Feb 2020 19:32:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: cards: cosmetic/indentation fix: use tabs, not spaces
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17149 ) Change subject: cards: cosmetic/indentation fix: use tabs, not spaces .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d9cbdb0ecbee783729d0a208d12f8e59ca957ff Gerrit-Change-Number: 17149 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:32:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/17019
)
Change subject: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/
..
pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/
Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6
---
M pySim-read.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/pySim-read.py b/pySim-read.py
index b59b7f3..853e924 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -140,7 +140,7 @@
else:
print("PLMNsel: Can't read, response code = %s" % (sw,))
except Exception as e:
- print("HPLMNAcT: Can't read file -- " + str(e))
+ print("PLMNsel: Can't read file -- " + str(e))
# EF.PLMNwAcT
try:
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/17019
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6
Gerrit-Change-Number: 17019
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in pysim[master]: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17019 ) Change subject: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/ .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 Gerrit-Change-Number: 17019 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:31:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: Fix compatibility with Python 3: print() is a function
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/16982
)
Change subject: Fix compatibility with Python 3: print() is a function
..
Fix compatibility with Python 3: print() is a function
Change-Id: I5dd8e5daf420fc8667c5156bfacc8763d8895993
---
M README.md
M pySim-prog.py
M pySim-read.py
M pySim/card_handler.py
M pySim/transport/serial.py
5 files changed, 51 insertions(+), 51 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/README.md b/README.md
index 85b9a57..7074ffa 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@
sl.wait_for_card()
# Print IMSI
-print sc.read_binary(['3f00', '7f20', '6f07'])
+print(sc.read_binary(['3f00', '7f20', '6f07']))
# Run A3/A8
-print sc.run_gsm('00112233445566778899aabbccddeeff')
+print(sc.run_gsm('00112233445566778899aabbccddeeff'))
diff --git a/pySim-prog.py b/pySim-prog.py
index b070c5e..bfb40b2 100755
--- a/pySim-prog.py
+++ b/pySim-prog.py
@@ -173,7 +173,7 @@
if options.type == 'list':
for kls in _cards_classes:
- print kls.name
+ print(kls.name)
sys.exit(0)
if options.probe:
@@ -560,7 +560,7 @@
for k in BATCH_INCOMPATIBLE:
if getattr(opts, k):
- print "Incompatible option with batch_state: %s" % (k,)
+ print("Incompatible option with batch_state: %s" % (k,))
sys.exit(-1)
# Don't load state if there is none ...
@@ -568,7 +568,7 @@
return
if not os.path.isfile(opts.batch_state):
- print "No state file yet"
+ print("No state file yet")
return
# Get stored data
@@ -601,12 +601,12 @@
for kls in _cards_classes:
card = kls.autodetect(scc)
if card:
- print "Autodetected card type: %s" % card.name
+ print("Autodetected card type: %s" % card.name)
card.reset()
break
if card is None:
- print "Autodetection failed"
+ print("Autodetection failed")
return
if opts.type == "auto_once":
@@ -631,7 +631,7 @@
# Get card
card = card_detect(opts, scc)
if card is None:
- print "No card detected!"
+ print("No card detected!")
return -1
# Probe only
@@ -640,7 +640,7 @@
# Erase if requested
if opts.erase:
- print "Formatting ..."
+ print("Formatting ...")
card.erase()
card.reset()
@@ -666,16 +666,16 @@
imsi = opts.imsi
cp = read_params_csv(opts, imsi=imsi, iccid=iccid)
if cp is None:
- print "Error reading parameters from CSV file!\n"
+ print("Error reading parameters from CSV file!\n")
return 2
print_parameters(cp)
if opts.dry_run is False:
# Program the card
- print "Programming ..."
+ print("Programming ...")
card.program(cp)
else:
- print "Dry Run: NOT PROGRAMMING!"
+ print("Dry Run: NOT PROGRAMMING!")
# Write parameters permanently
write_parameters(opts, cp)
@@ -716,9 +716,9 @@
# If we use a CSV file as data input, check if the CSV file exists.
if opts.source == 'csv':
- print "Using CSV file as data input: " + str(opts.read_csv)
+ print("Using CSV file as data input: " + str(opts.read_csv))
if not os.path.isfile(opts.read_csv):
- print "CSV file not found!"
+ print("CSV file not found!")
sys.exit(1)
# Batch mode init
@@ -737,18 +737,18 @@
try:
rc = process_card(opts, first, card_handler)
except (KeyboardInterrupt):
- print ""
- print "Terminated by user!"
+ print("")
+ print("Terminated by user!")
sys.exit(0)
except (SystemExit):
raise
except:
- print ""
- print "Card programming failed with an execption:"
- print "-8<-"
+ print("")
+
Change in pysim[master]: testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/17150 ) Change subject: testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT .. testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT Change-Id: Ibe1bf274c15a3159b012c6fe07ef6a7cbf0adbdb Related: OS#4383 --- M pysim-testdata/sysmoUSIM-SJS1.ok 1 file changed, 12 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index d9a9072..d0523f8 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -36,18 +36,18 @@ ff # unused HPLMNAcT: - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused + fff11f # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused ACC: 0008 MSISDN: Not available -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibe1bf274c15a3159b012c6fe07ef6a7cbf0adbdb Gerrit-Change-Number: 17150 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in pysim[master]: pySim-read.py: print meaningful message when SPN is not set
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/16981 ) Change subject: pySim-read.py: print meaningful message when SPN is not set .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca Gerrit-Change-Number: 16981 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 14 Feb 2020 19:31:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17150 ) Change subject: testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibe1bf274c15a3159b012c6fe07ef6a7cbf0adbdb Gerrit-Change-Number: 17150 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 19:30:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/17019 ) Change subject: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/ .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 Gerrit-Change-Number: 17019 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 14 Feb 2020 15:51:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/17150 ) Change subject: testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT .. testdata/sysmoUSIM-SJS1.ok: make it match the actual EF.HPLMNAcT Change-Id: Ibe1bf274c15a3159b012c6fe07ef6a7cbf0adbdb Related: OS#4383 --- M pysim-testdata/sysmoUSIM-SJS1.ok 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/17150/1 diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index d9a9072..d0523f8 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -36,18 +36,18 @@ ff # unused HPLMNAcT: - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused - ff # unused + fff11f # MCC: 1651 MNC: 151 AcT: UTRAN, E-UTRAN, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused + ff # unused ACC: 0008 MSISDN: Not available -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibe1bf274c15a3159b012c6fe07ef6a7cbf0adbdb Gerrit-Change-Number: 17150 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in pysim[master]: pySim-prog.py: add support for MSISDN programming
fixeria has uploaded a new patch set (#8) to the change originally created by
herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16946 )
Change subject: pySim-prog.py: add support for MSISDN programming
..
pySim-prog.py: add support for MSISDN programming
This change implements programming of EF.MSISDN as per 3GPP TS 31.102,
sections 4.2.26 and 4.4.2.3, excluding the following fields:
- Alpha Identifier (currently 'FF'O * 20),
- Capability/Configuration1 Record Identifier ('FF'O),
- Extension1 Record Identifier ('FF'O).
This feature is introduced exclusively for sysmoUSIM-SJS1.
Othere SIM card types need to be tested.
Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
---
M pySim-prog.py
M pySim/cards.py
M pySim/utils.py
3 files changed, 52 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/8
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/16946
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
Gerrit-Change-Number: 16946
Gerrit-PatchSet: 8
Gerrit-Owner: herlesupreeth
Gerrit-Assignee: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-CC: dexter
Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: fix reading and parsing of EF.MSISDN
fixeria has uploaded a new patch set (#17) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: pySim-read.py: fix reading and parsing of EF.MSISDN .. pySim-read.py: fix reading and parsing of EF.MSISDN This change implements parsing of EF.MSISDN (and thus EF.ADN) as per 3GPP TS 31.102, sections 4.2.26 and 4.4.2.3. Example (commercial SIM card from 401/02): EF.MSISDN: 07917787028982f7 Decoded: (ToN=1 NPI=1) +77782098287 Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pySim/utils.py 2 files changed, 46 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/17 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 17 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in pysim[master]: Fix MCC and MCC representation in the output of pySim-read
fixeria has uploaded a new patch set (#8) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fix MCC and MCC representation in the output of pySim-read .. Fix MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 48 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 8 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in pysim[master]: WIP: pySim-read.py: parse SIM Service table based on SIM type
fixeria has uploaded a new patch set (#3) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: WIP: pySim-read.py: parse SIM Service table based on SIM type .. WIP: pySim-read.py: parse SIM Service table based on SIM type If USIM is present the EF.UST service mapping is used, otherwise the EF.SST is used. Change-Id: I6680e8c7f86326f72b98a8e0dd5b58e55013 --- M pySim-read.py A pySim/ts_31_102.py M pySim/ts_51_011.py M pySim/utils.py 4 files changed, 256 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/16991/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a8e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: contrib/*sysmo.sh: Fix default poky SDK path
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17148 ) Change subject: contrib/*sysmo.sh: Fix default poky SDK path .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17148 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: I002fde53684cd4a43c9f22e09264056f2a950c24 Gerrit-Change-Number: 17148 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 15:36:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib/*sysmo.sh: Fix default poky SDK path
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17148 ) Change subject: contrib/*sysmo.sh: Fix default poky SDK path .. contrib/*sysmo.sh: Fix default poky SDK path ansible scripts are installing the SDK in "poky-sdk" dir, not "poky" one. Change-Id: I002fde53684cd4a43c9f22e09264056f2a950c24 --- M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 82dae39..fc528d3 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -5,7 +5,7 @@ _poky_path="$POKY_PATH" [ -z "$_poky_version" ] && _poky_version="2.3.4" -[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" +[ -z "$_poky_path" ] && _poky_path="/opt/poky-sdk/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index 13f37b5..789b0c0 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -5,7 +5,7 @@ _poky_path="$POKY_PATH" [ -z "$_poky_version" ] && _poky_version="2.3.4" -[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" +[ -z "$_poky_path" ] && _poky_path="/opt/poky-sdk/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17148 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: I002fde53684cd4a43c9f22e09264056f2a950c24 Gerrit-Change-Number: 17148 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-sysmo: merge measurement data and payload
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17146 ) Change subject: osmo-bts-sysmo: merge measurement data and payload .. Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/17146/1/src/common/l1sap.c File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/17146/1/src/common/l1sap.c@187 PS1, Line 187: int add_l1sap_header2(struct gsm_bts_trx *trx, struct msgb *rmsg, This is not a public library which must maintain API compatibility, please avoid this kind of mangling and simply add the params and use 0,0,0 when needed. https://gerrit.osmocom.org/c/osmo-bts/+/17146/1/src/osmo-bts-sysmo/l1_if.c File src/osmo-bts-sysmo/l1_if.c: https://gerrit.osmocom.org/c/osmo-bts/+/17146/1/src/osmo-bts-sysmo/l1_if.c@992 PS1, Line 992: l1sap->u.data.ber10k = data_ind->measParam.fBer * 1; Can you explain what's the rationale behind this condition being dropped here? It should be in commit log too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iffe7865727fbf9bca8eb32a96e8ea05cf718a948 Gerrit-Change-Number: 17146 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 15:35:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-prog.py: add support for MSISDN programming
fixeria has uploaded a new patch set (#7) to the change originally created by
herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16946 )
Change subject: pySim-prog.py: add support for MSISDN programming
..
pySim-prog.py: add support for MSISDN programming
This change implements programming of EF.MSISDN as per 3GPP TS 31.102,
sections 4.2.26 and 4.4.2.3, excluding the following fields:
- Alpha Identifier (currently 'FF'O * 20),
- Capability/Configuration1 Record Identifier ('FF'O),
- Extension1 Record Identifier ('FF'O).
This feature is introduced exclusively for sysmoUSIM-SJS1.
Othere SIM card types need to be tested.
Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
---
M pySim-prog.py
M pySim/cards.py
M pySim/utils.py
3 files changed, 52 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/46/16946/7
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/16946
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie033a0ffc3697ae562eaa7a241a0f6af6c2b0594
Gerrit-Change-Number: 16946
Gerrit-PatchSet: 7
Gerrit-Owner: herlesupreeth
Gerrit-Assignee: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-CC: dexter
Gerrit-MessageType: newpatchset
Change in pysim[master]: cards: cosmetic/indentation fix: use tabs, not spaces
Hello herlesupreeth, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/pysim/+/17149 to review the following change. Change subject: cards: cosmetic/indentation fix: use tabs, not spaces .. cards: cosmetic/indentation fix: use tabs, not spaces Change-Id: I5d9cbdb0ecbee783729d0a208d12f8e59ca957ff --- M pySim/cards.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/17149/1 diff --git a/pySim/cards.py b/pySim/cards.py index 022182c..a49fe43 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -175,7 +175,7 @@ each possible provider uses a specific record number in each EF. The indexes used are ( where N is the number of providers supported ) : - [2 .. N+1] for the operator name - - [1 .. N] for the programable EFs +- [1 .. N] for the programable EFs * 3f00/7f4d/8f0c : Operator Name -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d9cbdb0ecbee783729d0a208d12f8e59ca957ff Gerrit-Change-Number: 17149 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-MessageType: newchange
Change in pysim[master]: pySim-prog.py: add presence/length checks for user-provided SPN
fixeria has uploaded a new patch set (#4) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16977 ) Change subject: pySim-prog.py: add presence/length checks for user-provided SPN .. pySim-prog.py: add presence/length checks for user-provided SPN Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 --- M pySim-prog.py M pySim/cards.py 2 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/16977/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35fab9a85efda2b83f221a460d31c7d41db582b0 Gerrit-Change-Number: 16977 Gerrit-PatchSet: 4 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: fix reading and parsing of EF.MSISDN
fixeria has uploaded a new patch set (#16) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16947 ) Change subject: pySim-read.py: fix reading and parsing of EF.MSISDN .. pySim-read.py: fix reading and parsing of EF.MSISDN This change implements parsing of EF.MSISDN (and thus EF.ADN) as per 3GPP TS 31.102, sections 4.2.26 and 4.4.2.3. Example (commercial SIM card from 401/02): EF.MSISDN: 07917787028982f7 Decoded: (ToN=1 NPI=1) +77782098287 Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 --- M pySim-read.py M pySim/utils.py 2 files changed, 46 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/47/16947/16 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie914ae83d787e3f1a90f9f305bffd45053b8c863 Gerrit-Change-Number: 16947 Gerrit-PatchSet: 16 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in pysim[master]: WIP: pySim-read.py: parse SIM Service table based on SIM type
fixeria has uploaded a new patch set (#2) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16991 ) Change subject: WIP: pySim-read.py: parse SIM Service table based on SIM type .. WIP: pySim-read.py: parse SIM Service table based on SIM type If USIM is present the EF.UST service mapping is used, otherwise the EF.SST is used. Change-Id: I6680e8c7f86326f72b98a8e0dd5b58e55013 --- M pySim-read.py A pySim/ts_31_102.py M pySim/ts_51_011.py M pySim/utils.py 4 files changed, 256 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/91/16991/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6680e8c7f86326f72b98a8e0dd5b58e55013 Gerrit-Change-Number: 16991 Gerrit-PatchSet: 2 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: herlesupreeth Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in pysim[master]: cards: fix reading of EF.HPLMNwAcT in Card.update_hplmn_act()
fixeria has uploaded a new patch set (#8) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16945 ) Change subject: cards: fix reading of EF.HPLMNwAcT in Card.update_hplmn_act() .. cards: fix reading of EF.HPLMNwAcT in Card.update_hplmn_act() Change-Id: I35848059d6082c379246c8d695cb094c20780d15 --- M pySim/cards.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/45/16945/8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I35848059d6082c379246c8d695cb094c20780d15 Gerrit-Change-Number: 16945 Gerrit-PatchSet: 8 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in pysim[master]: cards/sysmoUSIM-SJS1: support programming of EF.HPLMNwAcT
fixeria has uploaded a new patch set (#6) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16972 ) Change subject: cards/sysmoUSIM-SJS1: support programming of EF.HPLMNwAcT .. cards/sysmoUSIM-SJS1: support programming of EF.HPLMNwAcT Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 --- M pySim/cards.py 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/16972/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ida93f4a00fe3b1d0f05d6eeda0e7873ce16d4c17 Gerrit-Change-Number: 16972 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in pysim[master]: Fix MCC and MCC representation in the output of pySim-read
fixeria has uploaded a new patch set (#7) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16944 ) Change subject: Fix MCC and MCC representation in the output of pySim-read .. Fix MCC and MCC representation in the output of pySim-read Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 --- M pySim/utils.py M pysim-testdata/Fairwaves-SIM.ok M pysim-testdata/Wavemobile-SIM.ok M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmoUSIM-SJS1.ok 5 files changed, 59 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/44/16944/7 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie699c0a38d5ae90e4d6109e4574ce860e4044096 Gerrit-Change-Number: 16944 Gerrit-PatchSet: 7 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: herlesupreeth Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/17019 to look at the new patch set (#2). Change subject: pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/ .. pySim-read.py: fix copy-paste: s/HPLMNAcT/PLMNsel/ Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 --- M pySim-read.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/19/17019/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/17019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a452a2e439cb713621a028cf0046339f50864b6 Gerrit-Change-Number: 17019 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in pysim[master]: cards/sysmoUSIM-SJS1: support programming of ACC bits
fixeria has uploaded a new patch set (#6) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16950 ) Change subject: cards/sysmoUSIM-SJS1: support programming of ACC bits .. cards/sysmoUSIM-SJS1: support programming of ACC bits Change-Id: Id0ed9e5654dc0a70a4732bbe5787f1900789d580 --- M pySim/cards.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/50/16950/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id0ed9e5654dc0a70a4732bbe5787f1900789d580 Gerrit-Change-Number: 16950 Gerrit-PatchSet: 6 Gerrit-Owner: herlesupreeth Gerrit-Assignee: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-MessageType: newpatchset
Change in pysim[master]: pySim-read.py: print meaningful message when SPN is not set
fixeria has uploaded a new patch set (#3) to the change originally created by herlesupreeth. ( https://gerrit.osmocom.org/c/pysim/+/16981 ) Change subject: pySim-read.py: print meaningful message when SPN is not set .. pySim-read.py: print meaningful message when SPN is not set Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca --- M pySim-read.py M pysim-testdata/sysmoISIM-SJA2.ok M pysim-testdata/sysmosim-gr1.ok 3 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/16981/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/16981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1d98520f33a8564c7d69f50a0811204f138f9dca Gerrit-Change-Number: 16981 Gerrit-PatchSet: 3 Gerrit-Owner: herlesupreeth Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: contrib/*sysmo.sh: Fix default poky SDK path
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17148 ) Change subject: contrib/*sysmo.sh: Fix default poky SDK path .. contrib/*sysmo.sh: Fix default poky SDK path ansible scripts are installing the SDK in "poky-sdk" dir, not "poky" one. Change-Id: I002fde53684cd4a43c9f22e09264056f2a950c24 --- M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/48/17148/1 diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 82dae39..fc528d3 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -5,7 +5,7 @@ _poky_path="$POKY_PATH" [ -z "$_poky_version" ] && _poky_version="2.3.4" -[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" +[ -z "$_poky_path" ] && _poky_path="/opt/poky-sdk/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index 13f37b5..789b0c0 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -5,7 +5,7 @@ _poky_path="$POKY_PATH" [ -z "$_poky_version" ] && _poky_version="2.3.4" -[ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" +[ -z "$_poky_path" ] && _poky_path="/opt/poky-sdk/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17148 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: I002fde53684cd4a43c9f22e09264056f2a950c24 Gerrit-Change-Number: 17148 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-ci[master]: poky-sdk: Use first letter in caps (as in python bool)
pespin has uploaded this change for review. (
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(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/47/17147/1
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: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-sysmo: merge measurement data and payload
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/17146 )
Change subject: osmo-bts-sysmo: merge measurement data and payload
..
osmo-bts-sysmo: merge measurement data and payload
For osmo-bts-sysmo the MPH INFO MEAS IND indication is still sent
separately. Lets merge the measurement information into the PH DATA
and TCH indication like we already did it for osmo-bts-trx
Change-Id: Iffe7865727fbf9bca8eb32a96e8ea05cf718a948
Related: OS#2977
---
M include/osmo-bts/l1sap.h
M src/common/l1sap.c
M src/osmo-bts-sysmo/l1_if.c
M src/osmo-bts-sysmo/main.c
M src/osmo-bts-sysmo/tch.c
5 files changed, 35 insertions(+), 32 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/17146/1
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 1883869..94d42d8 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -136,6 +136,11 @@
struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,
uint16_t ber10k, int16_t lqual_cb);
+int add_l1sap_header2(struct gsm_bts_trx *trx, struct msgb *rmsg,
+struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,
+uint16_t ber10k, int16_t lqual_cb, int8_t rssi,
+int16_t ta_offs, uint8_t is_sub);
+
#define msgb_l1sap_prim(msg) ((struct osmo_phsap_prim *)(msg)->l1h)
int bts_check_for_first_ciphrd(struct gsm_lchan *lchan,
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 0b51045..084c86b 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -180,6 +180,15 @@
struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,
uint16_t ber10k, int16_t lqual_cb)
{
+ return add_l1sap_header2(trx, rmsg, lchan, chan_nr, fn, ber10k,
+lqual_cb, 0, 0, 0);
+}
+
+int add_l1sap_header2(struct gsm_bts_trx *trx, struct msgb *rmsg,
+struct gsm_lchan *lchan, uint8_t chan_nr, uint32_t fn,
+uint16_t ber10k, int16_t lqual_cb, int8_t rssi,
+int16_t ta_offs, uint8_t is_sub)
+{
struct osmo_phsap_prim *l1sap;
LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "Rx -> RTP: %s\n",
osmo_hexdump(rmsg->data, rmsg->len));
@@ -194,6 +203,10 @@
l1sap->u.tch.ber10k = ber10k;
l1sap->u.tch.lqual_cb = lqual_cb;
+ l1sap->u.tch.rssi = rssi;
+ l1sap->u.tch.ta_offs_256bits = ta_offs;
+ l1sap->u.tch.is_sub = is_sub;
+
return l1sap_up(trx, l1sap);
}
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index db0dfb5..2e5e5b6 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -940,25 +940,6 @@
#define LOG_FMT_MEAS "Meas: RSSI %-3.2f dBm, Qual %-3.2f dB, BER %-3.2f,
Timing %d"
#define LOG_PARAM_MEAS(meas_param) (meas_param)->fRssi,
(meas_param)->fLinkQuality, (meas_param)->fBer, (meas_param)->i16BurstTiming
-static int process_meas_res(struct gsm_bts_trx *trx, uint8_t chan_nr,
- uint32_t fn, GsmL1_MeasParam_t *m)
-{
- struct osmo_phsap_prim l1sap;
- memset(, 0, sizeof(l1sap));
- osmo_prim_init(, SAP_GSM_PH, PRIM_MPH_INFO,
- PRIM_OP_INDICATION, NULL);
- l1sap.u.info.type = PRIM_INFO_MEAS;
- l1sap.u.info.u.meas_ind.chan_nr = chan_nr;
- l1sap.u.info.u.meas_ind.ta_offs_256bits = m->i16BurstTiming * 64;
- l1sap.u.info.u.meas_ind.ber10k = (unsigned int) (m->fBer * 1);
- l1sap.u.info.u.meas_ind.inv_rssi = (uint8_t) (m->fRssi * -1);
- l1sap.u.info.u.meas_ind.fn = fn;
-
- /* l1sap wants to take msgb ownership. However, as there is no
-* msg, it will msgb_free(l1sap.oph.msg == NULL) */
- return l1sap_up(trx, );
-}
-
static int handle_ph_data_ind(struct femtol1_hdl *fl1, GsmL1_PhDataInd_t
*data_ind,
struct msgb *l1p_msg)
{
@@ -983,8 +964,6 @@
fn = data_ind->u32Fn;
link_id = (data_ind->sapi == GsmL1_Sapi_Sacch) ? LID_SACCH : LID_DEDIC;
- process_meas_res(trx, chan_nr, fn, _ind->measParam);
-
gsm_fn2gsmtime(_time, fn);
DEBUGPGT(DL1P, _time, "Rx PH-DATA.ind %s (hL2 %08x): %s, "
LOG_FMT_MEAS "\n",
@@ -1010,11 +989,10 @@
l1sap->u.data.chan_nr = chan_nr;
l1sap->u.data.fn = fn;
l1sap->u.data.rssi = (int8_t) (data_ind->measParam.fRssi);
- if (!pcu_direct) { /* FIXME: if pcu_direct=1, then this is not set,
what to do in pcu_tx_data_ind() in this case ?*/
- l1sap->u.data.ber10k = data_ind->measParam.fBer * 1;
- l1sap->u.data.ta_offs_256bits =
data_ind->measParam.i16BurstTiming * 64;
- l1sap->u.data.lqual_cb = data_ind->measParam.fLinkQuality * 10;
- }
+ l1sap->u.data.ber10k = data_ind->measParam.fBer * 1;
+ l1sap->u.data.ta_offs_256bits =
Change in osmo-gsm-tester[master]: contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17145 ) Change subject: contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17145 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: I8c855456c7f94a3d6ee58ca550a056a0fea61a71 Gerrit-Change-Number: 17145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:50:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17145 ) Change subject: contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4 .. contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4 Current latest poky SDK is 2.3.4, and that's the one we have installed in all buildhosts. Change-Id: I8c855456c7f94a3d6ee58ca550a056a0fea61a71 --- M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 4370ecd..82dae39 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -4,7 +4,7 @@ _poky_version="$POKY_VERSION" _poky_path="$POKY_PATH" -[ -z "$_poky_version" ] && _poky_version="2.3.2" +[ -z "$_poky_version" ] && _poky_version="2.3.4" [ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index ecc8bc3..13f37b5 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -4,7 +4,7 @@ _poky_version="$POKY_VERSION" _poky_path="$POKY_PATH" -[ -z "$_poky_version" ] && _poky_version="2.3.2" +[ -z "$_poky_version" ] && _poky_version="2.3.4" [ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17145 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: I8c855456c7f94a3d6ee58ca550a056a0fea61a71 Gerrit-Change-Number: 17145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: Introduce osmo-gsm-tester docker setup
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17143 ) Change subject: Introduce osmo-gsm-tester docker setup .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17143 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iac7c0b613048ce332642d3957c55cc7c53b56d42 Gerrit-Change-Number: 17143 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:45:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gsm-tester: Manual build and install of patchelf v0.10
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17128 ) Change subject: gsm-tester: Manual build and install of patchelf v0.10 .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17128 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I28825d723b85900fb51cc5b8a9d14c6ef346e667 Gerrit-Change-Number: 17128 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:45:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ansible: Install libsoapysdr-dev as dependency for srsLTE
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17144 ) Change subject: ansible: Install libsoapysdr-dev as dependency for srsLTE .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17144 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idd8baf934cb9245e0f897e84754905172b659e40 Gerrit-Change-Number: 17144 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:44:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: gsm-tester: Install helper scripts and sudoers.d files from git repo
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/17131 ) Change subject: gsm-tester: Install helper scripts and sudoers.d files from git repo .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/17131 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbdd291f4c3f7aecdd5118cc2b3b35edaddf7c09 Gerrit-Change-Number: 17131 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:45:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17145 ) Change subject: contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4 .. contrib/*sysmo.sh: Fix default poky SDK version to 2.3.4 Current latest poky SDK is 2.3.4, and that's the one we have installed in all buildhosts. Change-Id: I8c855456c7f94a3d6ee58ca550a056a0fea61a71 --- M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-pcu-sysmo.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/45/17145/1 diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 4370ecd..82dae39 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -4,7 +4,7 @@ _poky_version="$POKY_VERSION" _poky_path="$POKY_PATH" -[ -z "$_poky_version" ] && _poky_version="2.3.2" +[ -z "$_poky_version" ] && _poky_version="2.3.4" [ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" diff --git a/contrib/jenkins-build-osmo-pcu-sysmo.sh b/contrib/jenkins-build-osmo-pcu-sysmo.sh index ecc8bc3..13f37b5 100755 --- a/contrib/jenkins-build-osmo-pcu-sysmo.sh +++ b/contrib/jenkins-build-osmo-pcu-sysmo.sh @@ -4,7 +4,7 @@ _poky_version="$POKY_VERSION" _poky_path="$POKY_PATH" -[ -z "$_poky_version" ] && _poky_version="2.3.2" +[ -z "$_poky_version" ] && _poky_version="2.3.4" [ -z "$_poky_path" ] && _poky_path="/opt/poky/$_poky_version" . "$_poky_path/environment-setup-armv5te-poky-linux-gnueabi" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17145 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: I8c855456c7f94a3d6ee58ca550a056a0fea61a71 Gerrit-Change-Number: 17145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: Initial srsLTE support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17139 ) Change subject: Initial srsLTE support .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17139 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: I290c0d79258a9f94f00c7ff2e1c6c5579c0e32f4 Gerrit-Change-Number: 17139 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:24:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: default-suites.conf: Run 4g test suite (srsLTE ZeroMQ)
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17142 ) Change subject: default-suites.conf: Run 4g test suite (srsLTE ZeroMQ) .. default-suites.conf: Run 4g test suite (srsLTE ZeroMQ) Change-Id: I3f8c3588d7b139f044462d02069919256126bf57 --- M example/default-suites.conf 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/example/default-suites.conf b/example/default-suites.conf index a0dabdd..cfac1ca 100644 --- a/example/default-suites.conf +++ b/example/default-suites.conf @@ -161,3 +161,5 @@ - nitb_smpp - smpp - encryption + +- 4g -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17142 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: I3f8c3588d7b139f044462d02069919256126bf57 Gerrit-Change-Number: 17142 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: default-suites.conf: Run 4g test suite (srsLTE ZeroMQ)
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17142 ) Change subject: default-suites.conf: Run 4g test suite (srsLTE ZeroMQ) .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17142 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: I3f8c3588d7b139f044462d02069919256126bf57 Gerrit-Change-Number: 17142 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 14:24:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-hlr[master]: mslookup_client_mdns_test: no automatic skip
osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-hlr/+/17072 )
Change subject: mslookup_client_mdns_test: no automatic skip
..
mslookup_client_mdns_test: no automatic skip
Exit with error code if multicast is disabled. The test is disabled by
default already, so when explicitly enabling it, we should not
automatically skip it.
Related: OS#4385
Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b
---
M tests/mslookup/mslookup_client_mdns_test.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/tests/mslookup/mslookup_client_mdns_test.c
b/tests/mslookup/mslookup_client_mdns_test.c
index f33ef98..5e558b4 100644
--- a/tests/mslookup/mslookup_client_mdns_test.c
+++ b/tests/mslookup/mslookup_client_mdns_test.c
@@ -225,8 +225,8 @@
int main()
{
if (!is_multicast_enabled()) {
- fprintf(stderr, "WARNING: multicast is disabled, skipping the
test! (OS#4361)");
- return 77;
+ fprintf(stderr, "ERROR: multicast is disabled! (OS#4361)");
+ return 1;
}
talloc_enable_null_tracking();
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17072
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I82022c23fa9c40535f922b12d917efd7e229912b
Gerrit-Change-Number: 17072
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in osmo-hlr[master]: mslookup_client_mdns_test: disable by default
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17071 ) Change subject: mslookup_client_mdns_test: disable by default .. mslookup_client_mdns_test: disable by default Only build and run the test, if --enable-mslookup-client-mdns-test is passed to ./configure. Enable that option in jenkins.sh. Related: OS#4385 Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 --- M configure.ac M contrib/jenkins.sh M tests/mslookup/Makefile.am M tests/testsuite.at 4 files changed, 29 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 59261e8..34c5163 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,15 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# mslookup_client_mdns_test (OS#4385: does not work everywhere) +AC_ARG_ENABLE([mslookup_client_mdns_test], + AC_HELP_STRING([--enable-mslookup-client-mdns-test], + [Include the mslookup_client_mdns_test in make check [default=no]]), + [enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"]) +AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test]) +AC_MSG_RESULT([$enable_mslookup_client_mdns_test]) +AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes") + # Generate manuals AC_ARG_ENABLE(manuals, [AS_HELP_STRING( diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5914182..522d72e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -49,7 +49,12 @@ cd "$base" autoreconf --install --force -./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +./configure \ + --enable-sanitize \ + --enable-external-tests \ + --enable-mslookup-client-mdns-test \ + --enable-werror \ + $CONFIG $MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am index ebf2add..04778e8 100644 --- a/tests/mslookup/Makefile.am +++ b/tests/mslookup/Makefile.am @@ -24,7 +24,6 @@ check_PROGRAMS = \ mdns_test \ - mslookup_client_mdns_test \ mslookup_client_test \ mslookup_test \ $(NULL) @@ -45,14 +44,6 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -mslookup_client_mdns_test_SOURCES = \ - mslookup_client_mdns_test.c \ - $(NULL) -mslookup_client_mdns_test_LDADD = \ - $(top_builddir)/src/mslookup/libosmo-mslookup.la \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - mdns_test_SOURCES = \ mdns_test.c \ $(NULL) @@ -61,6 +52,18 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) +if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST +check_PROGRAMS += mslookup_client_mdns_test + +mslookup_client_mdns_test_SOURCES = \ + mslookup_client_mdns_test.c \ + $(NULL) +mslookup_client_mdns_test_LDADD = \ + $(top_builddir)/src/mslookup/libosmo-mslookup.la \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) +endif + .PHONY: update_exp update_exp: for i in $(check_PROGRAMS); do \ diff --git a/tests/testsuite.at b/tests/testsuite.at index 827e9f8..d30b5e9 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -58,7 +58,9 @@ AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr]) AT_CLEANUP +# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385) AT_SETUP([mslookup_client_mdns]) +AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ]) AT_KEYWORDS([mslookup_client_mdns]) cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr]) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 Gerrit-Change-Number: 17071 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-hlr[master]: mslookup_client_mdns_test: disable by default
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/17071 ) Change subject: mslookup_client_mdns_test: disable by default .. Patch Set 1: Verified+1 Code-Review+2 Fixes the problem for me. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/17071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ie0cd4b0c55a1fbb00c215aeec7dcd0c15805add3 Gerrit-Change-Number: 17071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 14 Feb 2020 09:40:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
