Merge branch 'maintenance/changemarks' of...

Merge branch 'maintenance/changemarks' of forge.etsi.org:li/schemas-definitions into maintenance/changemarks

102232-1/LI-PS-PDU.asn

 LI-PS-PDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)}
+
+-- Dummy change to test CI/CD, remove before merge
 
 -- Dummy change to test CI/CD, remove before merge
 
@@ -192,7 +194,8 @@ IMPORTS
 	-- from 3GPP TS 33.128 [46]
 	LINotificationPayload,
 	IRIPayload,
-	CCPayload
+	CCPayload,
+	UserLocation
 		FROM TS33128Payloads
 		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)};
 		-- The relevant module (including the 3GPP release and version number)
@@ -206,7 +209,7 @@ IMPORTS
 
 lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
 
-li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)}
+li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version34(34)}
 
 -- ====================
 -- Top-level definition
@@ -665,11 +668,12 @@ EncryptedPayloadType ::= ENUMERATED
 Location ::= SEQUENCE
 	-- This is a common parameter, the use of this parameter is described in clause 4.5
 {
-	umtsHI2Location			[0] UmtsHI2Operations.Location OPTIONAL,
-	epsLocation				[1] EpsHI2Operations.EPSLocation OPTIONAL,
+	umtsHI2Location				[0] UmtsHI2Operations.Location OPTIONAL,
+	epsLocation					[1] EpsHI2Operations.EPSLocation OPTIONAL,
 	...,
-	wlanLocationAttributes	[2] WlanLocationAttributes OPTIONAL,
-	eTSI671HI2Location		[3] HI2Operations.Location OPTIONAL
+	wlanLocationAttributes		[2] WlanLocationAttributes OPTIONAL,
+	eTSI671HI2Location			[3] HI2Operations.Location OPTIONAL,
+	threeGPP33128UserLocation	[4] TS33128Payloads.UserLocation OPTIONAL
 }
 
 WlanLocationAttributes ::= SEQUENCE

102232-5/IPMultimediaPDU.asn

@@ -4,7 +4,7 @@
 
 
 IPMultimediaPDU 
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version15(15)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 BEGIN
@@ -14,7 +14,7 @@ IMPORTS
     IPAddress,
 	Location
 		FROM LI-PS-PDU
-		{itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)};
+		{itu-u(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version34(34)};
 
 
 
@@ -22,8 +22,8 @@ IMPORTS
 -- Object Identifier Definition
 -- ============================
 
-iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version14(14) iRI(1)}
-iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version14(14) cC(2)}
+iPMMIRIObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version14(15) iRI(1)}
+iPMMCCObjId RELATIVE-OID			::= {li-ps(5) iPMultimedia(5) version14(15) cC(2)}
 	-- both definitions relative to: 
 	-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
 

103221-1/TS_103_221_01.xsd

 <?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" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.11.1">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.12.1">
 	<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
 	<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
 	<!-- Message containers -->
@@ -78,6 +78,7 @@
 				<xs:sequence>
 					<xs:element name="requestMessageType" type="RequestMessageType"/>
 					<xs:element name="errorInformation" type="ErrorInformation"/>
+					<xs:element name="extensionInformation" type="ExtensionInformation" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -108,6 +109,7 @@
 			<xs:enumeration value="DeleteObject"/>
 			<xs:enumeration value="ListObjectsOfType"/>
 			<xs:enumeration value="DeleteAllObjects"/>
+			<xs:enumeration value="ExtendedRequestMessageType"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:complexType name="ErrorInformation">
@@ -116,6 +118,17 @@
 			<xs:element name="errorDescription" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
+	<xs:complexType name="ExtensionInformation">
+		<xs:sequence>
+			<xs:element name="extensionSpecification" type="ExtensionSpecification"/>
+			<xs:element name="extendedRequestMessageType" type="xs:string"/>
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="ExtensionSpecification">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="TS133128"/>
+		</xs:restriction>
+	</xs:simpleType>
 	<!-- Individual Message Definitions -->
 	<!-- See section 6.2.1 -->
 	<xs:complexType name="ActivateTaskRequest">
@@ -744,6 +757,7 @@
 				<xs:sequence>
 					<xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"/>
 					<xs:element name="description" type="xs:string"/>
+					<xs:element name="issueCode" type="xs:integer" minOccurs="0"/>
 				</xs:sequence>
 			</xs:extension>
 		</xs:complexContent>
@@ -754,6 +768,7 @@
 			<xs:enumeration value="Warning"/>
 			<xs:enumeration value="FaultCleared"/>
 			<xs:enumeration value="FaultReport"/>
+			<xs:enumeration value="Alert"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<!-- See section 6.5.4 -->

103707/TS_103_707.xsd

@@ -3,7 +3,7 @@
            xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07"
            xmlns="http://uri.etsi.org/03707/2020/02"
            targetNamespace="http://uri.etsi.org/03707/2020/02"
-           version="1.5.1"
+           version="1.6.1"
            elementFormDefault="qualified">
 
   <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>