<p>dexter <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15431">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog: generate a pin_adm from pin_adm_hex also for CSV files<br><br>When reading CSV files we currently have no option to provide a<br>pin_adm_hex field like we already have it as commandline option.<br>Lets add an option pin_adm_hex for this.<br><br>Change-Id: I53e8d666d26a06f580725a8443a335643d10192c<br>---<br>M pySim-prog.py<br>1 file changed, 15 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index 8abce0a..13e8bb5 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -485,6 +485,21 @@</span><br><span>                   pin_adm = ''.join(['%02x'%(ord(x)) for x in row['adm1']])</span><br><span>            if pin_adm:</span><br><span>                  row['pin_adm'] = rpad(pin_adm, 16)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+          # If the CSV-File defines a pin_adm_hex field use this field to</span><br><span style="color: hsl(120, 100%, 40%);">+               # generate pin_adm from that.</span><br><span style="color: hsl(120, 100%, 40%);">+         pin_adm_hex = row.get('pin_adm_hex')</span><br><span style="color: hsl(120, 100%, 40%);">+          if pin_adm_hex:</span><br><span style="color: hsl(120, 100%, 40%);">+                       if len(pin_adm_hex) == 16:</span><br><span style="color: hsl(120, 100%, 40%);">+                            row['pin_adm'] = pin_adm_hex</span><br><span style="color: hsl(120, 100%, 40%);">+                          # Ensure that it's hex-encoded</span><br><span style="color: hsl(120, 100%, 40%);">+                            try:</span><br><span style="color: hsl(120, 100%, 40%);">+                                  try_encode = h2b(pin_adm)</span><br><span style="color: hsl(120, 100%, 40%);">+                             except ValueError:</span><br><span style="color: hsl(120, 100%, 40%);">+                                    raise ValueError("pin_adm_hex needs to be hex encoded using this option")</span><br><span style="color: hsl(120, 100%, 40%);">+                   else:</span><br><span style="color: hsl(120, 100%, 40%);">+                         raise ValueError("pin_adm_hex needs to be exactly 16 digits (hex encoded)")</span><br><span style="color: hsl(120, 100%, 40%);">+</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/+/15431">change 15431</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/+/15431"/><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: I53e8d666d26a06f580725a8443a335643d10192c </div>
<div style="display:none"> Gerrit-Change-Number: 15431 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </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-MessageType: merged </div>