From fe36156e0712e1a979a76e4f142aaeca198a1daa Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 09:39:45 +0000
Subject: [PATCH 1/9] Update RDMessage.asn

---
 102657/RDMessage.asn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 7d312ce..8da7bce 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -3045,7 +3045,9 @@ PEI ::= CHOICE
 {
     iMEI        [1] IMEI,
     iMEISV      [2] IMEISV,
-    ...
+    ...,
+	 mACAddress  [3] OCTET STRING (SIZE (6)),
+	 eUI64       [4] OCTET STRING (SIZE (8))
 }
 
 
-- 
GitLab


From d926b0ddf0a428d3f159d2d70900e20a0f034675 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 23 Jan 2024 09:40:57 +0000
Subject: [PATCH 2/9] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index f3b0e77..def8528 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -3313,7 +3313,21 @@
         <xsd:choice>
             <xsd:element name="iMEI" type="IMEI"/>
             <xsd:element name="iMEISV" type="IMEISV"/>
-            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
+            <xsd:element name="mACAddress">
+               <xsd:simpleType>
+                  <xsd:restriction base="xsd:hexBinary">
+                       <xsd:length value="6"/>
+                   </xsd:restriction>
+               </xsd:simpleType>
+            </xsd:element>
+            <xsd:element name="eUI64">
+              <xsd:simpleType>
+                  <xsd:restriction base="xsd:hexBinary">
+                       <xsd:length value="8"/>
+                   </xsd:restriction>
+               </xsd:simpleType>
+            </xsd:element>
+            <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
     <xsd:simpleType name="UERadioCapID">
-- 
GitLab


From 604e03c68d06d9da6d5f79a9775935de0de9b763 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 11:46:00 +0000
Subject: [PATCH 3/9] Added new types for MACAddress and EUI64

---
 102657/RDMessage.asn | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 8da7bce..e8c4a9a 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -3046,8 +3046,8 @@ PEI ::= CHOICE
     iMEI        [1] IMEI,
     iMEISV      [2] IMEISV,
     ...,
-	 mACAddress  [3] OCTET STRING (SIZE (6)),
-	 eUI64       [4] OCTET STRING (SIZE (8))
+	 mACAddress  [3] MACAddress,
+	 eUI64       [4] EUI64
 }
 
 
@@ -3058,6 +3058,10 @@ IMEI ::= OCTET STRING (SIZE(8))
 
 IMEISV ::= NumericString (SIZE(16))
 
+MACAddress ::= UTF8String
+
+EUI64 ::= UTF8String
+
 IMSI ::= OCTET STRING (SIZE(3..8))
     -- format as per 3GPP TS 09.02 [8]
 
-- 
GitLab


From 4e186436bc8179d3c3430e8f83131a4ab09bfddc Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 11:46:15 +0000
Subject: [PATCH 4/9] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index def8528..8fc976d 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -434,6 +434,16 @@
             <xsd:pattern value="[0-9]{16}"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xs:simpleType name="MACAddress">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EUI64">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xsd:simpleType name="IMSI">
         <xsd:restriction base="xsd:hexBinary">
             <xsd:minLength value="3"/>
@@ -3313,20 +3323,8 @@
         <xsd:choice>
             <xsd:element name="iMEI" type="IMEI"/>
             <xsd:element name="iMEISV" type="IMEISV"/>
-            <xsd:element name="mACAddress">
-               <xsd:simpleType>
-                  <xsd:restriction base="xsd:hexBinary">
-                       <xsd:length value="6"/>
-                   </xsd:restriction>
-               </xsd:simpleType>
-            </xsd:element>
-            <xsd:element name="eUI64">
-              <xsd:simpleType>
-                  <xsd:restriction base="xsd:hexBinary">
-                       <xsd:length value="8"/>
-                   </xsd:restriction>
-               </xsd:simpleType>
-            </xsd:element>
+            <xsd:element name="mACAddress" type="MACAddress"/>
+            <xsd:element name="eUI64" type="EUI64"/>
             <xsd:any namespace="##other" processContents="lax"/>
         </xsd:choice>
     </xsd:complexType>
-- 
GitLab


