From 3191cfa682e91f042c306a2a6c6927f8d48fad79 Mon Sep 17 00:00:00 2001
From: mark <markc@tencastle.com>
Date: Mon, 15 Jun 2020 12:34:47 +0100
Subject: [PATCH] TS 103 221-1 v1.4.1 (2019-04-04) agreed at LI#50 (Dubai,
 2019-02-05)

---
 103221-1/TS_103_221_01.xsd                    | 56 +++++++++++++++----
 ..._v010101.xsd => TS_103_221_01_v010401.xsd} | 56 +++++++++++++++----
 2 files changed, 92 insertions(+), 20 deletions(-)
 rename 103221-1/portal/{TS_103_221_01_v010101.xsd => TS_103_221_01_v010401.xsd} (92%)

diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd
index a0bb30b..ef56282 100644
--- a/103221-1/TS_103_221_01.xsd
+++ b/103221-1/TS_103_221_01.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" version="0.0.1" elementFormDefault="qualified">
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07" schemaLocation="TS_103_280_v020101.xsd"></xs:import>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" version="1.4.1" elementFormDefault="qualified">
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"></xs:import>
 
   <!-- Message containers -->
   <xs:element name="X1Request" type="RequestContainer"></xs:element>
@@ -72,7 +72,7 @@
   <!-- See section 6.1 -->
   <xs:simpleType name="Version">
     <xs:restriction base="xs:string">
-      <xs:pattern value="v1.1.1"></xs:pattern>
+      <xs:pattern value="v1.4.1"></xs:pattern>
     </xs:restriction>
   </xs:simpleType>
 
@@ -151,6 +151,9 @@
       <xs:element name="targetIdentifiers" type="ListOfTargetIdentifiers"></xs:element>
       <xs:element name="deliveryType" type="DeliveryType"></xs:element>
       <xs:element name="listOfDIDs" type="ListOfDids"></xs:element>
+      <xs:element name="listOfMediationDetails" type="ListOfMediationDetails" minOccurs="0"></xs:element>
+      <xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"></xs:element>
+      <xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"></xs:element>
       <xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0"></xs:element>
     </xs:sequence>
   </xs:complexType>
@@ -181,12 +184,20 @@
       <xs:element name="h323Uri" type="H323Uri"></xs:element>
       <xs:element name="impu" type="Impu"></xs:element>
       <xs:element name="impi" type="Impi"></xs:element>
-      <xs:element name="nai" type="Nai"></xs:element>
+      <xs:element name="nai" type="etsi103280:NAI"></xs:element>
       <xs:element name="radiusAttribute" type="xs:hexBinary"></xs:element>
       <xs:element name="gtpuTunnelId" type="GtpTunnelId"></xs:element>
       <xs:element name="gtpcTunnelId" type="GtpTunnelId"></xs:element>
       <xs:element name="callPartyRole" type="CallPartyRole"></xs:element>
       <xs:element name="nonLocalIdentifier" type="NonLocalIdentifier"></xs:element>
+      <xs:element name="supiimsi" type="etsi103280:SUPIIMSI"></xs:element>
+      <xs:element name="supinai" type="etsi103280:SUPINAI"></xs:element>
+      <xs:element name="suci" type="etsi103280:SUCI"></xs:element>
+      <xs:element name="peiImei" type="etsi103280:PEIIMEI"></xs:element>
+      <xs:element name="peiImeiCheckDigit" type="etsi103280:PEIIMEICheckDigit"></xs:element>
+      <xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"></xs:element>
+      <xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"></xs:element>
+      <xs:element name="gpsiNai" type="etsi103280:GPSINAI"></xs:element>
       <xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"></xs:element>
     </xs:choice>
   </xs:complexType>
