From 657afaa0d4343a3a803ec742833be720af54ce01 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <nhofmeyr@sysmocom.de>
Date: Sat, 9 May 2026 03:12:45 +0200
Subject: [PATCH] MncLen: rather implement as EnumParam because it only has two
 possible values

Change-Id: I5036732f4350d64262dba90cda4a26a6db28bd8e
---
 pySim/esim/saip/personalization.py | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pySim/esim/saip/personalization.py b/pySim/esim/saip/personalization.py
index 4605197..bf3a3a2 100644
--- a/pySim/esim/saip/personalization.py
+++ b/pySim/esim/saip/personalization.py
@@ -669,24 +669,12 @@ class SmspTpScAddr(ConfigurableParameter):
             yield { cls.name: cls.tuple_to_str((international, digits)) }
 
 
-class MncLen(ConfigurableParameter):
+class MncLen(EnumParam):
     """MNC length. Must be either 2 or 3. Sets only the MNC length field in EF-AD (Administrative Data)."""
     name = 'MNC-LEN'
-    allow_chars = '23'
-    strip_chars = ' \t\r\n'
-    numeric_base = 10
-    max_len = 1
-    min_len = 1
-    example_input = '2'
+    value_map = { '2': 2, '3': 3 }
     default_source = param_source.ConstantSource
-
-    @classmethod
-    def validate_val(cls, val):
-        val = super().validate_val(val)
-        val = int(val)
-        if val not in (2, 3):
-            raise ValueError(f"MNC-LEN must be either 2 or 3, not {val!r}")
-        return val
+    example_input = '2'
 
     @classmethod
     def apply_val(cls, pes: ProfileElementSequence, val):
@@ -732,7 +720,7 @@ class MncLen(ConfigurableParameter):
             if mnc_len is None:
                 continue
 
-            yield { cls.name: str(mnc_len) }
+            yield { cls.name: cls.map_val_to_name(int(mnc_len)) }
 
 
 class SdKey(BinaryParam):