Resolving merge conflicts (e4c1c2d6) · Commits · Biagio Maione / TC LI schemas definitions

102232-1/LI-PS-PDU.asn

+4 −1

Original line number	Diff line number	Diff line
		@@ -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

102657/RDMessage.asn

+121 −20

Original line number	Diff line number	Diff line
		@@ -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 [Y]
		...
		}

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

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

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

		DigitalLedgerTechnologyType::= ENUMERATED
		-- Type defined by clause b of 5.3 of ISO 24165-2 [X]
		{
		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

103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml

+85 −15

Original line number	Diff line number	Diff line
		@@ -25,6 +25,10 @@
		<Value>LDTask</Value>
		<Meaning>An LD Task Object as defined in section 8.3</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>LPTask</Value>
		<Meaning>An LP Task Object as defined in section 8.4</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Delivery</Value>
		<Meaning>A Delivery Object as defined in section 10</Meaning>
		@@ -346,6 +350,10 @@
		<Value>NotDelivered</Value>
		<Meaning>Traffic that matches this policy is not delivered</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Delivered</Value>
		<Meaning>Traffic that matches the policy is delivered</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary>
		@@ -513,35 +521,35 @@
		<DictionaryEntries>
		<DictionaryEntry>
		<Value>AwaitingApproval</Value>
		<Meaning>The Task is still waiting approval from one or more relevant authorities</Meaning>
		<Meaning>The Task is still awaiting approval from one or more relevant authorities.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>AwaitingDisclosure</Value>
		<Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>
		<Meaning>The Task is approved by the relevant authorities, but is not yet approved and/or processed by the LD system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Disclosed</Value>
		<Meaning>The Task has been processed and the product has been disclosed by the LD system</Meaning>
		<Meaning>The Task has been processed and the product has been disclosed by the LD system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>DisclosureNotAvailable</Value>
		<Meaning>The Task has been processed and the CSP has determined there is no product available to disclosure</Meaning>
		<Meaning>The Task has been processed and the CSP has determined there is no product available to disclose.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Rejected</Value>
		<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities.</Meaning>
		<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities or by the CSP.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Cancelled</Value>
		<Meaning>The Task has been permanently cancelled</Meaning>
		<Meaning>The Task has been permanently cancelled.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Error</Value>
		<Meaning>The Task has not been processed due to a problem with the underlying LD system</Meaning>
		<Meaning>The Task has not been processed due to a problem with the underlying LD system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Invalid</Value>
		<Meaning>The Task is not active due to a problem with the current information populated in the Task Object</Meaning>
		<Meaning>The Task is not active due to a problem with the current information populated in the Task Object.</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		@@ -552,23 +560,23 @@
		<DictionaryEntries>
		<DictionaryEntry>
		<Value>AwaitingApproval</Value>
		<Meaning>The Task is still waiting approval from one or more relevant authorities</Meaning>
		<Meaning>The Task is still awaiting approval from one or more relevant authorities.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>AwaitingDisclosure</Value>
		<Meaning>The Task is approved, but is not yet processed by the LD system</Meaning>
		<Meaning>The Task is approved by the relevant authorities, but is not yet approved and/or processed by the LD system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Disclosed</Value>
		<Meaning>The Task has been processed and the product has been disclosed by the LD system</Meaning>
		<Meaning>The Task has been processed and the product has been disclosed by the LD system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Rejected</Value>
		<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities.</Meaning>
		<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities or by the CSP.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Cancelled</Value>
		<Meaning>The Task has been permanently cancelled</Meaning>
		<Meaning>The Task has been permanently cancelled.</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		@@ -645,6 +653,64 @@
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary>
		<!--LPTaskStatus: see Clause 8.4.2 Table 8.26 -->
		<Owner>ETSI</Owner>
		<Name>LPTaskStatus</Name>
		<DictionaryEntries>
		<DictionaryEntry>
		<Value>AwaitingPreservation</Value>
		<Meaning>The Task is approved, but is not yet processed by the LD system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Preserved</Value>
		<Meaning>The Task has been processed and the data has been preserved by the LP system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>PreservationNotAvailable</Value>
		<Meaning>The Task has been processed and the CSP has determined there is no data available to preserve.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Rejected</Value>
		<Meaning>The Task has been explicitly denied or rejected by one or more relevant authorities or by the CSP.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Cancelled</Value>
		<Meaning>The Task has been permanently cancelled.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Expired</Value>
		<Meaning>The retention period of the preserved data has expired.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Error</Value>
		<Meaning>The Task has not been processed due to a problem with the underlying LP system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Invalid</Value>
		<Meaning>The Task has not been processed due to a problem with the current information populated in the Task Object.</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary>
		<!--LPTaskDesiredStatus: see Clause 8.4.3 Table 8.27 -->
		<Owner>ETSI</Owner>
		<Name>LPTaskDesiredStatus</Name>
		<DictionaryEntries>
		<DictionaryEntry>
		<Value>AwaitingPreservation</Value>
		<Meaning>The Task is approved by the relevant authorities, but the Task has not yet been approved and/or actioned by the CSP.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Preserved</Value>
		<Meaning>The Task has been processed and the data has been preserved by the LP system.</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>Cancelled</Value>
		<Meaning>The Task has been permanently cancelled.</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>
		<Dictionary>
		<!--ManifestSpecification: see Clause 10.2.2 Table 10.3 -->
		<Owner>ETSI</Owner>
		@@ -652,11 +718,15 @@
		<DictionaryEntries>
		<DictionaryEntry>
		<Value>TS102657-ASN.1</Value>
		<Meaning>Delievery according to ETSI TS 102 657 using ASN.1 encoding</Meaning>
		<Meaning>Delivery according to ETSI TS 102 657 using ASN.1 encoding</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>TS102657-XML</Value>
		<Meaning>Delievery according to ETSI TS 102 657 using XML encoding</Meaning>
		<Meaning>Delivery according to ETSI TS 102 657 using XML encoding</Meaning>
		</DictionaryEntry>
		<DictionaryEntry>
		<Value>TS103707</Value>
		<Meaning>Delivery according to ETSI TS 103 707</Meaning>
		</DictionaryEntry>
		</DictionaryEntries>
		</Dictionary>

103120/examples/request4-Preservation-Link.xml

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
		<Header>
		<SenderIdentifier>
		<CountryCode>XX</CountryCode>
		<UniqueIdentifier>ACTOR01</UniqueIdentifier>
		</SenderIdentifier>
		<ReceiverIdentifier>
		<CountryCode>XX</CountryCode>
		<UniqueIdentifier>ACTOR02</UniqueIdentifier>
		</ReceiverIdentifier>
		<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
		<Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>
		<Version>
		<ETSIVersion>V1.14.1</ETSIVersion>
		<NationalProfileOwner>XX</NationalProfileOwner>
		<NationalProfileVersion>v1.0</NationalProfileVersion>
		</Version>
		</Header>
		<Payload>
		<RequestPayload>
		<ActionRequests>
		<ActionRequest>
		<ActionIdentifier>0</ActionIdentifier>
		<CREATE>
		<HI1Object xsi:type="auth:AuthorisationObject">
		<ObjectIdentifier>7dbbc880-8750-4d3c-abe7-ea4a17646045</ObjectIdentifier>
		<CountryCode>XX</CountryCode>
		<OwnerIdentifier>ACTOR01</OwnerIdentifier>
		<auth:AuthorisationReference>W000001</auth:AuthorisationReference>
		<auth:AuthorisationTimespan>
		<auth:StartTime>2019-09-30T12:00:00Z</auth:StartTime>
		<auth:EndTime>2019-12-01T12:00:00Z</auth:EndTime>
		</auth:AuthorisationTimespan>
		</HI1Object>
		</CREATE>
		</ActionRequest>
		<ActionRequest>
		<ActionIdentifier>1</ActionIdentifier>
		<CREATE>
		<HI1Object xsi:type="task:LDTaskObject">
		<ObjectIdentifier>2b36a78b-b628-416d-bd22-404e68a0cd36</ObjectIdentifier>
		<CountryCode>XX</CountryCode>
		<OwnerIdentifier>ACTOR01</OwnerIdentifier>
		<AssociatedObjects>
		<AssociatedObject>7dbbc880-8750-4d3c-abe7-ea4a17646045</AssociatedObject>
		</AssociatedObjects>
		<task:Reference>XX-ACTOR01-1234</task:Reference>
		<task:RequestDetails>
		<task:StartTime>2019-09-30T12:00:00Z</task:StartTime>
		<task:EndTime>2019-12-30T12:00:00Z</task:EndTime>
		<task:RequestValues>
		<task:RequestValue>
		<task:FormatType>
		<task:FormatOwner>ETSI</task:FormatOwner>
		<task:FormatName>InternationalE164</task:FormatName>
		</task:FormatType>
		<task:Value>442079460223</task:Value>
		</task:RequestValue>
		</task:RequestValues>
		</task:RequestDetails>
		<task:DeliveryDetails>
		<task:LDDeliveryDestination>
		<task:DeliveryAddress>
		<task:IPv4Address>192.0.2.0</task:IPv4Address>
		</task:DeliveryAddress>
		</task:LDDeliveryDestination>
		</task:DeliveryDetails>
		<task:CSPID>
		<CountryCode>XX</CountryCode>
		<UniqueIdentifier>ACTOR02</UniqueIdentifier>
		</task:CSPID>
		<task:AlternativePreservationReferences>
		<task:AlternativePreservationReference>
		<task:ReferenceValue>ExternalReferenceValue</task:ReferenceValue>
		<task:NatureOfReference>Preservation Request Type</task:NatureOfReference>
		</task:AlternativePreservationReference>
		</task:AlternativePreservationReferences>
		</HI1Object>
		</CREATE>
		</ActionRequest>
		</ActionRequests>
		</RequestPayload>
		</Payload>
		</HI1Message>

103120/examples/request8_LPTaskObject.xml

0 → 100644

+55 −0

File added.

Preview size limit exceeded, changes collapsed.