Skip to content
GitLab
Commit 813af974 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/LI59e' into 'rap/102232-5'

parents 6b3f32c8 2dd292c9
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 813af974
image: "python:3.7"
before_script:
- python3 --version
- pip3 install -q asn1tools lxml xmlschema
stages:
- Check Schemas
- check
checkASN1:
stage: Check Schemas
process_asn:
image: "mcanterb/asn1test:latest"
stage: check
interruptible: true
script:
- python3 testing/check_asn1.py
\ No newline at end of file
- python3 testing/asn_process.py
process_xsd:
image: "mcanterb/xsdtest:latest"
stage: check
interruptible: true
script:
- python3 testing/xsd_process.py
102232-1/LI-PS-PDU.asn
View file @ 813af974
LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version33(33)}
DEFINITIONS IMPLICIT TAGS ::=
......@@ -34,7 +34,7 @@ IMPORTS
MessagingMMCC,
MessagingIRI
FROM EmailPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version19(19)}
-- from ETSI TS 102 232-3 [6]
IPCC,
......@@ -54,7 +54,7 @@ IMPORTS
IPMMCC,
IPMMIRI
FROM IPMultimediaPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version14(14)}
-- from ETSI TS 102 232-6 [36]
PstnIsdnCC,
......@@ -204,7 +204,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) version32(32)}
li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version33(33)}
-- ====================
-- Top-level definition
......@@ -732,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID
-- module to preserve the original type name during the
-- removal of imports from ETSI TS 101 671 [4].
END --end of LI-PS-PDU
\ No newline at end of file
END --end of LI-PS-PDU
102232-2/EmailPDU.asn
View file @ 813af974
......@@ -391,7 +391,7 @@ Messaging-Party-Identity ::= CHOICE
{
msisdn [0] OCTET STRING (SIZE (1..9)),
-- MSISDN of the target, encoded in the same format as the AddressString
-- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8.
-- parameters defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.
e164-format [1] OCTET STRING (SIZE (1..25)),
-- E.164 address of the node in international format. Coded in the same format as
-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])
......@@ -541,4 +541,4 @@ Messaging-Property-Requested-Reports ::= ENUMERATED
...
}
END -- end of EmailPDU
\ No newline at end of file
END -- end of EmailPDU
102232-4/L2AccessPDU.asn
View file @ 813af974
......@@ -36,9 +36,9 @@ L2CC ::= SEQUENCE
-- The ethernet protocol is used
...,
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
-- The protocol RFC 2427 “Multiprotocol Interconnect over Frame Relay” [18] is used
-- The protocol RFC 2427 "Multiprotocol Interconnect over Frame Relay" [18] is used
}
}
......@@ -194,7 +194,7 @@ L2ProtocolInformation ::= ENUMERATED
l2ProtocolATM2684(7),
-- The protocol RFC 2684, method "LLC Encapsulation for Bridged Protocols" [16] is used
l2ProtocolFR2427(8)
-- The protocol RFC2427 “Multiprotocol Interconnect over Frame Relay” [18] is used
-- The protocol RFC2427 "Multiprotocol Interconnect over Frame Relay" [18] is used
}
END -- end of L2AccessPDU
103120/examples/mutliple-auth-example-request.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>d442c58c-d5e1-4fd9-90ec-9c228ad947f1</TransactionIdentifier>
<Timestamp>2020-09-22T08:06:17.025833Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.1.1</NationalProfileVersion>
</Version>
......
103120/examples/request1.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
<Timestamp>2015-09-01T12:00:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request2.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
<Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request3.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
<Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request4.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request5-Binary-Delivery.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request5-XML-Delivery.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request6.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2f</TransactionIdentifier>
<Timestamp>2021-10-11T13:37:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/request6_signed.xml
View file @ 813af974
......@@ -11,7 +11,7 @@
<TransactionIdentifier>9964584e-c1a5-4ffa-b949-d9da504c4efb</TransactionIdentifier>
<Timestamp>2021-06-25T12:00:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.9.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/response1.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
<Timestamp>2015-09-01T12:00:01.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/response2.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
<Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/response3.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
<Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/response4.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:01.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/response5.xml
View file @ 813af974
......@@ -17,7 +17,7 @@
<TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/examples/response6.xml
View file @ 813af974
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2f</TransactionIdentifier>
<Timestamp>2021-10-11T13:37:01.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.10.1</ETSIVersion>
<ETSIVersion>V1.11.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103221-1/TS_103_221_01.xsd
View file @ 813af974
<?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" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.10.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.11.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 -->
......@@ -300,6 +300,7 @@
<xs:complexType name="ListOfDids">
<xs:sequence>
<xs:element name="dId" type="DId" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="dSId" type="GenericObjectID" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="ListOfMediationDetails">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment