neels has uploaded this change for review.

View Change

personalization: refactor SmspTpScAddr

Refactor SmspTpScAddr to the new ConfigurableParameter implementation
style.

Change-Id: I2600369e195e9f5aed7f4e6ff99ae273ed3ab3bf
---
M pySim/esim/saip/personalization.py
1 file changed, 11 insertions(+), 6 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/79/41779/1

diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py
index efb4b00..9f55d76 100644
--- a/pySim/esim/saip/personalization.py
+++ b/pySim/esim/saip/personalization.py
@@ -340,10 +340,11 @@
 class SmspTpScAddr(ConfigurableParameter):
     """Configurable SMSC (SMS Service Centre) TP-SC-ADDR. Expects to be a phone number in national or
     international format (designated by a leading +). Automatically sets the NPI to E.164 and the TON based on
-    presence or absence of leading +"""
+    presence or absence of leading +."""
 
-    def validate(self):
-        addr_str = str(self.input_value)
+    @classmethod
+    def validate_val(cls, val):
+        addr_str = str(val)
         if addr_str[0] == '+':
             digits = addr_str[1:]
             international = True
@@ -354,10 +355,14 @@
             raise ValueError('TP-SC-ADDR must not exceed 20 digits')
         if not digits.isdecimal():
             raise ValueError('TP-SC-ADDR must only contain decimal digits')
-        self.value = (international, digits)
+        return (international, digits)
 
-    def apply(self, pes: ProfileElementSequence):
-        international, digits = self.value
+    @classmethod
+    def apply_val(cls, pes: ProfileElementSequence, val):
+        """val must be a tuple (international[bool], digits[str]).
+        For example, an input of "+1234" corresponds to (True, "1234");
+        An input of "1234" corresponds to (False, "1234")."""
+        international, digits = val
         for pe in pes.get_pes_for_type('usim'):
             # obtain the File instance from the ProfileElementUSIM
             f_smsp = pe.files['ef-smsp']

To view, visit change 41779. To unsubscribe, or for help writing mail filters, visit settings.