<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/20314">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move reading of ePDG Id to generic USIM class<br><br>Change-Id: I716acb994430db3d4e56fea072f8dc2cebeaba84<br>---<br>M pySim-read.py<br>M pySim/cards.py<br>M pysim-testdata/Fairwaves-SIM.ok<br>M pysim-testdata/Wavemobile-SIM.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>5 files changed, 13 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 2ca0557..a4f15f8 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -267,12 +267,12 @@</span><br><span> </span><br><span> #EF.ePDGId - Home ePDG Identifier</span><br><span> try:</span><br><span style="color: hsl(0, 100%, 40%);">- (res, sw) = card.read_binary(EF_USIM_ADF_map['ePDGId'])</span><br><span style="color: hsl(0, 100%, 40%);">- if sw == '9000':</span><br><span style="color: hsl(0, 100%, 40%);">- content = dec_epdgid(res)</span><br><span style="color: hsl(0, 100%, 40%);">- print("ePDGId:\n%s" % (len(content) and content or '\tNot available\n',))</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- print("ePDGId: Can't read, response code = %s" % (sw,))</span><br><span style="color: hsl(120, 100%, 40%);">+ if card.file_exists(EF_USIM_ADF_map['ePDGId']):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = card.read_epdgid()</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ print("ePDGId:\n%s" % (len(res) and res or '\tNot available\n',))</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("ePDGId: Can't read, response code = %s" % (sw,))</span><br><span> except Exception as e:</span><br><span> print("ePDGId: Can't read file -- " + str(e))</span><br><span> </span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index f2a3d2a..f2f79e4 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -264,6 +264,13 @@</span><br><span> data, sw = self._scc.update_binary(EF_USIM_ADF_map['EHPLMN'], ehplmn)</span><br><span> return sw</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def read_epdgid(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ (res, sw) = self._scc.read_binary(EF_USIM_ADF_map['ePDGId'])</span><br><span style="color: hsl(120, 100%, 40%);">+ if sw == '9000':</span><br><span style="color: hsl(120, 100%, 40%);">+ return (dec_epdgid(res), sw)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ return (None, sw)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def update_epdgid(self, epdgid):</span><br><span> epdgid_tlv = enc_epdgid(epdgid)</span><br><span> data, sw = self._scc.update_binary(</span><br><span>diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>index 6dd839c..e6fcfe3 100644</span><br><span>--- a/pysim-testdata/Fairwaves-SIM.ok</span><br><span>+++ b/pysim-testdata/Fairwaves-SIM.ok</span><br><span>@@ -116,6 +116,5 @@</span><br><span> Service 64 - VGCS security</span><br><span> Service 65 - VBS security</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ePDGId: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span> Done !</span><br><span> </span><br><span>diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>index 010a228..6cb4e2b 100644</span><br><span>--- a/pysim-testdata/Wavemobile-SIM.ok</span><br><span>+++ b/pysim-testdata/Wavemobile-SIM.ok</span><br><span>@@ -132,6 +132,5 @@</span><br><span> Service 53 - Extension 8</span><br><span> Service 55 - MMS User Connectivity Parameters</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ePDGId: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span> Done !</span><br><span> </span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index da1a1f6..95f6967 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -140,6 +140,5 @@</span><br><span> Service 53 - Extension 8</span><br><span> Service 55 - MMS User Connectivity Parameters</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ePDGId: Can't read file -- SW match failed! Expected 9000 and got 6a82.</span><br><span> Done !</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/20314">change 20314</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/+/20314"/><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: I716acb994430db3d4e56fea072f8dc2cebeaba84 </div>
<div style="display:none"> Gerrit-Change-Number: 20314 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: herlesupreeth <herlesupreeth@gmail.com> </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@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>