Skip to content
Commits on Source (53)
Expand all Hide whitespace changes
Inline Side-by-side
102232-1/HI1NotificationOperations.asn 0 → 100644
View file @ 94a7ee52
HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)}
-- This ASN.1 module was previously provided by TS 101 671,
-- which was marked as historical in V3.15.1 (2018-06).
--
-- This ASN.1 module has been copied from TS 101 671 V3.15.1 to
-- TS 102 232-1 (the present document) to assist implementors of LI-PS-PDU.
-- The ASN.1 in this module shall be equivalent to that in TS 101 671
-- so that the ASN.1 encodes identically.
--
-- The types based on ITU-T X.880 ROSE have been disabled because they're not
-- required by LI-PS-PDU or modules imported by LI-PS-PDU.
--
-- Due to the historical status of ETSI TS 101 671 it is not possible to update
-- this module. Do not use it in future change requests.
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
IMPORTS
-- Start of disable of ITU-T X.880 ROSE
--
-- OPERATION,
-- ERROR
-- FROM Remote-Operations-Information-Objects
-- {joint-iso-itu-t(2) remote-operations(4) informationObjects(5) version1(0)}
--
-- End of disable of ITU-T X.880 ROSE
CommunicationIdentifier,
TimeStamp,
LawfulInterceptionIdentifier
FROM HI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)};
-- =============================
-- Object Identifier Definitions
-- =============================
-- LawfulIntercept DomainId
lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
-- hi1 Domain
hi1NotificationOperationsId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId hi1(0) notificationOperations(1)}
hi1OperationId OBJECT IDENTIFIER ::= {hi1NotificationOperationsId version6(6)}
-- Start of disable of ITU-T X.880 ROSE
--
-- sending-of-HI1-Notification OPERATION ::=
-- {
-- ARGUMENT HI1-Operation
-- ERRORS {ErrorHI1Notifications}
-- CODE global:{hi1NotificationOperationsId version1(1)}
-- }
-- Class 2 operation. The timer shall be set to a value between 3s and 240s.
-- The timer default value is 60s.
-- NOTE: The value for this timer is to be set on the equipment waiting for the returned message;
-- its value shall be agreed between the NWO/AP/SvP and the LEA, depending on their equipment
-- properties.
--
-- other-failure-causes ERROR ::= {CODE local:0}
-- missing-parameter ERROR ::= {CODE local:1}
-- unknown-parameter ERROR ::= {CODE local:2}
-- erroneous-parameter ERROR ::= {CODE local:3}
--
-- ErrorHI1Notifications ERROR ::=
-- {
-- other-failure-causes |
-- missing-parameter |
-- unknown-parameter |
-- erroneous-parameter
-- }
--
-- End of disable of ITU-T X.880 ROSE
HI1-Operation ::= CHOICE
{
liActivated [1] Notification,
liDeactivated [2] Notification,
liModified [3] Notification,
alarms-indicator [4] Alarm-Indicator,
...,
national-HI1-ASN1parameters [5] National-HI1-ASN1parameters
}
-- ==================
-- PARAMETERS FORMATS
-- ==================
Notification ::= SEQUENCE
{
domainID [0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL,
-- Once using FTP delivery mechanism
lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier,
-- This identifier is the LIID identity provided with the lawful authorization
-- for each target.
communicationIdentifier [2] CommunicationIdentifier OPTIONAL,
-- Only the NWO/PA/SvPIdentifier is provided (the one provided with the Lawful
-- authorization).
-- Called "callIdentifier" in V1.1.1 of TS 101 671
timeStamp [3] TimeStamp,
-- date and time of the report.
...,
national-HI1-ASN1parameters [5] National-HI1-ASN1parameters OPTIONAL,
target-Information [6] OCTET STRING (SIZE (1..256)) OPTIONAL
-- provides information about the number or the characteristic of the target
-- (e.g. E-mail address, E.164 number), ASCII format
}
Alarm-Indicator ::= SEQUENCE
{
domainID [0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL,
-- Once using FTP delivery mechanism
communicationIdentifier [1] CommunicationIdentifier OPTIONAL,
-- Only the NWO/PA/SvPIdentifier is provided (the one provided with the
-- Lawful authorization)
timeStamp [2] TimeStamp,
-- date and time of the report.
alarm-information [3] OCTET STRING (SIZE (1..256)),
-- Provides information about alarms (free format).
-- Until ASN.1 version 6 (TS 101 671 V3.12.1) the octet string
-- was limited to a size of 25
...,
lawfulInterceptionIdentifier [4] LawfulInterceptionIdentifier OPTIONAL,
-- This identifier is the LIID identity provided with the lawful authorization
-- for each target in according to national law.
national-HI1-ASN1parameters [5] National-HI1-ASN1parameters OPTIONAL
}
National-HI1-ASN1parameters ::= SEQUENCE
{
domainID [0] OBJECT IDENTIFIER (hi1OperationId) OPTIONAL,
-- Once using FTP delivery mechanism.
countryCode [1] PrintableString (SIZE (2)),
-- Country Code according to ISO 3166-1,
-- the country to which the parameters inserted after the extension marker apply.
...
-- In case a given country wants to use additional national parameters according to its law,
-- these national parameters should be defined using the ASN.1 syntax and added after the
-- extension marker (...).
-- It is recommended that "version parameter" and "vendor identification parameter" are
-- included in the national parameters definition. Vendor identifications can be
-- retrieved from IANA web site (see annex K). Besides, it is recommended to avoid
-- using tags from 240 to 255 in a formal type definition.
}
END -- end of HI1NotificationOperations
102232-1/HI2Operations.asn 0 → 100644
View file @ 94a7ee52
This diff is collapsed.
102232-1/LI-PS-PDU.asn
View file @ 94a7ee52
LI-PS-PDU LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -11,10 +11,10 @@ IMPORTS ...@@ -11,10 +11,10 @@ IMPORTS
-- from ETSI TS 103 280 [44] -- from ETSI TS 103 280 [44]
LIID LIID
FROM Common-Parameters FROM Common-Parameters
{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)} {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)}
-- from ETSI TS 101 671 [4] -- previously from ETSI TS 101 671 [4]; now provided with this specification
IRI-Parameters, IRI-Parameters,
IRIsContent, IRIsContent,
Location, Location,
...@@ -22,7 +22,7 @@ IMPORTS ...@@ -22,7 +22,7 @@ IMPORTS
FROM HI2Operations FROM HI2Operations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}
-- from ETSI TS 101 671 [4] -- previously from ETSI TS 101 671 [4]; now provided with this specification
HI1-Operation HI1-Operation
FROM HI1NotificationOperations FROM HI1NotificationOperations
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)}
...@@ -41,14 +41,14 @@ IMPORTS ...@@ -41,14 +41,14 @@ IMPORTS
IPIRI, IPIRI,
IPIRIOnly IPIRIOnly
FROM IPAccessPDU FROM IPAccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)}
-- from ETSI TS 102 232-4 [32] -- from ETSI TS 102 232-4 [32]
L2CC, L2CC,
L2IRI, L2IRI,
L2IRIOnly L2IRIOnly
FROM L2AccessPDU FROM L2AccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version8(8)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version9(9)}
-- from ETSI TS 102 232-5 [37] -- from ETSI TS 102 232-5 [37]
IPMMCC, IPMMCC,
...@@ -205,7 +205,7 @@ IMPORTS ...@@ -205,7 +205,7 @@ IMPORTS
lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} 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) version36(36)} li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version37(37)}
-- ==================== -- ====================
-- Top-level definition -- Top-level definition
...@@ -249,7 +249,7 @@ Payload ::= CHOICE ...@@ -249,7 +249,7 @@ Payload ::= CHOICE
hI1-Operation [3] HI1NotificationOperations.HI1-Operation, hI1-Operation [3] HI1NotificationOperations.HI1-Operation,
encryptionContainer [4] EncryptionContainer, encryptionContainer [4] EncryptionContainer,
threeGPP-HI1-Operation [5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation, threeGPP-HI1-Operation [5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation,
-- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] -- This structure may be functionally redundant with hI1-Operation previously from ETSI TS 101 671 [4]
iLHIPayload [6] SEQUENCE OF ILHIPDU.ILHIPayload, iLHIPayload [6] SEQUENCE OF ILHIPDU.ILHIPayload,
-- For typical use cases see ETSI TS 103 462 [45] -- For typical use cases see ETSI TS 103 462 [45]
hI4Payload [7] SEQUENCE OF HI4Payload hI4Payload [7] SEQUENCE OF HI4Payload
......
102232-3/IPAccessPDU.asn
View file @ 94a7ee52
IPAccessPDU IPAccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
BEGIN BEGIN
...@@ -9,14 +9,14 @@ IMPORTS ...@@ -9,14 +9,14 @@ IMPORTS
IPAddress, IPAddress,
Location Location
FROM LI-PS-PDU FROM LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)}; {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)};
-- ============================ -- ============================
-- Object Identifier Definition -- Object Identifier Definition
-- ============================ -- ============================
iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version16(16)} iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version17(17)}
iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)}
iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)}
iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)}
...@@ -38,6 +38,14 @@ IPCC ::= SEQUENCE ...@@ -38,6 +38,14 @@ IPCC ::= SEQUENCE
IPCCContents ::= CHOICE IPCCContents ::= CHOICE
{ {
iPPackets [0] OCTET STRING, iPPackets [0] OCTET STRING,
...,
iPTruncatedPacket [1] IPTruncatedPacket
}
IPTruncatedPacket ::= SEQUENCE
{
truncatedPacket [0] OCTET STRING,
originalLength [1] INTEGER OPTIONAL,
... ...
} }
......
102232-4/L2AccessPDU.asn
View file @ 94a7ee52
L2AccessPDU L2AccessPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)
li-ps(5) l2Access(4) version8(8)} li-ps(5) l2Access(4) version9(9)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
BEGIN BEGIN
...@@ -9,7 +9,7 @@ BEGIN ...@@ -9,7 +9,7 @@ BEGIN
-- Object Identifier Definition -- Object Identifier Definition
-- ============================ -- ============================
l2AccessPDUObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version8(8)} l2AccessPDUObjId RELATIVE-OID ::= {li-ps(5) l2Access(4) version9(9)}
l2IRIObjId RELATIVE-OID ::= {l2AccessPDUObjId iRI(1)} l2IRIObjId RELATIVE-OID ::= {l2AccessPDUObjId iRI(1)}
l2CCObjId RELATIVE-OID ::= {l2AccessPDUObjId cC(2)} l2CCObjId RELATIVE-OID ::= {l2AccessPDUObjId cC(2)}
l2IRIOnlyObjId RELATIVE-OID ::= {l2AccessPDUObjId iRIOnly(3)} l2IRIOnlyObjId RELATIVE-OID ::= {l2AccessPDUObjId iRIOnly(3)}
...@@ -27,24 +27,45 @@ L2CC ::= SEQUENCE ...@@ -27,24 +27,45 @@ L2CC ::= SEQUENCE
l2CCObjId [0] RELATIVE-OID, l2CCObjId [0] RELATIVE-OID,
l2CCContents [1] CHOICE l2CCContents [1] CHOICE
{ {
l2TP [1] OCTET STRING, l2TP [1] OCTET STRING,
-- The L2TP protocol is used -- The L2TP protocol is used
l2F [2] OCTET STRING, l2F [2] OCTET STRING,
-- The L2F protocol is used -- The L2F protocol is used
pPTP [3] OCTET STRING, pPTP [3] OCTET STRING,
-- The PPTP protocol is used -- The PPTP protocol is used
pPP [4] OCTET STRING, pPP [4] OCTET STRING,
-- The PPP protocol is used -- The PPP protocol is used
ethernet [5] OCTET STRING, ethernet [5] OCTET STRING,
-- The ethernet protocol is used -- The ethernet protocol is used
..., ...,
l2ATM2684 [6] OCTET STRING, l2ATM2684 [6] OCTET STRING,
-- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used -- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used
l2FR2427 [7] OCTET STRING l2FR2427 [7] OCTET STRING,
-- The protocol RFC 2427 "Multiprotocol Interconnect over Frame Relay" [18] is used -- The protocol RFC 2427 "Multiprotocol Interconnect over Frame Relay" [18] is used
truncatedL2TP [8] L2TruncatedDatagram,
-- truncated l2TP[1]
truncatedL2F [9] L2TruncatedDatagram,
-- truncated l2F[2]
truncatedPPTP [10] L2TruncatedDatagram,
-- truncated pPTP[3]
truncatedPPP [11] L2TruncatedDatagram,
-- truncated pPP[4]
truncatedEthernet [12] L2TruncatedDatagram,
-- truncated ethernet[5]
truncatedL2ATM2684 [13] L2TruncatedDatagram,
-- truncated l2ATM2684[6]
truncatedL2FR2427 [14] L2TruncatedDatagram
-- truncated l2FR2427[7]
} }
} }
L2TruncatedDatagram ::= SEQUENCE
{
truncatedDatagram [0] OCTET STRING,
originalLength [1] INTEGER,
...
}
-- =================================================== -- ===================================================
-- Intercept-related information for general L2-Access -- Intercept-related information for general L2-Access
-- =================================================== -- ===================================================
......
102657/RDMessage.asn
View file @ 94a7ee52
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version28(28)} RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version29(29)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -12,7 +12,7 @@ BEGIN ...@@ -12,7 +12,7 @@ BEGIN
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}
-- rdHeader -- rdHeader
rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version28(28)} rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version29(29)}
-- ====================================== -- ======================================
-- Top level definitions for RDHI wrapper -- Top level definitions for RDHI wrapper
...@@ -3204,7 +3204,12 @@ RAT5Type ::= ENUMERATED ...@@ -3204,7 +3204,12 @@ RAT5Type ::= ENUMERATED
trustedN3GA(13), trustedN3GA(13),
trustedWLAN(14), trustedWLAN(14),
uTRA(15), uTRA(15),
gERA(16) gERA(16),
nRLEO(17),
nRMEO(18),
nRGEO(19),
nROTHERSAT(20),
nRREDCAP(21)
} }
AMFID ::= SEQUENCE AMFID ::= SEQUENCE
......
102657/RDMessage.xsd
View file @ 94a7ee52
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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: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:annotation> <xsd:annotation>
<xsd:documentation xml:lang="en"> <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.1.1
...@@ -2449,6 +2449,11 @@ ...@@ -2449,6 +2449,11 @@
<xsd:element name="trustedWLAN" type="NULL"/> <xsd:element name="trustedWLAN" type="NULL"/>
<xsd:element name="uTRA" type="NULL"/> <xsd:element name="uTRA" type="NULL"/>
<xsd:element name="gERA" type="NULL"/> <xsd:element name="gERA" type="NULL"/>
<xsd:element name="nRLEO" type="NULL"/>
<xsd:element name="nRMEO" type="NULL"/>
<xsd:element name="nRGEO" type="NULL"/>
<xsd:element name="nROTHERSAT" type="NULL"/>
<xsd:element name="nRREDCAP" type="NULL"/>
<xsd:any namespace="##other" processContents="lax"/> <xsd:any namespace="##other" processContents="lax"/>
</xsd:choice> </xsd:choice>
</xsd:complexType> </xsd:complexType>
......
103120/examples/json/request1_signed.json 0 → 100644
View file @ 94a7ee52
{
"@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",
"UniqueIdentifier": "ACTOR01"
},
"ReceiverIdentifier": {
"CountryCode": "XX",
"UniqueIdentifier": "ACTOR02"
},
"TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e",
"Timestamp": "2015-09-01T12:00:00.000000Z",
"Version": {
"ETSIVersion": "V1.13.1",
"NationalProfileOwner": "XX",
"NationalProfileVersion": "v1.0"
}
},
"Payload": {
"RequestPayload": {
"ActionRequests": {
"ActionRequest": [
{
"ActionIdentifier": 0,
"CREATE": {
"HI1Object": {
"@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject",
"ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",
"CountryCode": "XX",
"OwnerIdentifier": "ACTOR01",
"auth:AuthorisationReference": "W000001",
"auth:AuthorisationTimespan": {
"auth:StartTime": "2015-09-01T12:00:00Z",
"auth:EndTime": "2015-12-01T12:00:00Z"
}
}
}
},
{
"ActionIdentifier": 1,
"CREATE": {
"HI1Object": {
"@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject",
"ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",
"CountryCode": "XX",
"OwnerIdentifier": "ACTOR01",
"AssociatedObjects": {
"AssociatedObject": [
"7dbbc880-8750-4d3c-abe7-ea4a17646045"
]
},
"task:Reference": "LIID1",
"task:TargetIdentifier": {
"task:TargetIdentifierValues": {
"task:TargetIdentifierValue": [
{
"task:FormatType": {
"task:FormatOwner": "ETSI",
"task:FormatName": "InternationalE164"
},
"task:Value": "442079460223"
}
]
}
},
"task:DeliveryType": {
"common:Owner": "ETSI",
"common:Name": "TaskDeliveryType",
"common:Value": "IRIandCC"
},
"task:DeliveryDetails": {
"task:DeliveryDestination": [
{
"task:DeliveryAddress": {
"task:IPv4Address": "192.0.2.0"
}
}
]
},
"task:CSPID": {
"CountryCode": "XX",
"UniqueIdentifier": "RECVER01"
}
}
}
}
]
}
}
},
"Signature": {
"protected": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9",
"signature": "RImkRSJkh46537Bh4LpNbkL2O64jInUv0JLGeoKJ-2M"
}
}
103120/examples/json/request5-JSON-Delivery.json 0 → 100644
View file @ 94a7ee52
{
"@xmlns": "http://uri.etsi.org/03120/common/2019/10/Core",
"@xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
"@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task",
"@xmlns:delivery": "http://uri.etsi.org/03120/common/2019/10/Delivery",
"@xmlns:common": "http://uri.etsi.org/03120/common/2016/02/Common",
"Header": {
"SenderIdentifier": {
"CountryCode": "XX",
"UniqueIdentifier": "ACTOR2"
},
"ReceiverIdentifier": {
"CountryCode": "XX",
"UniqueIdentifier": "ACTOR1"
},
"TransactionIdentifier": "64cd73e1-a438-4d47-9cfb-cead9125a502",
"Timestamp": "2019-09-30T13:37:37.000000Z",
"Version": {
"ETSIVersion": "V1.14.1",
"NationalProfileOwner": "XX",
"NationalProfileVersion": "v1.0"
}
},
"Payload": {
"RequestPayload": {
"ActionRequests": {
"ActionRequest": [
{
"ActionIdentifier": 0,
"DELIVER": {
"Identifier": "11f49f11-39df-4596-aa58-1f7199b587df",
"HI1Object": {
"@xsi:type": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject",
"ObjectIdentifier": "11f49f11-39df-4596-aa58-1f7199b587df",
"AssociatedObjects": {
"AssociatedObject": [
"2b36a78b-b628-416d-bd22-404e68a0cd36"
]
},
"delivery:Reference": {
"delivery:LDID": "XX-ACTOR01-1234"
},
"delivery:SequenceNumber": 1,
"delivery:LastSequence": true,
"delivery:Manifest": {
"delivery:ExternalSchema": {
"delivery:ManifestID" : "ExampleJSONSchema",
"delivery:ManifestContents" : {
"delivery:JSONSchema" : {
"schema_goes_here" : "schema_goes_here"
}
}
}
},
"delivery:Delivery": {
"delivery:JSONData": {
"field1" : "this is native JSON embedded data",
"field2" : 1234
}
}
}
}
}
]
}
}
}
}
103120/schema/json/ts_103120_Core.schema.json
View file @ 94a7ee52
...@@ -13,9 +13,19 @@ ...@@ -13,9 +13,19 @@
"Payload": { "Payload": {
"$ref": "#/$defs/MessagePayload" "$ref": "#/$defs/MessagePayload"
}, },
"Signature": {}, "Signature": {
"xmldsig:Signature": { "properties": {
"$ref": "www.w3.org_2000_09_xmldsig##/$defs/SignatureType" "protected": {
"type": "string"
},
"signature": {
"type": "string"
}
},
"required": [
"protected",
"signature"
]
} }
}, },
"required": [ "required": [
...@@ -593,4 +603,4 @@ ...@@ -593,4 +603,4 @@
} }
}, },
"$ref": "#/$defs/HI1Message" "$ref": "#/$defs/HI1Message"
} }
\ No newline at end of file
103120/schema/json/ts_103120_Delivery.schema.json
View file @ 94a7ee52
...@@ -145,6 +145,17 @@ ...@@ -145,6 +145,17 @@
"required": [ "required": [
"delivery:XMLSchema" "delivery:XMLSchema"
] ]
},
{
"type": "object",
"properties": {
"delivery:JSONSchema": {
"$ref": "#/$defs/EmbeddedJSONData"
}
},
"required": [
"delivery:JSONSchema"
]
} }
] ]
}, },
...@@ -180,6 +191,17 @@ ...@@ -180,6 +191,17 @@
"required": [ "required": [
"delivery:XMLData" "delivery:XMLData"
] ]
},
{
"type": "object",
"properties": {
"delivery:JSONData": {
"$ref": "#/$defs/EmbeddedJSONData"
}
},
"required": [
"delivery:JSONData"
]
} }
] ]
}, },
...@@ -204,6 +226,7 @@ ...@@ -204,6 +226,7 @@
"delivery:Data" "delivery:Data"
] ]
}, },
"EmbeddedXMLData": {} "EmbeddedXMLData": {},
"EmbeddedJSONData": {}
} }
} }
\ No newline at end of file
103120/schema/json/ts_103120_TrafficPolicy.schema.json
View file @ 94a7ee52
...@@ -154,6 +154,28 @@ ...@@ -154,6 +154,28 @@
"required": [ "required": [
"tp:MobileAccessPolicyCriteria" "tp:MobileAccessPolicyCriteria"
] ]
},
{
"type": "object",
"properties": {
"tp:EthernetPolicyCriteria": {
"$ref": "#/$defs/EthernetPolicyCriteria"
}
},
"required": [
"tp:EthernetPolicyCriteria"
]
},
{
"type": "object",
"properties": {
"tp:RCSPolicyCriteria": {
"$ref": "#/$defs/RCSPolicyCriteria"
}
},
"required": [
"tp:RCSPolicyCriteria"
]
} }
] ]
}, },
...@@ -193,6 +215,63 @@ ...@@ -193,6 +215,63 @@
} }
}, },
"required": [] "required": []
},
"EthernetPolicyCriteria": {
"type": "object",
"properties": {
"tp:SourceMACAddress": {
"$ref": "ts_103280_2017_07#/$defs/MACAddress"
},
"tp:DestinationMACAddress": {
"$ref": "ts_103280_2017_07#/$defs/MACAddress"
},
"tp:BothDirections": {
"type": "boolean"
},
"tp:VLANCriteria": {
"$ref": "#/$defs/VLANCriteria"
}
},
"required": []
},
"VLANCriteria": {
"oneOf": [
{
"type": "object",
"properties": {
"tp:OuterVLANs": {
"$ref": "#/$defs/VLANIDList"
}
},
"required": [
"tp:OuterVLANs"
]
}
]
},
"VLANIDList": {
"type": "object",
"properties": {
"tp:VLANID": {
"type": "array",
"items": {
"$ref": "ts_103280_2017_07#/$defs/VLANID"
},
"minItems": 1
}
},
"required": []
},
"RCSPolicyCriteria": {
"type": "object",
"properties": {
"tp:CommunicationServiceID": {
"$ref": "ts_103280_2017_07#/$defs/ShortString"
}
},
"required": [
"tp:CommunicationServiceID"
]
} }
} }
} }
\ No newline at end of file
103120/schema/xsd/ts_103120_Delivery.xsd
View file @ 94a7ee52
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<xs:choice> <xs:choice>
<xs:element name="BinaryData" type="EmbeddedBinaryData"/> <xs:element name="BinaryData" type="EmbeddedBinaryData"/>
<xs:element name="XMLSchema" type="SchemaContent"/> <xs:element name="XMLSchema" type="SchemaContent"/>
<xs:element name="JSONSchema" type="EmbeddedJSONData"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="SchemaContent"> <xs:complexType name="SchemaContent">
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
<xs:choice> <xs:choice>
<xs:element name="BinaryData" type="EmbeddedBinaryData"/> <xs:element name="BinaryData" type="EmbeddedBinaryData"/>
<xs:element name="XMLData" type="EmbeddedXMLData"/> <xs:element name="XMLData" type="EmbeddedXMLData"/>
<xs:element name="JSONData" type="EmbeddedJSONData"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="EmbeddedBinaryData"> <xs:complexType name="EmbeddedBinaryData">
...@@ -65,4 +67,9 @@ ...@@ -65,4 +67,9 @@
<xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/> <xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="EmbeddedJSONData">
<xs:sequence>
<xs:any namespace="##other" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
</xs:schema> </xs:schema>
103120/schema/xsd/ts_103120_TrafficPolicy.xsd
View file @ 94a7ee52
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
<xs:choice> <xs:choice>
<xs:element name="IPPolicyCriteria" type="IPPolicyCriteria"/> <xs:element name="IPPolicyCriteria" type="IPPolicyCriteria"/>
<xs:element name="MobileAccessPolicyCriteria" type="MobileAccessPolicyCriteria"/> <xs:element name="MobileAccessPolicyCriteria" type="MobileAccessPolicyCriteria"/>
<xs:element name="EthernetPolicyCriteria" type="EthernetPolicyCriteria"/>
<xs:element name="RCSPolicyCriteria" type="RCSPolicyCriteria"/>
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<xs:complexType name="IPPolicyCriteria"> <xs:complexType name="IPPolicyCriteria">
...@@ -71,4 +73,27 @@ ...@@ -71,4 +73,27 @@
<xs:element name="DNN" type="etsi:ShortString" minOccurs="0"/> <xs:element name="DNN" type="etsi:ShortString" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="EthernetPolicyCriteria">
<xs:sequence>
<xs:element name="SourceMACAddress" type="etsi:MACAddress" minOccurs="0"/>
<xs:element name="DestinationMACAddress" type="etsi:MACAddress" minOccurs="0"/>
<xs:element name="BothDirections" type="xs:boolean" minOccurs="0"/>
<xs:element name="VLANCriteria" type="VLANCriteria" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="VLANCriteria">
<xs:choice>
<xs:element name="OuterVLANs" type="VLANIDList"/>
</xs:choice>
</xs:complexType>
<xs:complexType name="VLANIDList">
<xs:sequence>
<xs:element name="VLANID" type="etsi:VLANID" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RCSPolicyCriteria">
<xs:sequence>
<xs:element name="CommunicationServiceID" type="etsi:ShortString" minOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:schema> </xs:schema>
103221-1/TS_103_221_01.xsd
View file @ 94a7ee52
<?xml version="1.0" encoding="UTF-8"?> <?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.15.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.16.1">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/> <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/> <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>
<!-- Message containers --> <!-- Message containers -->
...@@ -354,6 +354,16 @@ ...@@ -354,6 +354,16 @@
<xs:element name="Owner" type="xs:string"/> <xs:element name="Owner" type="xs:string"/>
<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/> <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType>
<xs:complexType name="TaskIssueExtensions">
<xs:complexContent>
<xs:extension base="Extension"/>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="NEIssueExtensions">
<xs:complexContent>
<xs:extension base="Extension"/>
</xs:complexContent>
</xs:complexType> </xs:complexType>
<!-- See section 6.2.1 --> <!-- See section 6.2.1 -->
<xs:complexType name="ActivateTaskResponse"> <xs:complexType name="ActivateTaskResponse">
...@@ -776,6 +786,7 @@ ...@@ -776,6 +786,7 @@
<xs:element name="taskReportType" type="TaskReportType"/> <xs:element name="taskReportType" type="TaskReportType"/>
<xs:element name="taskIssueErrorCode" type="xs:integer" minOccurs="0"/> <xs:element name="taskIssueErrorCode" type="xs:integer" minOccurs="0"/>
<xs:element name="taskIssueDetails" type="xs:string" minOccurs="0"/> <xs:element name="taskIssueDetails" type="xs:string" minOccurs="0"/>
<xs:element name="taskIssueExtensions" type="TaskIssueExtensions" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
...@@ -833,6 +844,7 @@ ...@@ -833,6 +844,7 @@
<xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"/> <xs:element name="typeOfNeIssueMessage" type="TypeOfNeIssueMessage"/>
<xs:element name="description" type="xs:string"/> <xs:element name="description" type="xs:string"/>
<xs:element name="issueCode" type="xs:integer" minOccurs="0"/> <xs:element name="issueCode" type="xs:integer" minOccurs="0"/>
<xs:element name="nEIssueExtensions" type="NEIssueExtensions" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
103280/TS_103_280.asn1
View file @ 94a7ee52
Common-Parameters Common-Parameters
{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)} {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)}
DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN
-- Object Identifier definitions -- Object Identifier definitions
commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)} commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)}
-- Common Parameters (below are as defined in clause 6) -- Common Parameters (below are as defined in clause 6)
...@@ -93,4 +93,6 @@ NAI ::= UTF8String ...@@ -93,4 +93,6 @@ NAI ::= UTF8String
IPProtocol ::= INTEGER (0..255) IPProtocol ::= INTEGER (0..255)
VLANID ::= INTEGER (0..4095)
END END
103280/TS_103_280.schema.json
View file @ 94a7ee52
...@@ -191,6 +191,11 @@ ...@@ -191,6 +191,11 @@
"minimum": 0, "minimum": 0,
"maximum": 255 "maximum": 255
}, },
"VLANID": {
"type": "integer",
"minimum": 0,
"maximum": 4095
},
"IPAddress": { "IPAddress": {
"oneOf": [ "oneOf": [
{ {
......
103280/TS_103_280.xsd
View file @ 94a7ee52
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.9.1" elementFormDefault="qualified"> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03280/common/2017/07" targetNamespace="http://uri.etsi.org/03280/common/2017/07" version="2.10.1" elementFormDefault="qualified">
<xs:simpleType name="ShortString"> <xs:simpleType name="ShortString">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:maxLength value="255"/> <xs:maxLength value="255"/>
...@@ -272,4 +272,10 @@ ...@@ -272,4 +272,10 @@
<xs:maxInclusive value="255"/> <xs:maxInclusive value="255"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="VLANID">
<xs:restriction base="xs:integer">
<xs:minInclusive value="0"/>
<xs:maxInclusive value="4095"/>
</xs:restriction>
</xs:simpleType>
</xs:schema> </xs:schema>
103707/TS_103_707.xsd
View file @ 94a7ee52
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 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.6.1" elementFormDefault="qualified"> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" version="1.7.1" elementFormDefault="qualified">
<xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/> <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>
<xs:import namespace="http://uri.etsi.org/03120/common/2020/09/Task"/>
<!-- ************************************************************************************* --> <!-- ************************************************************************************* -->
<!-- Handover Item definitions including header (clause 5.3) --> <!-- Handover Item definitions including header (clause 5.3) -->
<!-- ************************************************************************************* --> <!-- ************************************************************************************* -->
...@@ -66,12 +67,21 @@ ...@@ -66,12 +67,21 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="MessagingPartyIdentifiers"> <xs:complexType name="MessagingPartyIdentifiers">
<xs:sequence> <xs:sequence>
<xs:element name="identifier" type="MessagingPartyIdentifier" minOccurs="1" maxOccurs="unbounded"/> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="identifier" type="MessagingPartyIdentifier"/>
<xs:element name="qualifiedIdentifier" type="QualifiedPartyIdentifier"/>
</xs:choice>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:simpleType name="MessagingPartyIdentifier"> <xs:simpleType name="MessagingPartyIdentifier">
<xs:restriction base="etsi103280:LongString"/> <xs:restriction base="etsi103280:LongString"/>
</xs:simpleType> </xs:simpleType>
<xs:complexType name="QualifiedPartyIdentifier">
<xs:sequence>
<xs:element name="formatType" type="etsi103120:FormatType" minOccurs="0"/>
<xs:element name="value" type="etsi103280:LongString"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="BinaryObjects"> <xs:complexType name="BinaryObjects">
<xs:sequence> <xs:sequence>
<xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"/> <xs:element name="binaryObject" type="BinaryObject" minOccurs="1" maxOccurs="unbounded"/>
...@@ -101,6 +111,7 @@ ...@@ -101,6 +111,7 @@
<!-- currently no glossary entries are defined --> <!-- currently no glossary entries are defined -->
</xs:choice> </xs:choice>
</xs:complexType> </xs:complexType>
<!-- ************************************************************************************* --> <!-- ************************************************************************************* -->
<!-- CSP-defined container (Clause 5.6) --> <!-- CSP-defined container (Clause 5.6) -->
<!-- ************************************************************************************* --> <!-- ************************************************************************************* -->
......
103707/examples/example_new_identifier.xml 0 → 100644
View file @ 94a7ee52
<?xml version="1.0" encoding="UTF-8"?>
<handoverItem xmlns="http://uri.etsi.org/03707/2020/02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:etsi103120="http://uri.etsi.org/03120/common/2020/09/Task">
<header/>
<payload xsi:type="MessagingPayload">
<coreParameters>
<messageSender>
<identifiers>
<qualifiedIdentifier>
<formatType>
<etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>
<etsi103120:FormatName>EmailAddress</etsi103120:FormatName>
</formatType>
<value>qualified@example.com</value>
</qualifiedIdentifier>
<identifier>old_style_unqualified@example.com</identifier>
</identifiers>
<isTargetedParty>true</isTargetedParty>
</messageSender>
<messageReceivers>
<recipient>
<identifiers>
<qualifiedIdentifier>
<formatType>
<etsi103120:FormatOwner>ETSI</etsi103120:FormatOwner>
<etsi103120:FormatName>EmailAddress</etsi103120:FormatName>
</formatType>
<value>qualified@example.com</value>
</qualifiedIdentifier>
</identifiers>
</recipient>
</messageReceivers>
<timestamp>2019-10-17T06:42:23.000000+01:00</timestamp>
</coreParameters>
<cspDefinedParameters>
<cspDefinedMetadata>
<schemaDetails>
<schemaIdentifier>http://FooServiceSchema.example.com/schema/v1.1.1/</schemaIdentifier>
</schemaDetails>
<xmlData>
<fooServiceDefinedParameters xmlns="http://FooServiceSchema.example.com/schema/v1.1.1/">
<item1>Foo</item1>
<item2>Bar</item2>
<item3>Baz</item3>
</fooServiceDefinedParameters>
</xmlData>
</cspDefinedMetadata>
</cspDefinedParameters>
</payload>
</handoverItem>