Commit 544fecd4 authored by canterburym's avatar canterburym
Browse files

Merge branch 'r16/meeting/SA85' into 'rel16' 

R16/meeting/sa85

See merge request canterburym/ts33128_test!4
parents 11fdf3d2 cee33555

.gitlab-ci.yml

+3 −4
Original line number Diff line number Diff line
@@ -5,15 +5,14 @@ before_script: 
  - pip3 install -q asn1tools lxml xmlschema



stages:

  - Check ASN.1

  - Check XSD

  - Check Schemas



checkASN1:

  stage: Check ASN.1

  stage: Check Schemas

  script:

  - python3 testing/check_asn1.py



checkXSD:

    stage: Check XSD

    stage: Check Schemas

    script:

    - python3 testing/check_xsd.py
 
 No newline at end of file

ts33128payloads.asn1

+10 −6
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version1(1)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version0(0)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,13 +9,13 @@ BEGIN 
-- Relative OIDs

-- =============



xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) xCC(2)}

xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) xCC(2)}



iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) cC(4)}

iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) cC(4)}



lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version1(1) lINotification(5)}

lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version0(0) lINotification(5)}



-- ===============

-- X2 xIRI payload
@@ -1221,6 +1221,7 @@ GeographicalCoordinates ::= SEQUENCE 
{

    latitude                            [1] UTF8String,

    longitude                           [2] UTF8String

    mapDatumInformation                 [3] OGCURN OPTIONAL

}



-- TS 29.572 [24], clause 6.1.6.2.22
@@ -1330,4 +1331,7 @@ Usage ::= ENUMERATED 
-- TS 29.571 [17], table 5.2.2-1

TimeZone ::= UTF8String



-- Open Geospatial Consortium URN [35]

OGCURN ::= UTF8String



END