<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15313">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, but someone else must approve; Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog: Use CSV format with headers<br><br>This way we can have optional fields like pin_adm in the file<br>Also require iccid as identifier for the SIM card<br>Set defaults for optional card parameters.<br><br>Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236<br>---<br>A csv-format<br>M pySim-prog.py<br>2 files changed, 44 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/csv-format b/csv-format</span><br><span>new file mode 100644</span><br><span>index 0000000..808003a</span><br><span>--- /dev/null</span><br><span>+++ b/csv-format</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+This file aims to describe the format of the CSV file pySim uses.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+The first line contains the fieldnames which will be used by pySim. This</span><br><span style="color: hsl(120, 100%, 40%);">+avoids having a specific order.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+The field names are the following:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+iccid: ICCID of the card. Used to identify the cards (with --read-iccid)</span><br><span style="color: hsl(120, 100%, 40%);">+imsi: IMSI of the card</span><br><span style="color: hsl(120, 100%, 40%);">+mcc: Mobile Country Code (optional)</span><br><span style="color: hsl(120, 100%, 40%);">+mnc: Mobile Network Code (optional)</span><br><span style="color: hsl(120, 100%, 40%);">+smsp: MSISDN of the SMSC (optional)</span><br><span style="color: hsl(120, 100%, 40%);">+ki: Ki</span><br><span style="color: hsl(120, 100%, 40%);">+opc: OPc</span><br><span style="color: hsl(120, 100%, 40%);">+acc: Access class of the SIM (optional)</span><br><span style="color: hsl(120, 100%, 40%);">+pin_adm: Admin PIN of the SIM. Needed to reprogram various files</span><br><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index 7edadd7..e00c2d0 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -405,17 +405,20 @@</span><br><span> </span><br><span> def print_parameters(params):</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- print """Generated card parameters :</span><br><span style="color: hsl(0, 100%, 40%);">- > Name : %(name)s</span><br><span style="color: hsl(0, 100%, 40%);">- > SMSP : %(smsp)s</span><br><span style="color: hsl(0, 100%, 40%);">- > ICCID : %(iccid)s</span><br><span style="color: hsl(0, 100%, 40%);">- > MCC/MNC : %(mcc)d/%(mnc)d</span><br><span style="color: hsl(0, 100%, 40%);">- > IMSI : %(imsi)s</span><br><span style="color: hsl(0, 100%, 40%);">- > Ki : %(ki)s</span><br><span style="color: hsl(0, 100%, 40%);">- > OPC : %(opc)s</span><br><span style="color: hsl(0, 100%, 40%);">- > ACC : %(acc)s</span><br><span style="color: hsl(0, 100%, 40%);">- > ADM1(hex): %(pin_adm)s</span><br><span style="color: hsl(0, 100%, 40%);">-""" % params</span><br><span style="color: hsl(120, 100%, 40%);">+ s = ["Generated card parameters :"]</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'name' in params:</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > Name : %(name)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'smsp' in params:</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > SMSP : %(smsp)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > ICCID : %(iccid)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > MCC/MNC : %(mcc)d/%(mnc)d")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > IMSI : %(imsi)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > Ki : %(ki)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > OPC : %(opc)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'acc' in params:</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > ACC : %(acc)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ s.append(" > ADM1(hex): %(pin_adm)s")</span><br><span style="color: hsl(120, 100%, 40%);">+ print("\n".join(s) % params)</span><br><span> </span><br><span> </span><br><span> def write_params_csv(opts, params):</span><br><span>@@ -430,10 +433,11 @@</span><br><span> </span><br><span> def _read_params_csv(opts, imsi):</span><br><span> import csv</span><br><span style="color: hsl(0, 100%, 40%);">- row = ['name', 'iccid', 'mcc', 'mnc', 'imsi', 'smsp', 'ki', 'opc']</span><br><span> f = open(opts.read_csv, 'r')</span><br><span style="color: hsl(0, 100%, 40%);">- cr = csv.DictReader(f, row)</span><br><span style="color: hsl(120, 100%, 40%);">+ cr = csv.DictReader(f)</span><br><span> i = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ if not 'iccid' in cr.fieldnames:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise Exception("CSV file in wrong format!")</span><br><span> for row in cr:</span><br><span> if opts.num is not None and opts.read_imsi is False:</span><br><span> if opts.num == i:</span><br><span>@@ -450,8 +454,17 @@</span><br><span> def read_params_csv(opts, imsi):</span><br><span> row = _read_params_csv(opts, imsi)</span><br><span> if row is not None:</span><br><span style="color: hsl(0, 100%, 40%);">- row['mcc'] = int(row['mcc'])</span><br><span style="color: hsl(0, 100%, 40%);">- row['mnc'] = int(row['mnc'])</span><br><span style="color: hsl(120, 100%, 40%);">+ row['mcc'] = int(row.get('mcc', row['imsi'][0:3]))</span><br><span style="color: hsl(120, 100%, 40%);">+ row['mnc'] = int(row.get('mnc', row['imsi'][3:5]))</span><br><span style="color: hsl(120, 100%, 40%);">+ pin_adm = None</span><br><span style="color: hsl(120, 100%, 40%);">+ # We need to escape the pin_adm we get from the csv</span><br><span style="color: hsl(120, 100%, 40%);">+ if 'pin_adm' in row:</span><br><span style="color: hsl(120, 100%, 40%);">+ pin_adm = ''.join(['%02x'%(ord(x)) for x in row['pin_adm']])</span><br><span style="color: hsl(120, 100%, 40%);">+ # Stay compatible to the odoo csv format</span><br><span style="color: hsl(120, 100%, 40%);">+ elif 'adm1' in row:</span><br><span style="color: hsl(120, 100%, 40%);">+ pin_adm = ''.join(['%02x'%(ord(x)) for x in row['adm1']])</span><br><span style="color: hsl(120, 100%, 40%);">+ if pin_adm:</span><br><span style="color: hsl(120, 100%, 40%);">+ row['pin_adm'] = rpad(pin_adm, 16)</span><br><span> return row</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/15313">change 15313</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/15313"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0d317ea51d0cf582b82157eec6cdec074001a236 </div>
<div style="display:none"> Gerrit-Change-Number: 15313 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-CC: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>