Merge branch 'meeting/LI63' into 'main' (bf5b0325) · Commits · Bernard Smeets / TC LI schemas definitions

102232-1/LI-PS-PDU.asn

+7 −4

Original line number	Diff line number	Diff line
		LI-PS-PDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version35(35)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -41,7 +41,7 @@ IMPORTS
		IPIRI,
		IPIRIOnly
		FROM IPAccessPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version15(15)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)}

		-- from ETSI TS 102 232-4 [32]
		L2CC,
		@@ -205,7 +205,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) version35(35)}
		li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version36(36)}

		-- ====================
		-- Top-level definition
		@@ -708,11 +708,14 @@ IPAddress ::= SEQUENCE
		-- Indicates the length of the prefix delegated by the CSP to the subscriber
		-- example: 60 if IP address is "2001:db8:0:85a3::ac1f:8001/60"
		-- Mandatory in case where the iP-value contains an IPv6 binary value
		iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL
		iPv4SubnetMask [5] OCTET STRING (SIZE(4)) OPTIONAL,
		-- For IPv4 addresses, this indicates the subnet mask to be applied to the iP-value field.
		-- The subnet mask is intended to be presented as a binary value, e.g. "ff ff ff f8" to
		-- represent the dotted-decimal subnet mask of "255.255.255.248" corresponding to
		-- a /29 CIDR-format subnet mask
		iP-NAT-translated [6] BOOLEAN OPTIONAL
		-- If TRUE then NAT translated, if FALSE then not NAT translated.
		-- If absent, IPAddress may or may not be NAT translated.
		}

		IP-value ::= CHOICE

102232-3/IPAccessPDU.asn

+3 −3

Original line number	Diff line number	Diff line
		IPAccessPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version15(15)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)}

		DEFINITIONS IMPLICIT TAGS ::=
		BEGIN
		@@ -9,14 +9,14 @@ IMPORTS
		IPAddress,
		Location
		FROM LI-PS-PDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version35(35)};
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)};


		-- ============================
		-- Object Identifier Definition
		-- ============================

		iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version15(15)}
		iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version16(16)}
		iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)}
		iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)}
		iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)}

102657/RDMessage.asn

+123 −22

Original line number	Diff line number	Diff line
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version27(27)}
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version28(28)}

		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) version27(27)}
		rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version28(28)}

		-- ======================================
		-- Top level definitions for RDHI wrapper
		@@ -43,7 +43,6 @@ RetainedDataHeader ::= SEQUENCE
		requestType [5] RequestType OPTIONAL,
		requestFlag [6] RequestFlag OPTIONAL
		-- Optional parameter specifying additional information associated with the request.

		}

		CSPID ::= UTF8String
		@@ -1512,7 +1511,8 @@ GA-Point ::= SEQUENCE
		GA-PointWithUnCertainty ::=SEQUENCE
		{
		geographicalCoordinates [1] GeographicalCoordinates,
		uncertaintyCode [2] INTEGER (0..127)
		uncertaintyCode [2] INTEGER (0..127),
		...
		}

		maxNrOfPoints INTEGER ::= 15
		@@ -2269,13 +2269,13 @@ NetworkAccessRecord::= CHOICE
		...
		}


		EdgeComputingRecord ::= CHOICE
		{
		edgeComputingSubscriber [1] EdgeComputingSubscriber,
		edgeComputingApplicationBillingDetails [2] EdgeComputingApplicationBillingDetails,
		edgeComputingApplicationUsage [3] EdgeComputingApplicationUsage,
		edgeComputingDevice [4] EdgeComputingDevice
		edgeComputingDevice [4] EdgeComputingDevice,
		...
		}

		-- ==============================
		@@ -2289,8 +2289,9 @@ EdgeComputingSubscriber ::= SEQUENCE
		genericSubscriberInfo [2] GenericSubscriberInfo OPTIONAL,
		-- generic personal information about this subscriber
		edgeComputingSubscriberInfo [3] UTF8String OPTIONAL,
		subscribedEdgeComputingApplications [4] SEQUENCE OF SubscribedEdgeComputingApplications OPTIONAL
		subscribedEdgeComputingApplications [4] SEQUENCE OF SubscribedEdgeComputingApplications OPTIONAL,
		-- a subscriber may have more than one edge computing applications listed against them
		...
		}

		EdgeComputingSubscriberID ::= UTF8String
		@@ -2327,10 +2328,10 @@ SubscribedEdgeComputingApplications ::= SEQUENCE
		orderTime [17] GeneralizedTime OPTIONAL,
		-- Time when the subscribed edge computing application was ordered by the user
		allocatedDeviceIDs [18] SEQUENCE OF EdgeComputingDeviceID OPTIONAL,
		paymentTransactions [19] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL
		paymentTransactions [19] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL,
		...
		}


		-- =================================
		-- Definitions of Edge Computing Application Usage Data
		-- =================================
		@@ -2349,7 +2350,8 @@ EdgeComputingApplicationUsage ::= SEQUENCE
		providerID [8] UTF8String OPTIONAL,
		cdrNumber [9] UTF8String OPTIONAL, -- as per ASP defined format
		clientIP [10] IPAddress OPTIONAL,
		edgeApplicationServersInfo [11] SEQUENCE OF EdgeApplicationServerInfo
		edgeApplicationServersInfo [11] SEQUENCE OF EdgeApplicationServerInfo,
		...
		}

		EdgeApplicationServerInfo ::= SEQUENCE
		@@ -2358,7 +2360,8 @@ EdgeApplicationServerInfo ::= SEQUENCE
		edgeApplicationServerIP [2] IPAddress OPTIONAL,
		edgeApplicationServerLocation [3] Location OPTIONAL,
		edgeApplicationServerVirtualResources [4] EdgeApplicationServerVirtualResources OPTIONAL,
		serviceContinuity [5] BOOLEAN OPTIONAL
		serviceContinuity [5] BOOLEAN OPTIONAL,
		...
		}

		EdgeApplicationServerVirtualResources ::= SEQUENCE
		@@ -2367,7 +2370,8 @@ EdgeApplicationServerVirtualResources ::= SEQUENCE
		meanVirtualMemoryUsage [2] REAL OPTIONAL,
		meanVirtualDiskUsage [3] REAL OPTIONAL,
		durationStartTime [4] GeneralizedTime OPTIONAL,
		durationEndTime [5] GeneralizedTime OPTIONAL
		durationEndTime [5] GeneralizedTime OPTIONAL,
		...
		}

		-- ==============================
		@@ -2382,14 +2386,16 @@ EdgeComputingApplicationBillingDetails ::= SEQUENCE
		billingIdentifier [4] EdgeComputingBillingIdentifier OPTIONAL,
		billingRecords [5] SEQUENCE OF EdgeComputingApplicationBillingRecords OPTIONAL,
		edgeComputingBillingAddress [6] EdgeComputingBillingAddress OPTIONAL,
		copyOfBill [7] SEQUENCE OF File OPTIONAL
		copyOfBill [7] SEQUENCE OF File OPTIONAL,
		...
		}

		EdgeComputingBillingAddress ::= SEQUENCE
		{
		addressSuppliedTime [1] GeneralizedTime OPTIONAL,
		name [2] PersonName OPTIONAL,
		address [3] AddressInformation OPTIONAL
		address [3] AddressInformation OPTIONAL,
		...
		}

		EdgeComputingBillingIdentifier ::= OCTET STRING
		@@ -2408,9 +2414,102 @@ EdgeComputingApplicationBillingRecords ::= SEQUENCE
		edgeComputingTransactionID [6] UTF8String OPTIONAL,
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
		edgeComputingTransactionStatus [7] UTF8String OPTIONAL
		edgeComputingTransactionStatus [7] UTF8String OPTIONAL,
		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
		-- Details to be defined on a national bases
		cryptocurrency [8] DigitalTokenIdentifier OPTIONAL,
		...
		}

		DigitalTokenIdentifier ::= SEQUENCE
		{
		baseRecord [1] BaseRecord,
		forkRecord [2] ForkRecord,
		informativeDataElements [3] InformativeDataElements,
		...
		}

		BaseRecord ::= OCTET STRING

		ForkRecord ::= OCTET STRING

		InformativeDataElements ::= SEQUENCE
		{
		digitalTokenName [1] DigitalTokenName,
		tokenIdentifierType [2] TokenIdentifierType,
		dTIRegistrationAuthorityIdentifier [3] DTIRegistrationAuthorityIdentifier,
		otherDataElements [4] OtherDataElements,
		...
		}

		DigitalTokenName::= SEQUENCE
		{
		digitalTokenLongName [1] DigitalTokenLongName,
		digitalTokenShortName [2] DigitalTokenShortName,
		...
		}

		DigitalTokenLongName::= SEQUENCE
		{
		digitalTokenLongName [1] UTF8String OPTIONAL,
		originalLanguageDigitalTokenLongName [2] UTF8String OPTIONAL,
		-- based on ISO/IEC 10646 [58]
		...
		}

		DigitalTokenShortName ::= SEQUENCE
		{
		digitalTokenShortName [1] UTF8String OPTIONAL,
		originalLanguageDigitalTokenShortName [2] UTF8String OPTIONAL,
		-- based on ISO/IEC 10646 [58]
		...
		}

		TokenIdentifierType ::= SEQUENCE
		{
		digitalTokenIdentifierType [1] DigitalTokenIdentifierType,
		digitalLedgerTechnologyType [2] DigitalLedgerTechnologyType,
		...
		}

		DigitalTokenIdentifierType::= ENUMERATED
		-- Type defined by clause a of 5.3 of ISO 24165-2 [57]
		{
		auxiliaryDigitalToken(0),
		nativeDigitalToken(1),
		distributedLedgerWithoutANativeDigitalToken(2),
		functionallyFungibleGroupOfDigitalTokens(3),
		...
		}

		DigitalLedgerTechnologyType::= ENUMERATED
		-- Type defined by clause b of 5.3 of ISO 24165-2 [57]
		{
		blockchain(0),
		other(1),
		...
		}

		DTIRegistrationAuthorityIdentifier ::= UTF8String

		OtherDataElements ::= SEQUENCE
		{
		underlyingAssetExternalIdentifiersType [1] UTF8String OPTIONAL,
		underlyingAssetExternalIdentifiersValue [2] UTF8String OPTIONAL,
		digitalTokenExternalIdentifiersType [3] UTF8String OPTIONAL,
		digitalTokenExternalIdentifiersValue [4] UTF8String OPTIONAL,
		digitalTokenReferenceImplementationURL [5] UTF8String OPTIONAL,
		digitalTokenUnitMultiplier [6] UTF8String OPTIONAL,
		auxiliaryDigitalToken [7] UTF8String OPTIONAL,
		publicDistributedLedgerIndicator [8] PublicDistributedLedgerIndicator OPTIONAL,
		...
		}

		PublicDistributedLedgerIndicator ::= ENUMERATED
		{
		public(0),
		private(1),
		...
		}

		-- =======================
		@@ -2429,10 +2528,10 @@ EdgeComputingDevice ::= SEQUENCE
		} OPTIONAL,
		edgeComputingDeviceID [2] EdgeComputingDeviceID OPTIONAL,
		-- Unique identifier for this device according to type of identifier
		subscriberID [3] EdgeComputingSubscriberID OPTIONAL
		subscriberID [3] EdgeComputingSubscriberID OPTIONAL,
		-- Identifier for a known user of this equipment.
		-- Usage of this parameter is subject to national legislation.

		...
		}

		EdgeComputingDeviceID ::= OCTET STRING
		@@ -3030,21 +3129,24 @@ IPAddressSetOrRangeOrMask ::= CHOICE
		{
		set [0] SEQUENCE OF IPAddress,
		range [1] IPRange,
		mask [2] IPMask
		mask [2] IPMask,
		...
		}

		IPRange ::= SEQUENCE
		-- Things like 172.16.10.0/26
		{
		prefix [0] IPAddress,
		subnetlength [1] INTEGER (1..128)
		subnetlength [1] INTEGER (1..128),
		...
		}

		IPMask ::= SEQUENCE
		-- Things like 172.16.10.0/255.255.255.240
		{
		base [0] IPAddress,
		mask [1] IPAddress
		mask [1] IPAddress,
		...
		}

		TimedIPAddress ::= SEQUENCE
		@@ -3053,7 +3155,6 @@ TimedIPAddress ::= SEQUENCE
		validity [1] TimeSpan,
		-- Time period during which the information given in this structure is or was valid.
		...

		}

		NABillingDetails ::= SEQUENCE

102657/RDMessage.xsd

+83 −2

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/v1.29.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v1.29.1#/RetainedData" elementFormDefault="qualified">
		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.1.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.1.1#/RetainedData" elementFormDefault="qualified">
		<xsd:annotation>
		<xsd:documentation xml:lang="en">
		XSD translated from ASN.1 derived from outcome of TS 102 657 v1.29.1
		XSD translated from ASN.1 derived from outcome of TS 102 657 v2.1.1
		</xsd:documentation>
		</xsd:annotation>
		<xsd:simpleType name="GeneralizedTime">
		@@ -3472,6 +3472,7 @@
		<xsd:element name="method" type="xsd:string" minOccurs="0"/>
		<xsd:element name="edgeComputingTransactionID" type="xsd:string" minOccurs="0"/>
		<xsd:element name="edgeComputingTransactionStatus" type="xsd:string" minOccurs="0"/>
		<xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="EdgeComputingDevice">
		@@ -3492,4 +3493,84 @@
		<xsd:simpleType name="EdgeComputingDeviceID">
		<xsd:restriction base="xsd:hexBinary"/>
		</xsd:simpleType>
		<xsd:complexType name="DigitalTokenIdentifier">
		<xsd:sequence>
		<xsd:element name="baseRecord" type="BaseRecord"/>
		<xsd:element name="forkRecord" type="ForkRecord"/>
		<xsd:element name="informativeDataElements" type="InformativeDataElements"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:simpleType name="BaseRecord">
		<xsd:restriction base="xsd:hexBinary"/>
		</xsd:simpleType>
		<xsd:simpleType name="ForkRecord">
		<xsd:restriction base="xsd:hexBinary"/>
		</xsd:simpleType>
		<xsd:complexType name="InformativeDataElements">
		<xsd:sequence>
		<xsd:element name="digitalTokenName" type="DigitalTokenName"/>
		<xsd:element name="tokenIdentifierType" type="TokenIdentifierType"/>
		<xsd:element name="dTIRegistrationAuthorityIdentifier" type="DTIRegistrationAuthorityIdentifier"/>
		<xsd:element name="otherDataElements" type="OtherDataElements"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenName">
		<xsd:sequence>
		<xsd:element name="digitalTokenLongName" type="DigitalTokenLongName"/>
		<xsd:element name="digitalTokenShortName" type="DigitalTokenShortName"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenLongName">
		<xsd:sequence>
		<xsd:element name="digitalTokenLongName" type="xsd:string" minOccurs="0"/>
		<xsd:element name="originalLanguageDigitalTokenLongName" type="xsd:string" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenShortName">
		<xsd:sequence>
		<xsd:element name="digitalTokenShortName" type="xsd:string" minOccurs="0"/>
		<xsd:element name="originalLanguageDigitalTokenShortName" type="xsd:string" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="TokenIdentifierType">
		<xsd:sequence>
		<xsd:element name="digitalTokenIdentifierType" type="DigitalTokenIdentifierType"/>
		<xsd:element name="digitalLedgerTechnologyType" type="DigitalLedgerTechnologyType"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenIdentifierType">
		<xsd:choice>
		<xsd:element name="auxiliaryDigitalToken" type="NULL"/>
		<xsd:element name="nativeDigitalToken" type="NULL"/>
		<xsd:element name="distributedLedgerWithoutANativeDigitalToken" type="NULL"/>
		<xsd:element name="functionallyFungibleGroupOfDigitalTokens" type="NULL"/>
		</xsd:choice>
		</xsd:complexType>
		<xsd:complexType name="DigitalLedgerTechnologyType">
		<xsd:choice>
		<xsd:element name="blockchain" type="NULL"/>
		<xsd:element name="other" type="NULL"/>
		</xsd:choice>
		</xsd:complexType>
		<xsd:simpleType name="DTIRegistrationAuthorityIdentifier">
		<xsd:restriction base="xsd:string"/>
		</xsd:simpleType>
		<xsd:complexType name="OtherDataElements">
		<xsd:sequence>
		<xsd:element name="underlyingAssetExternalIdentifierType" type="xsd:string" minOccurs="0"/>
		<xsd:element name="underlyingAssetExternalIdentifierValue" type="xsd:string" minOccurs="0"/>
		<xsd:element name="digitalTokenExternalIdentifierType" type="xsd:string" minOccurs="0"/>
		<xsd:element name="digitalTokenExternalIdentifierValue" type="xsd:string" minOccurs="0"/>
		<xsd:element name="digitalTokenReferenceImplementationURL" type="xsd:string" minOccurs="0"/>
		<xsd:element name="digitalTokenUnitMultiplier" type="xsd:string" minOccurs="0"/>
		<xsd:element name="auxiliaryDigitaltoken" type="xsd:string" minOccurs="0"/>
		<xsd:element name="publicDistributedLedgerIndicator" type="PublicDistributedLedgerIndicator" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="PublicDistributedLedgerIndicator">
		<xsd:choice>
		<xsd:element name="public" type="NULL"/>
		<xsd:element name="private" type="NULL"/>
		</xsd:choice>
		</xsd:complexType>
		</xsd:schema>

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+85 −15

File changed.

Preview size limit exceeded, changes collapsed.