@@ -209,12 +220,6 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <xs:simpleType name="Nai">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^[a-z0-9!#$%&amp;'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&amp;'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
   <xs:simpleType name="GtpTunnelId">
     <xs:restriction base="xs:integer">
       <xs:minInclusive value="0"></xs:minInclusive>
@@ -243,6 +248,16 @@
     </xs:complexContent>
   </xs:complexType>
 
+  <xs:complexType name="MediationDetails">
+    <xs:sequence>
+      <xs:element name="LIID" type="etsi103280:LIID"></xs:element>
+      <xs:element name="deliveryType" type="MediationDeliveryType"></xs:element>
+      <xs:element name="StartTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
+      <xs:element name="EndTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
+      <xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"></xs:element>
+      <xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
 
   <xs:simpleType name="DeliveryType">
     <xs:restriction base="xs:string">
@@ -252,18 +267,38 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <xs:simpleType name="MediationDeliveryType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="HI2Only"></xs:enumeration>
+      <xs:enumeration value="HI3Only"></xs:enumeration>
+      <xs:enumeration value="HI2andHI3"></xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:complexType name="ListOfDids">
     <xs:sequence>
       <xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"></xs:element>
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="ListOfMediationDetails">
+    <xs:sequence>
+      <xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="TaskDetailsExtensions">
     <xs:complexContent>
       <xs:extension base="Extension"></xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
+  <xs:complexType name="MediationDetailsExtensions">
+    <xs:complexContent>
+      <xs:extension base="Extension"></xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="Extension">
     <xs:sequence>
       <xs:element name="Owner" type="xs:string"></xs:element>
@@ -699,6 +734,7 @@
       <xs:enumeration value="Warning"></xs:enumeration>
       <xs:enumeration value="NonTerminatingFault"></xs:enumeration>
       <xs:enumeration value="TerminatingFault"></xs:enumeration>
+      <xs:enumeration value="ImplicitDeactivation"></xs:enumeration>
       <xs:enumeration value="FullyActionedAndSuccesful"></xs:enumeration>
       <xs:enumeration value="FullyActionedAndUnsuccesful"></xs:enumeration>
     </xs:restriction>
diff --git a/103221-1/portal/TS_103_221_01_v010101.xsd b/103221-1/portal/TS_103_221_01_v010401.xsd
similarity index 92%
rename from 103221-1/portal/TS_103_221_01_v010101.xsd
rename to 103221-1/portal/TS_103_221_01_v010401.xsd
index a0bb30b..ef56282 100644
--- a/103221-1/portal/TS_103_221_01_v010101.xsd
+++ b/103221-1/portal/TS_103_221_01_v010401.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" version="0.0.1" elementFormDefault="qualified">
-  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07" schemaLocation="TS_103_280_v020101.xsd"></xs:import>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" version="1.4.1" elementFormDefault="qualified">
+  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"></xs:import>
 
   <!-- Message containers -->
   <xs:element name="X1Request" type="RequestContainer"></xs:element>
@@ -72,7 +72,7 @@
   <!-- See section 6.1 -->
   <xs:simpleType name="Version">
     <xs:restriction base="xs:string">
-      <xs:pattern value="v1.1.1"></xs:pattern>
+      <xs:pattern value="v1.4.1"></xs:pattern>
     </xs:restriction>
   </xs:simpleType>
 
@@ -151,6 +151,9 @@
       <xs:element name="targetIdentifiers" type="ListOfTargetIdentifiers"></xs:element>
       <xs:element name="deliveryType" type="DeliveryType"></xs:element>
       <xs:element name="listOfDIDs" type="ListOfDids"></xs:element>
+      <xs:element name="listOfMediationDetails" type="ListOfMediationDetails" minOccurs="0"></xs:element>
+      <xs:element name="correlationID" type="xs:nonNegativeInteger" minOccurs="0"></xs:element>
+      <xs:element name="implicitDeactivationAllowed" type="xs:boolean" minOccurs="0"></xs:element>
       <xs:element name="taskDetailsExtensions" type="TaskDetailsExtensions" minOccurs="0"></xs:element>
     </xs:sequence>
   </xs:complexType>
@@ -181,12 +184,20 @@
       <xs:element name="h323Uri" type="H323Uri"></xs:element>
       <xs:element name="impu" type="Impu"></xs:element>
       <xs:element name="impi" type="Impi"></xs:element>
-      <xs:element name="nai" type="Nai"></xs:element>
+      <xs:element name="nai" type="etsi103280:NAI"></xs:element>
       <xs:element name="radiusAttribute" type="xs:hexBinary"></xs:element>
       <xs:element name="gtpuTunnelId" type="GtpTunnelId"></xs:element>
       <xs:element name="gtpcTunnelId" type="GtpTunnelId"></xs:element>
       <xs:element name="callPartyRole" type="CallPartyRole"></xs:element>
       <xs:element name="nonLocalIdentifier" type="NonLocalIdentifier"></xs:element>
+      <xs:element name="supiimsi" type="etsi103280:SUPIIMSI"></xs:element>
+      <xs:element name="supinai" type="etsi103280:SUPINAI"></xs:element>
+      <xs:element name="suci" type="etsi103280:SUCI"></xs:element>
+      <xs:element name="peiImei" type="etsi103280:PEIIMEI"></xs:element>
+      <xs:element name="peiImeiCheckDigit" type="etsi103280:PEIIMEICheckDigit"></xs:element>
+      <xs:element name="peiImeisv" type="etsi103280:PEIIMEISV"></xs:element>
+      <xs:element name="gpsiMsisdn" type="etsi103280:GPSIMSISDN"></xs:element>
+      <xs:element name="gpsiNai" type="etsi103280:GPSINAI"></xs:element>
       <xs:element name="targetIdentifierExtension" type="TargetIdentifierExtension"></xs:element>
     </xs:choice>
   </xs:complexType>
@@ -209,12 +220,6 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <xs:simpleType name="Nai">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="^[a-z0-9!#$%&amp;'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&amp;'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$"></xs:pattern>
-    </xs:restriction>
-  </xs:simpleType>
-
   <xs:simpleType name="GtpTunnelId">
     <xs:restriction base="xs:integer">
       <xs:minInclusive value="0"></xs:minInclusive>
@@ -243,6 +248,16 @@
     </xs:complexContent>
   </xs:complexType>
 
+  <xs:complexType name="MediationDetails">
+    <xs:sequence>
+      <xs:element name="LIID" type="etsi103280:LIID"></xs:element>
+      <xs:element name="deliveryType" type="MediationDeliveryType"></xs:element>
+      <xs:element name="StartTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
+      <xs:element name="EndTime" type="etsi103280:QualifiedMicrosecondDateTime" minOccurs="0"></xs:element>
+      <xs:element name="listOfDIDs" type="ListOfDids" minOccurs="0"></xs:element>
+      <xs:element name="mediationDetailsExtensions" type="MediationDetailsExtensions" minOccurs="0"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
 
   <xs:simpleType name="DeliveryType">
     <xs:restriction base="xs:string">
@@ -252,18 +267,38 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <xs:simpleType name="MediationDeliveryType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="HI2Only"></xs:enumeration>
+      <xs:enumeration value="HI3Only"></xs:enumeration>
+      <xs:enumeration value="HI2andHI3"></xs:enumeration>
+    </xs:restriction>
+  </xs:simpleType>
+
   <xs:complexType name="ListOfDids">
     <xs:sequence>
       <xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"></xs:element>
     </xs:sequence>
   </xs:complexType>
 
+  <xs:complexType name="ListOfMediationDetails">
+    <xs:sequence>
+      <xs:element name="mediationDetails" type="MediationDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:complexType name="TaskDetailsExtensions">
     <xs:complexContent>
       <xs:extension base="Extension"></xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
+  <xs:complexType name="MediationDetailsExtensions">
+    <xs:complexContent>
+      <xs:extension base="Extension"></xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
   <xs:complexType name="Extension">
     <xs:sequence>
       <xs:element name="Owner" type="xs:string"></xs:element>
@@ -699,6 +734,7 @@
       <xs:enumeration value="Warning"></xs:enumeration>
       <xs:enumeration value="NonTerminatingFault"></xs:enumeration>
       <xs:enumeration value="TerminatingFault"></xs:enumeration>
+      <xs:enumeration value="ImplicitDeactivation"></xs:enumeration>
       <xs:enumeration value="FullyActionedAndSuccesful"></xs:enumeration>
       <xs:enumeration value="FullyActionedAndUnsuccesful"></xs:enumeration>
     </xs:restriction>
-- 
GitLab