Merge branch 'meeting/LI65' into 'main' (eb9f99fe) · Commits · LI - Lawful Interception / TC LI schemas definitions

102657/RDMessage.asn

+11 −4

Original line number	Diff line number	Diff line
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version29(29)}
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version30(30)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -12,7 +12,7 @@ BEGIN
		retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}

		-- rdHeader
		rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version29(29)}
		rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version30(30)}

		-- ======================================
		-- Top level definitions for RDHI wrapper
		@@ -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
		}


		@@ -3045,7 +3046,9 @@ PEI ::= CHOICE
		{
		iMEI [1] IMEI,
		iMEISV [2] IMEISV,
		...
		...,
		mACAddress [3] MACAddress,
		eUI64 [4] EUI64
		}


		@@ -3056,6 +3059,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]

102657/RDMessage.xsd

+22 −3

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.2.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.2.1#/RetainedData" elementFormDefault="qualified">
		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.3.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.3.1#/RetainedData" elementFormDefault="qualified">
		<xsd:annotation>
		<xsd:documentation xml:lang="en">
		XSD translated from ASN.1 derived from outcome of TS 102 657 v2.1.1
		XSD translated from ASN.1 derived from outcome of TS 102 657 v2.3.1
		</xsd:documentation>
		</xsd:annotation>
		<xsd:simpleType name="GeneralizedTime">
		@@ -434,6 +434,16 @@
		<xsd:pattern value="[0-9]{16}"/>
		</xsd:restriction>
		</xsd:simpleType>
		<xsd:simpleType name="MACAddress">
		<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">
		<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">
		<xsd:minLength value="3"/>
		@@ -788,6 +798,13 @@
		</xsd:sequence>
		</xsd:complexType>
		</xsd:element>
		<xsd:element name="iMEIs" minOccurs="0">
		<xsd:complexType>
		<xsd:sequence minOccurs="0" maxOccurs="unbounded">
		<xsd:element name="IMEI" type="IMEI"/>
		</xsd:sequence>
		</xsd:complexType>
		</xsd:element>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -3313,7 +3330,9 @@
		<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" type="MACAddress"/>
		<xsd:element name="eUI64" type="EUI64"/>
		<xsd:any namespace="##other" processContents="lax"/>
		</xsd:choice>
		</xsd:complexType>
		<xsd:simpleType name="UERadioCapID">

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,10 @@
		<Value>Delivered</Value>
		<Meaning>Traffic that matches the policy is delivered</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Truncate</Value>
		<Meaning>Deliver only the specified number of the first octets of each datagram</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary>
		@@ -728,6 +732,10 @@
		<Value>TS103707</Value>
		<Meaning>Delivery according to ETSI TS 103 707</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>TS103976</Value>
		<Meaning>Delivery according to ETSI TS 103 976, using JSON encoding</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		</Dictionaries>

103120/schema/json/ts_103120_TrafficPolicy.schema.json

+34 −1

Original line number	Diff line number	Diff line
		@@ -111,6 +111,9 @@
		},
		"tp:Action": {
		"$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
		},
		"tp:Parameters": {
		"$ref": "#/$defs/ActionParameters"
		}
		},
		"required": [
		@@ -272,6 +275,36 @@
		"required": [
		"tp:CommunicationServiceID"
		]
		},
		"ActionParameters": {
		"oneOf": [
		{
		"type": "object",
		"properties": {
		"tp:TruncateActionParameters": {
		"$ref": "#/$defs/TruncateActionParameters"
		}
		},
		"required": [
		"tp:TruncateActionParameters"
		]
		}
		]
		},
		"TruncateActionParameters": {
		"type": "object",
		"properties": {
		"tp:NumberOfOctets": {
		"type": "integer",
		"minimum": 0
		},
		"tp:ProvideOriginalLength": {
		"type": "boolean"
		}
		},
		"required": [
		"tp:NumberOfOctets"
		]
		}
		}
		}
		No newline at end of file

103120/schema/xsd/ts_103120_TrafficPolicy.xsd

+12 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		<xs:sequence>
		<xs:element name="Criteria" type="ListOfTrafficCriteria" minOccurs="0"/>
		<xs:element name="Action" type="common:DictionaryEntry" minOccurs="0"/>
		<xs:element name="Parameters" type="ActionParameters" minOccurs="0"/>
		</xs:sequence>
		</xs:group>
		<xs:complexType name="ListOfTrafficCriteria">
		@@ -96,4 +97,15 @@
		<xs:element name="CommunicationServiceID" type="etsi:ShortString" minOccurs="1"/>
		</xs:sequence>
		</xs:complexType>
		<xs:complexType name="ActionParameters">
		<xs:choice>
		<xs:element name="TruncateActionParameters" type="TruncateActionParameters"/>
		</xs:choice>
		</xs:complexType>
		<xs:complexType name="TruncateActionParameters">
		<xs:sequence>
		<xs:element name="NumberOfOctets" type="xs:nonNegativeInteger"/>
		<xs:element name="ProvideOriginalLength" type="xs:boolean" minOccurs="0"/>
		</xs:sequence>
		</xs:complexType>
		</xs:schema>