From 2d473c71cf0e72f3350a27112a00c0fd6a933524 Mon Sep 17 00:00:00 2001
From: SvS <239-svs@users.noreply.forge.etsi.org>
Date: Thu, 17 Feb 2022 08:44:35 +0100
Subject: [PATCH 1/2] Include CGI, ECGI, NCGI and ICCID parameters

---
 103280/TS_103_280.xsd | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index d6d91c5..8fd3317 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.7.1" elementFormDefault="qualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.8.1" elementFormDefault="qualified">
     <xs:simpleType name="ShortString">
         <xs:restriction base="xs:string">
             <xs:maxLength value="255"/>
@@ -246,4 +246,24 @@
             <xs:pattern value="([a-f0-9]{2}:){7}[a-f0-9]{2}"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="CGI">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="[0-9a-f]{14}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ECGI">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="[0-9a-f]{14}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="NCGI">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="[0-9a-f]{16}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ICCID">
+        <xs:restriction base="xs:token">
+            <xs:pattern value="[0-9]{19,20}"/>
+        </xs:restriction>
+    </xs:simpleType>
 </xs:schema>
-- 
GitLab


From a188313afe9a40e85bf334e9ed0e08099956f42d Mon Sep 17 00:00:00 2001
From: SvS <239-svs@users.noreply.forge.etsi.org>
Date: Thu, 17 Feb 2022 15:46:42 +0100
Subject: [PATCH 2/2] Changed regexes of CGI, ECGI and NCGI parameters

---
 103280/TS_103_280.xsd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd
index 8fd3317..3ff4ae1 100644
--- a/103280/TS_103_280.xsd
+++ b/103280/TS_103_280.xsd
@@ -248,17 +248,17 @@
     </xs:simpleType>
     <xs:simpleType name="CGI">
         <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9a-f]{14}"/>
+            <xs:pattern value="[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="ECGI">
         <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9a-f]{14}"/>
+            <xs:pattern value="[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="NCGI">
         <xs:restriction base="xs:token">
-            <xs:pattern value="[0-9a-f]{16}"/>
+            <xs:pattern value="[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="ICCID">
-- 
GitLab