From 2429b0b74e0bd0df69cfe4885a3a5f3b740f5f77 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Wed, 24 Jun 2020 15:33:19 +0200
Subject: [PATCH 1/4] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 45 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 0f6a4b5..aae4eaf 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.25.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.25.1#/RetainedData" elementFormDefault="qualified">
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v1.26.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.26.1#/RetainedData" elementFormDefault="qualified">
 	<xsd:annotation>
 		<xsd:documentation xml:lang="en">
-            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1
+            XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1
         </xsd:documentation>
 	</xsd:annotation>
 	<xsd:simpleType name="GeneralizedTime">
@@ -282,6 +282,7 @@
 			<xsd:element name="wirelessLAN" type="NULL"/>
 			<xsd:element name="wimax" type="NULL"/>
 			<xsd:element name="mobilePacketData" type="NULL"/>
+			<xsd:element name="gPON" type="NULL"/>
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
@@ -665,6 +666,14 @@
 			<xsd:element name="iMSI" type="IMSI" minOccurs="0"/>
 			<xsd:element name="sUPI" type="SUPI" minOccurs="0"/>
 			<xsd:element name="gPSI" type="GPSI" minOccurs="0"/>
+			<xsd:element name="eID" minOccurs="0">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:token">
+						<xsd:pattern value="[0-9]{32}"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:element>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="LoginInfo">
@@ -1498,7 +1507,7 @@
 		<xsd:sequence>
 			<xsd:element name="pLMNID" type="PLMNID"/>
 			<xsd:element name="nRCellID" type="NRCellID"/>
-			<xsd:any namespace="##other" processContents="lax"/>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="ExtendedLocation">
@@ -2251,6 +2260,7 @@
 				</xsd:simpleType>
 			</xsd:element>
 			<xsd:element name="ePSEvent" type="EPSEvent" minOccurs="0"/>
+			<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2354,6 +2364,9 @@
 			<xsd:element name="dynamicAddressFlagExtension" type="xsd:boolean" minOccurs="0"/>
 			<xsd:element name="rAT5Type" type="RAT5Type" minOccurs="0"/>
 			<xsd:element name="flowQoSInfo" type="xsd:string" minOccurs="0"/>
+			<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
+			<xsd:element name="rANSecondaryRATType" type="RANSecondaryRATType" minOccurs="0"/>
+			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:sequence>
 	</xsd:complexType>
 	<xsd:complexType name="PDUSessionType">
@@ -2381,6 +2394,25 @@
 			<xsd:element name="eutra" type="NULL"/>
 			<xsd:element name="wlan" type="NULL"/>
 			<xsd:element name="virtual" type="NULL"/>
+			<xsd:element name="nBIoT" type="NULL"/>
+			<xsd:element name="wireline" type="NULL"/>
+			<xsd:element name="wirelineCable" type="NULL"/>
+			<xsd:element name="wirelineDSL" type="NULL"/>
+			<xsd:element name="wirelinePON" type="NULL"/>
+			<xsd:element name="lTEM" type="NULL"/>
+			<xsd:element name="nRU" type="NULL"/>
+			<xsd:element name="eUTRAU" type="NULL"/>
+			<xsd:element name="trustedN3GA" type="NULL"/>
+			<xsd:element name="trustedWLAN" type="NULL"/>
+			<xsd:element name="uTRA" type="NULL"/>
+			<xsd:element name="gERA" type="NULL"/>
+			<xsd:any namespace="##other" processContents="lax"/>
+		</xsd:choice>
+	</xsd:complexType>
+	<xsd:complexType name="RANSecondaryRATType">
+		<xsd:choice>
+			<xsd:element name="nr" type="NULL"/>
+			<xsd:element name="eutra" type="NULL"/>
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
@@ -2435,6 +2467,7 @@
 			<xsd:element name="dslID" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="imei" type="IMEI" minOccurs="0"/>
 			<xsd:element name="subscriberID" type="NaSubscriberID" minOccurs="0"/>
+			<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -3240,4 +3273,10 @@
 			<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
 		</xsd:choice>
 	</xsd:complexType>
+	<xsd:simpleType name="UERadioCapID">
+		<xsd:restriction base="xsd:string">
+						<xsd:minLength value="12"/>
+						<xsd:maxLength value="20"/>
+		</xsd:restriction>
+	</xsd:simpleType>
 </xsd:schema>
-- 
GitLab


From cdee06dc61476a7b3226d8f1edffa7f5faf3e604 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 25 Jun 2020 08:02:44 +0200
Subject: [PATCH 2/4] Update RDMessage.xsd

---
 102657/RDMessage.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index aae4eaf..bf05884 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -3276,7 +3276,7 @@
 	<xsd:simpleType name="UERadioCapID">
 		<xsd:restriction base="xsd:string">
 						<xsd:minLength value="12"/>
-						<xsd:maxLength value="20"/>
+						<xsd:maxLength value="22"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 </xsd:schema>
-- 
GitLab


From 1f34b06d847262a82de35be3f372ba86b6637018 Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 25 Jun 2020 09:42:01 +0200
Subject: [PATCH 3/4] Update RDMessage.xsd

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

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index bf05884..06d37fc 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -2365,7 +2365,7 @@
 			<xsd:element name="rAT5Type" type="RAT5Type" minOccurs="0"/>
 			<xsd:element name="flowQoSInfo" type="xsd:string" minOccurs="0"/>
 			<xsd:element name="uERadioCapID" type="UERadioCapID" minOccurs="0"/>
-			<xsd:element name="rANSecondaryRATType" type="RANSecondaryRATType" minOccurs="0"/>
+			<xsd:element name="rANSecondaryRATType" type="RAT5Type" minOccurs="0"/>
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:sequence>
 	</xsd:complexType>
@@ -2409,13 +2409,6 @@
 			<xsd:any namespace="##other" processContents="lax"/>
 		</xsd:choice>
 	</xsd:complexType>
-	<xsd:complexType name="RANSecondaryRATType">
-		<xsd:choice>
-			<xsd:element name="nr" type="NULL"/>
-			<xsd:element name="eutra" type="NULL"/>
-			<xsd:any namespace="##other" processContents="lax"/>
-		</xsd:choice>
-	</xsd:complexType>
 	<xsd:complexType name="AMFID">
 		<xsd:sequence>
 			<xsd:element name="aMFRegionID" type="AMFRegionID"/>
-- 
GitLab


From cfffa5312d4176d0505abcb3e1a89dc812bb8b2c Mon Sep 17 00:00:00 2001
From: Christoph Marthy <christoph.marthy@isc-ejpd.admin.ch>
Date: Thu, 25 Jun 2020 09:45:11 +0200
Subject: [PATCH 4/4] Update RDMessage.xsd

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

diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd
index 06d37fc..f075f34 100644
--- a/102657/RDMessage.xsd
+++ b/102657/RDMessage.xsd
@@ -3268,8 +3268,8 @@
 	</xsd:complexType>
 	<xsd:simpleType name="UERadioCapID">
 		<xsd:restriction base="xsd:string">
-						<xsd:minLength value="12"/>
-						<xsd:maxLength value="22"/>
+			<xsd:minLength value="12"/>
+			<xsd:maxLength value="22"/>
 		</xsd:restriction>
 	</xsd:simpleType>
 </xsd:schema>
-- 
GitLab