From b0fc6debd28f44e14e6cd66ae188e6ab921afdc2 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 11:59:03 +0000
Subject: [PATCH 5/9] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 8fc976d..ac7df03 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -434,16 +434,16 @@
             <xsd:pattern value="[0-9]{16}"/>
         </xsd:restriction>
     </xsd:simpleType>
-    <xs:simpleType name="MACAddress">
+    <xsd:simpleType name="MACAddress">
         <xs:restriction base="xs:token">
             <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
         </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType name="EUI64">
+    </xsd:simpleType>
+    <xsd:simpleType name="EUI64">
         <xs:restriction base="xs:token">
             <xs:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
         </xs:restriction>
-    </xs:simpleType>
+    </xsd:simpleType>
     <xsd:simpleType name="IMSI">
         <xsd:restriction base="xsd:hexBinary">
             <xsd:minLength value="3"/>
-- 
GitLab


From 5f3b91a3bbadd1d51961aa27f34876f3ce5ca3c2 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 12:01:50 +0000
Subject: [PATCH 6/9] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index ac7df03..4ca7c64 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -435,14 +435,14 @@
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="MACAddress">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
-        </xs:restriction>
+        <xsd:restriction base="xsd:token">
+            <xsd:pattern value="([a-f0-9]{2}:){5}[a-f0-9]{2}"/>
+        </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="EUI64">
-        <xs:restriction base="xs:token">
-            <xs:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
-        </xs:restriction>
+        <xsd:restriction base="xsd:token">
+            <xsd:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
+        </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="IMSI">
         <xsd:restriction base="xsd:hexBinary">
-- 
GitLab


From d099671a1089f681f2db13c1d8130e61b80796ad Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 12:30:55 +0000
Subject: [PATCH 7/9] Added iMEIs to SubscibedTelephonyServices

---
 102657/RDMessage.asn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index e8c4a9a..82e6616 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -728,7 +728,8 @@ SubscribedTelephonyServices ::= SEQUENCE
         -- in cases of MultiSIM card contracts
     loginInfos                          [24] SEQUENCE OF LoginInfo OPTIONAL,
         -- e.g. login information according a VMS/UMS account
-    paymentTransactions                 [25] SEQUENCE OF BillingRecords OPTIONAL
+    paymentTransactions                 [25] SEQUENCE OF BillingRecords OPTIONAL,
+    iMEIs                               [26] SEQUENCE OF IMEI OPTIONAL
 }
 
 
-- 
GitLab


From 763760f92f8dc2b530f53508c76c3a296dc38d94 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Tue, 6 Feb 2024 12:39:32 +0000
Subject: [PATCH 8/9] Revert "Added iMEIs to SubscibedTelephonyServices"

This reverts commit d099671a1089f681f2db13c1d8130e61b80796ad
---
 102657/RDMessage.asn | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index 82e6616..e8c4a9a 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -728,8 +728,7 @@ SubscribedTelephonyServices ::= SEQUENCE
         -- in cases of MultiSIM card contracts
     loginInfos                          [24] SEQUENCE OF LoginInfo OPTIONAL,
         -- e.g. login information according a VMS/UMS account
-    paymentTransactions                 [25] SEQUENCE OF BillingRecords OPTIONAL,
-    iMEIs                               [26] SEQUENCE OF IMEI OPTIONAL
+    paymentTransactions                 [25] SEQUENCE OF BillingRecords OPTIONAL
 }
 
 
-- 
GitLab


From 92a3bec6e3646d77326f37e97b686d1372cfb078 Mon Sep 17 00:00:00 2001
From: marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Wed, 7 Feb 2024 09:37:07 +0000
Subject: [PATCH 9/9] Update RDMessage.asn

---
 102657/RDMessage.asn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn
index e8c4a9a..f5b9592 100644
--- a/102657/RDMessage.asn
+++ b/102657/RDMessage.asn
@@ -3046,8 +3046,8 @@ PEI ::= CHOICE
     iMEI        [1] IMEI,
     iMEISV      [2] IMEISV,
     ...,
-	 mACAddress  [3] MACAddress,
-	 eUI64       [4] EUI64
+    mACAddress  [3] MACAddress,
+    eUI64       [4] EUI64
 }
 
 
-- 
GitLab