From 4c73e4b0298910faca3ac4eedeb6b436f4f1b701 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 14 Dec 2023 16:13:22 +0000 Subject: [PATCH 01/51] Making files compliant with editorconfig and xmllint --- .editorconfig | 9 +- .gitignore | 2 +- 33128/r15/TS33128Payloads.asn | 8 +- 33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 449 +++++----- 33128/r16/TS33128IdentityAssociation.asn | 2 +- 33128/r16/TS33128Payloads.asn | 36 +- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 433 +++++----- .../r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 485 ++++++----- 33128/r17/TS33128Payloads.asn | 96 +-- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 497 ++++++----- .../r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 722 ++++++++-------- 33128/r18/TS33128Dictionaries.xml | 158 ++-- 33128/r18/TS33128IdentityAssociation.asn | 2 +- 33128/r18/TS33128Payloads.asn | 89 +- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 236 +++-- .../urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 371 ++++---- .../r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 809 +++++++++--------- .../r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 171 ++-- testing/asn_compile_targets.json | 2 +- testing/asn_ignore.txt | 2 +- testing/asn_ignore_lint.txt | 2 +- .../xsd/TS_103_221_01_DestinationSet.xsd | 80 +- .../xsd/TS_103_221_01_HashedID.xsd | 64 +- .../dependencies/xsd/TS_103_280_v020401.xsd | 2 +- .../xsd/ts_103120v011102p0_Common.xsd | 147 ++-- testing/lint_xml.py | 49 ++ 29 files changed, 2601 insertions(+), 2610 deletions(-) create mode 100644 testing/lint_xml.py diff --git a/.editorconfig b/.editorconfig index a3b74067..e5f4dc9f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,12 @@ [**] insert_final_newline = true -[**.{asn1,asn,xsd,xml}] +[**.{asn1,asn,json}] indent_style = space indent_size = 4 -trim_trailing_whitespace = true \ No newline at end of file +trim_trailing_whitespace = true + +[**.{xsd, xml}] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true diff --git a/.gitignore b/.gitignore index 58d77c67..d1aed6cc 100644 --- a/.gitignore +++ b/.gitignore @@ -125,4 +125,4 @@ venv.bak/ # mypy .mypy_cache/ .dmypy.json -dmypy.json \ No newline at end of file +dmypy.json diff --git a/33128/r15/TS33128Payloads.asn b/33128/r15/TS33128Payloads.asn index 59e0a073..d56dadbb 100644 --- a/33128/r15/TS33128Payloads.asn +++ b/33128/r15/TS33128Payloads.asn @@ -800,9 +800,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } @@ -1214,8 +1214,8 @@ Point ::= SEQUENCE PointUncertaintyCircle ::= SEQUENCE { geographicalCoordinates [1] GeographicalCoordinates, - -- The uncertainty parameter has been deprecated and shall be set to 0. - -- The uncertaintySBI parameter shall be used instead. + -- The uncertainty parameter has been deprecated and shall be set to 0. + -- The uncertaintySBI parameter shall be used instead. uncertainty [2] Uncertainty, uncertaintySBI [3] UncertaintySBI OPTIONAL } diff --git a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 20a5ade8..5e6360e0 100644 --- a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,226 +1,223 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/TS33128IdentityAssociation.asn b/33128/r16/TS33128IdentityAssociation.asn index 82aca7c5..bf97cb47 100644 --- a/33128/r16/TS33128IdentityAssociation.asn +++ b/33128/r16/TS33128IdentityAssociation.asn @@ -96,4 +96,4 @@ EUI64 ::= OCTET STRING (SIZE(8)) SUCI ::= OCTET STRING (SIZE(8..3008)) -END \ No newline at end of file +END diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 4f019253..074c61c8 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -117,7 +117,7 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification } @@ -212,8 +212,8 @@ IRIEvent ::= CHOICE pTCAccessPolicy [53] PTCAccessPolicy, -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, -- SMS-related events, continued from choice 12 sMSReport [56] SMSReport, @@ -226,8 +226,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssocation [62] AMFIdentifierAssocation, - mMEIdentifierAssocation [63] MMEIdentifierAssocation, + aMFIdentifierAssocation [62] AMFIdentifierAssocation, + mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification @@ -1845,21 +1845,21 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -1920,7 +1920,7 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, - -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number + -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, location [4] Location OPTIONAL, iMPU [5] IMPU OPTIONAL, @@ -2297,9 +2297,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 99957b66..9ccd6819 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,219 +1,214 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd index f07c0727..e393c2f6 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,50 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd index d0939779..64fca7e8 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,244 +1,241 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e4dd004d..5f6ad99c 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -289,8 +289,8 @@ IRIEvent ::= CHOICE pTCAccessPolicy [53] PTCAccessPolicy, -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, -- SMS-related events, continued from choice 12 sMSReport [56] SMSReport, @@ -303,8 +303,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssociation [62] AMFIdentifierAssociation, - mMEIdentifierAssociation [63] MMEIdentifierAssociation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, @@ -1005,14 +1005,14 @@ UAProtocolID ::= OCTET STRING (SIZE(5)) AKMAAFID ::= SEQUENCE { - aFFQDN [1] FQDN, - uaProtocolID [2] UAProtocolID + aFFQDN [1] FQDN, + uaProtocolID [2] UAProtocolID } UAStarParams ::= CHOICE { - tls12 [1] TLS12UAStarParams, - generic [2] GenericUAStarParams + tls12 [1] TLS12UAStarParams, + generic [2] GenericUAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1034,38 +1034,38 @@ TLSCipherType ::= ENUMERATED TLSCompressionAlgorithm ::= ENUMERATED { - null(1), - deflate(2) + null(1), + deflate(2) } TLSPRFAlgorithm ::= ENUMERATED { - rfc5246(1) + rfc5246(1) } TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(48)), - pRFAlgorithm [3] TLSPRFAlgorithm, - cipherSuite [4] TLSCipherSuite, - cipherType [5] TLSCipherType, - encKeyLength [6] INTEGER (0..255), - blockLength [7] INTEGER (0..255), - fixedIVLength [8] INTEGER (0..255), - recordIVLength [9] INTEGER (0..255), - macLength [10] INTEGER (0..255), - macKeyLength [11] INTEGER (0..255), - compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(32)), - serverRandom [14] OCTET STRING (SIZE(32)), - clientSequenceNumber [15] INTEGER, - serverSequenceNumber [16] INTEGER, - sessionID [17] OCTET STRING (SIZE(0..32)), - tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), - tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), + pRFAlgorithm [3] TLSPRFAlgorithm, + cipherSuite [4] TLSCipherSuite, + cipherType [5] TLSCipherType, + encKeyLength [6] INTEGER (0..255), + blockLength [7] INTEGER (0..255), + fixedIVLength [8] INTEGER (0..255), + recordIVLength [9] INTEGER (0..255), + macLength [10] INTEGER (0..255), + macKeyLength [11] INTEGER (0..255), + compressionAlgorithm [12] TLSCompressionAlgorithm, + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), + clientSequenceNumber [15] INTEGER, + serverSequenceNumber [16] INTEGER, + sessionID [17] OCTET STRING (SIZE(0..32)), + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING @@ -1815,9 +1815,9 @@ FlowDescription ::= SEQUENCE IPAddressOrRangeOrAny ::= CHOICE { - iPAddress [1] IPAddress, - ipAddressRange [2] IPMask, - anyIPAddress [3] AnyIPAddress + iPAddress [1] IPAddress, + ipAddressRange [2] IPMask, + anyIPAddress [3] AnyIPAddress } IPMask ::= SEQUENCE @@ -1833,8 +1833,8 @@ AnyIPAddress ::= ENUMERATED NextLayerProtocolOrAny ::= CHOICE { - nextLayerProtocol [1] NextLayerProtocol, - anyNextLayerProtocol [2] AnyNextLayerProtocol + nextLayerProtocol [1] NextLayerProtocol, + anyNextLayerProtocol [2] AnyNextLayerProtocol } AnyNextLayerProtocol ::= ENUMERATED @@ -3492,21 +3492,21 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -4117,7 +4117,7 @@ FiveGSSubscriberID ::= CHOICE FiveGSSubscriberIDs ::= SEQUENCE { - fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID + fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID } FiveGMMCause ::= INTEGER (0..255) @@ -4424,9 +4424,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index a0b20923..847d912d 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,251 +1,246 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 96f3da73..84c666b5 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,50 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 5f29b559..52fdfabd 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,363 +1,359 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml index a1c77b9f..40659ede 100644 --- a/33128/r18/TS33128Dictionaries.xml +++ b/33128/r18/TS33128Dictionaries.xml @@ -1,95 +1,95 @@ - - 3GPP - ServiceType - - - Voice - Service scoping shall include the Voice service type as defined in clause 4.4.2 - - - Data - Service scoping shall include the Data service type as defined in clause 4.4.2 - - - Messaging - Service scoping shall include the Messaging service type as defined in clause 4.4.2 - - - PTC - Service scoping shall include the Push-to-Talk service type as defined in clause 4.4.2 - - - LALS - Service scoping shall include the LALS service type as defined in clause 4.4.2 - - - RCS - Service scoping shall include the RCS service type as defined in clause 4.4.2 - + + 3GPP + ServiceType + + + Voice + Service scoping shall include the Voice service type as defined in clause 4.4.2 + + + Data + Service scoping shall include the Data service type as defined in clause 4.4.2 + + + Messaging + Service scoping shall include the Messaging service type as defined in clause 4.4.2 + + + PTC + Service scoping shall include the Push-to-Talk service type as defined in clause 4.4.2 + + + LALS + Service scoping shall include the LALS service type as defined in clause 4.4.2 + + + RCS + Service scoping shall include the RCS service type as defined in clause 4.4.2 + - - 3GPP - LATaskFlag - - - HILADelivery - The location information shall be delivered via the LI_HILA interface. - - - HI2Delivery - The location information shall be delivered via the LI_HI2 interface. - + + 3GPP + LATaskFlag + + + HILADelivery + The location information shall be delivered via the LI_HILA interface. + + + HI2Delivery + The location information shall be delivered via the LI_HI2 interface. + - - 3GPP - RequestType - - - IdentityAssociation - A request for a single IdentityResponseDetails response to the query provided. - - - OngoingIdentityAssociation - A request for location information of the target, consisting at least of the TAI and the NCGI. - + + 3GPP + RequestType + + + IdentityAssociation + A request for a single IdentityResponseDetails response to the query provided. + + + OngoingIdentityAssociation + A request for location information of the target, consisting at least of the TAI and the NCGI. + - LocationAcquisition - A request for an ongoing series of IdentityResponseDetails responses matching the query provided. - + LocationAcquisition + A request for an ongoing series of IdentityResponseDetails responses matching the query provided. + - - 3GPP - LIHIQRFlags - - - IncludeNCGIInResponse - A request for returning the NCGI in the response. - + + 3GPP + LIHIQRFlags + + + IncludeNCGIInResponse + A request for returning the NCGI in the response. + - - 3GPP - LIHILAFlags - - - ReqCurrentLoc - Indicates whether the current location of the UE is requested. - + + 3GPP + LIHILAFlags + + + ReqCurrentLoc + Indicates whether the current location of the UE is requested. + - - 3GPP - ManifestSpecification - - - LIHIQRResponse - The delivery contains IdentityResponseDetails (see Annex E). - + + 3GPP + ManifestSpecification + + + LIHIQRResponse + The delivery contains IdentityResponseDetails (see Annex E). + diff --git a/33128/r18/TS33128IdentityAssociation.asn b/33128/r18/TS33128IdentityAssociation.asn index 707aaa27..72d66c5e 100644 --- a/33128/r18/TS33128IdentityAssociation.asn +++ b/33128/r18/TS33128IdentityAssociation.asn @@ -104,4 +104,4 @@ GPSI ::= CHOICE MSISDN ::= NumericString (SIZE(1..15)) -END \ No newline at end of file +END diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5684a1a0..38fa6cc1 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1187,14 +1187,14 @@ UAProtocolID ::= OCTET STRING (SIZE(5)) AKMAAFID ::= SEQUENCE { - aFFQDN [1] FQDN, - uaProtocolID [2] UAProtocolID + aFFQDN [1] FQDN, + uaProtocolID [2] UAProtocolID } UAStarParams ::= CHOICE { - tls12 [1] TLS12UAStarParams, - generic [2] GenericUAStarParams + tls12 [1] TLS12UAStarParams, + generic [2] GenericUAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1216,38 +1216,38 @@ TLSCipherType ::= ENUMERATED TLSCompressionAlgorithm ::= ENUMERATED { - null(1), - deflate(2) + null(1), + deflate(2) } TLSPRFAlgorithm ::= ENUMERATED { - rfc5246(1) + rfc5246(1) } TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(48)), - pRFAlgorithm [3] TLSPRFAlgorithm, - cipherSuite [4] TLSCipherSuite, - cipherType [5] TLSCipherType, - encKeyLength [6] INTEGER (0..255), - blockLength [7] INTEGER (0..255), - fixedIVLength [8] INTEGER (0..255), - recordIVLength [9] INTEGER (0..255), - macLength [10] INTEGER (0..255), - macKeyLength [11] INTEGER (0..255), - compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(32)), - serverRandom [14] OCTET STRING (SIZE(32)), - clientSequenceNumber [15] INTEGER, - serverSequenceNumber [16] INTEGER, - sessionID [17] OCTET STRING (SIZE(0..32)), - tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), - tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), + pRFAlgorithm [3] TLSPRFAlgorithm, + cipherSuite [4] TLSCipherSuite, + cipherType [5] TLSCipherType, + encKeyLength [6] INTEGER (0..255), + blockLength [7] INTEGER (0..255), + fixedIVLength [8] INTEGER (0..255), + recordIVLength [9] INTEGER (0..255), + macLength [10] INTEGER (0..255), + macKeyLength [11] INTEGER (0..255), + compressionAlgorithm [12] TLSCompressionAlgorithm, + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), + clientSequenceNumber [15] INTEGER, + serverSequenceNumber [16] INTEGER, + sessionID [17] OCTET STRING (SIZE(0..32)), + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING @@ -2367,9 +2367,9 @@ FlowDescription ::= SEQUENCE IPAddressOrRangeOrAny ::= CHOICE { - iPAddress [1] IPAddress, - ipAddressRange [2] IPMask, - anyIPAddress [3] AnyIPAddress + iPAddress [1] IPAddress, + ipAddressRange [2] IPMask, + anyIPAddress [3] AnyIPAddress } IPMask ::= SEQUENCE @@ -2385,8 +2385,8 @@ AnyIPAddress ::= ENUMERATED NextLayerProtocolOrAny ::= CHOICE { - nextLayerProtocol [1] NextLayerProtocol, - anyNextLayerProtocol [2] AnyNextLayerProtocol + nextLayerProtocol [1] NextLayerProtocol, + anyNextLayerProtocol [2] AnyNextLayerProtocol } AnyNextLayerProtocol ::= ENUMERATED @@ -4096,21 +4096,20 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } - PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -4939,8 +4938,8 @@ FiveGMSAFUnsuccessfulProcedure ::= SEQUENCE -- See clause 7.15.2.8 for details of this structure FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE ::= SEQUENCE { - gPSI [1] GPSI, - serviceAccessInformationResource [2] SBIType + gPSI [1] GPSI, + serviceAccessInformationResource [2] SBIType } -- ============== @@ -5729,7 +5728,7 @@ FiveGSSubscriberID ::= CHOICE FiveGSSubscriberIDs ::= SEQUENCE { - fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID + fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID } FiveGSMRequestType ::= ENUMERATED diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index d79c3e1f..14495c81 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,121 +1,115 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 7cea78b8..ab3ba276 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,189 +1,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 96f3da73..84c666b5 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,50 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index a81b59f5..f179237f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,407 +1,402 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 6e3f041d..14415107 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,89 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/asn_compile_targets.json b/testing/asn_compile_targets.json index 26ccf77c..989c81de 100644 --- a/testing/asn_compile_targets.json +++ b/testing/asn_compile_targets.json @@ -6,4 +6,4 @@ ["./33128/r17/TS33128IdentityAssociation.asn"], ["./33128/r18/TS33128Payloads.asn"], ["./33128/r18/TS33128IdentityAssociation.asn"] -] \ No newline at end of file +] diff --git a/testing/asn_ignore.txt b/testing/asn_ignore.txt index 70aa0c5b..8c2bf332 100644 --- a/testing/asn_ignore.txt +++ b/testing/asn_ignore.txt @@ -1 +1 @@ -33108 \ No newline at end of file +33108 diff --git a/testing/asn_ignore_lint.txt b/testing/asn_ignore_lint.txt index 03e7f54e..800285ea 100644 --- a/testing/asn_ignore_lint.txt +++ b/testing/asn_ignore_lint.txt @@ -1 +1 @@ -dependencies \ No newline at end of file +dependencies diff --git a/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd b/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd index 1bdcb981..f35c8a3b 100644 --- a/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd +++ b/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd @@ -1,40 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd b/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd index f5e735d2..85a303f5 100644 --- a/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd +++ b/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/TS_103_280_v020401.xsd b/testing/dependencies/xsd/TS_103_280_v020401.xsd index 3ff4ae13..2c2c2b61 100644 --- a/testing/dependencies/xsd/TS_103_280_v020401.xsd +++ b/testing/dependencies/xsd/TS_103_280_v020401.xsd @@ -220,7 +220,7 @@ - + diff --git a/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd index abaf3235..aa073830 100644 --- a/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd +++ b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd @@ -1,76 +1,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/lint_xml.py b/testing/lint_xml.py new file mode 100644 index 00000000..b7bcf885 --- /dev/null +++ b/testing/lint_xml.py @@ -0,0 +1,49 @@ +from pathlib import Path +from difflib import * +import subprocess + +def lint(file : Path): + completed = subprocess.run(["xmllint", str(file)], capture_output=True, text=True) + + if completed.returncode != 0: + print (f" {str(f)}: FAIL") + print (f" xmlint error code {completed.returncode}") + lines = completed.stderr.splitlines() + for line in lines: + print (f" {line}") + return len(lines) + + linted_xml = completed.stdout + orig_xml = file.read_text() + diff = list(unified_diff(orig_xml.splitlines(), linted_xml.splitlines())) + + if len(diff) == 0: + print (f" {str(f)}: OK") + return 0 + else: + print (f" {str(f)}: {len(diff)} linting errors") + for d in diff: + print("".join(d)) + return len(diff) + + + +if __name__ == "__main__": + root = Path("./") + + files = list(root.rglob("*.xml")) + list(root.rglob("*.xsd")) + + files_with_errors = 0 + errors = 0 + + print ("-------------------------------------------------") + print (f"Linting XML / XSD files...") + + for f in files: + new_errors = lint (f) + errors += new_errors + files_with_errors += 1 if new_errors > 0 else 0 + + print ("-------------------------------------------------") + print (f"Files: {len(files)} ({files_with_errors} with errors) Total errors: {errors}") + print ("-------------------------------------------------") -- GitLab From ee00532f571b6c139049f2af17f30c95f9ab9069 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 14 Dec 2023 16:21:46 +0000 Subject: [PATCH 02/51] Fixing XML file --- 33128/r18/TS33128Dictionaries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml index 40659ede..c2e89ca6 100644 --- a/33128/r18/TS33128Dictionaries.xml +++ b/33128/r18/TS33128Dictionaries.xml @@ -92,5 +92,5 @@ - + -- GitLab From 0d22e2148fbe07f091f90eb1aa3e52f03ea10c21 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 14 Dec 2023 16:13:22 +0000 Subject: [PATCH 03/51] Making files compliant with editorconfig and xmllint --- .editorconfig | 9 +- .gitignore | 2 +- 33128/r15/TS33128Payloads.asn | 8 +- 33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 449 +++++----- 33128/r16/TS33128IdentityAssociation.asn | 2 +- 33128/r16/TS33128Payloads.asn | 36 +- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 433 +++++----- .../r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 485 ++++++----- 33128/r17/TS33128Payloads.asn | 96 +-- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 497 ++++++----- .../r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 722 ++++++++-------- 33128/r18/TS33128Dictionaries.xml | 158 ++-- 33128/r18/TS33128IdentityAssociation.asn | 2 +- 33128/r18/TS33128Payloads.asn | 89 +- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 236 +++-- .../urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 371 ++++---- .../r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 809 +++++++++--------- .../r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 171 ++-- testing/asn_compile_targets.json | 2 +- testing/asn_ignore.txt | 2 +- testing/asn_ignore_lint.txt | 2 +- .../xsd/TS_103_221_01_DestinationSet.xsd | 80 +- .../xsd/TS_103_221_01_HashedID.xsd | 64 +- .../dependencies/xsd/TS_103_280_v020401.xsd | 2 +- .../xsd/ts_103120v011102p0_Common.xsd | 147 ++-- testing/lint_xml.py | 49 ++ 29 files changed, 2601 insertions(+), 2610 deletions(-) create mode 100644 testing/lint_xml.py diff --git a/.editorconfig b/.editorconfig index a3b74067..e5f4dc9f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,12 @@ [**] insert_final_newline = true -[**.{asn1,asn,xsd,xml}] +[**.{asn1,asn,json}] indent_style = space indent_size = 4 -trim_trailing_whitespace = true \ No newline at end of file +trim_trailing_whitespace = true + +[**.{xsd, xml}] +indent_style = space +indent_size = 2 +trim_trailing_whitespace = true diff --git a/.gitignore b/.gitignore index 58d77c67..d1aed6cc 100644 --- a/.gitignore +++ b/.gitignore @@ -125,4 +125,4 @@ venv.bak/ # mypy .mypy_cache/ .dmypy.json -dmypy.json \ No newline at end of file +dmypy.json diff --git a/33128/r15/TS33128Payloads.asn b/33128/r15/TS33128Payloads.asn index 59e0a073..d56dadbb 100644 --- a/33128/r15/TS33128Payloads.asn +++ b/33128/r15/TS33128Payloads.asn @@ -800,9 +800,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } @@ -1214,8 +1214,8 @@ Point ::= SEQUENCE PointUncertaintyCircle ::= SEQUENCE { geographicalCoordinates [1] GeographicalCoordinates, - -- The uncertainty parameter has been deprecated and shall be set to 0. - -- The uncertaintySBI parameter shall be used instead. + -- The uncertainty parameter has been deprecated and shall be set to 0. + -- The uncertaintySBI parameter shall be used instead. uncertainty [2] Uncertainty, uncertaintySBI [3] UncertaintySBI OPTIONAL } diff --git a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 20a5ade8..5e6360e0 100644 --- a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,226 +1,223 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/TS33128IdentityAssociation.asn b/33128/r16/TS33128IdentityAssociation.asn index 82aca7c5..bf97cb47 100644 --- a/33128/r16/TS33128IdentityAssociation.asn +++ b/33128/r16/TS33128IdentityAssociation.asn @@ -96,4 +96,4 @@ EUI64 ::= OCTET STRING (SIZE(8)) SUCI ::= OCTET STRING (SIZE(8..3008)) -END \ No newline at end of file +END diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 4f019253..074c61c8 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -117,7 +117,7 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification } @@ -212,8 +212,8 @@ IRIEvent ::= CHOICE pTCAccessPolicy [53] PTCAccessPolicy, -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, -- SMS-related events, continued from choice 12 sMSReport [56] SMSReport, @@ -226,8 +226,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssocation [62] AMFIdentifierAssocation, - mMEIdentifierAssocation [63] MMEIdentifierAssocation, + aMFIdentifierAssocation [62] AMFIdentifierAssocation, + mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification @@ -1845,21 +1845,21 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -1920,7 +1920,7 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, - -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number + -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, location [4] Location OPTIONAL, iMPU [5] IMPU OPTIONAL, @@ -2297,9 +2297,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 99957b66..9ccd6819 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,219 +1,214 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd index f07c0727..e393c2f6 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,50 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd index d0939779..64fca7e8 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,244 +1,241 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e4dd004d..5f6ad99c 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -289,8 +289,8 @@ IRIEvent ::= CHOICE pTCAccessPolicy [53] PTCAccessPolicy, -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, -- SMS-related events, continued from choice 12 sMSReport [56] SMSReport, @@ -303,8 +303,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssociation [62] AMFIdentifierAssociation, - mMEIdentifierAssociation [63] MMEIdentifierAssociation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, @@ -1005,14 +1005,14 @@ UAProtocolID ::= OCTET STRING (SIZE(5)) AKMAAFID ::= SEQUENCE { - aFFQDN [1] FQDN, - uaProtocolID [2] UAProtocolID + aFFQDN [1] FQDN, + uaProtocolID [2] UAProtocolID } UAStarParams ::= CHOICE { - tls12 [1] TLS12UAStarParams, - generic [2] GenericUAStarParams + tls12 [1] TLS12UAStarParams, + generic [2] GenericUAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1034,38 +1034,38 @@ TLSCipherType ::= ENUMERATED TLSCompressionAlgorithm ::= ENUMERATED { - null(1), - deflate(2) + null(1), + deflate(2) } TLSPRFAlgorithm ::= ENUMERATED { - rfc5246(1) + rfc5246(1) } TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(48)), - pRFAlgorithm [3] TLSPRFAlgorithm, - cipherSuite [4] TLSCipherSuite, - cipherType [5] TLSCipherType, - encKeyLength [6] INTEGER (0..255), - blockLength [7] INTEGER (0..255), - fixedIVLength [8] INTEGER (0..255), - recordIVLength [9] INTEGER (0..255), - macLength [10] INTEGER (0..255), - macKeyLength [11] INTEGER (0..255), - compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(32)), - serverRandom [14] OCTET STRING (SIZE(32)), - clientSequenceNumber [15] INTEGER, - serverSequenceNumber [16] INTEGER, - sessionID [17] OCTET STRING (SIZE(0..32)), - tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), - tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), + pRFAlgorithm [3] TLSPRFAlgorithm, + cipherSuite [4] TLSCipherSuite, + cipherType [5] TLSCipherType, + encKeyLength [6] INTEGER (0..255), + blockLength [7] INTEGER (0..255), + fixedIVLength [8] INTEGER (0..255), + recordIVLength [9] INTEGER (0..255), + macLength [10] INTEGER (0..255), + macKeyLength [11] INTEGER (0..255), + compressionAlgorithm [12] TLSCompressionAlgorithm, + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), + clientSequenceNumber [15] INTEGER, + serverSequenceNumber [16] INTEGER, + sessionID [17] OCTET STRING (SIZE(0..32)), + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING @@ -1815,9 +1815,9 @@ FlowDescription ::= SEQUENCE IPAddressOrRangeOrAny ::= CHOICE { - iPAddress [1] IPAddress, - ipAddressRange [2] IPMask, - anyIPAddress [3] AnyIPAddress + iPAddress [1] IPAddress, + ipAddressRange [2] IPMask, + anyIPAddress [3] AnyIPAddress } IPMask ::= SEQUENCE @@ -1833,8 +1833,8 @@ AnyIPAddress ::= ENUMERATED NextLayerProtocolOrAny ::= CHOICE { - nextLayerProtocol [1] NextLayerProtocol, - anyNextLayerProtocol [2] AnyNextLayerProtocol + nextLayerProtocol [1] NextLayerProtocol, + anyNextLayerProtocol [2] AnyNextLayerProtocol } AnyNextLayerProtocol ::= ENUMERATED @@ -3492,21 +3492,21 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -4117,7 +4117,7 @@ FiveGSSubscriberID ::= CHOICE FiveGSSubscriberIDs ::= SEQUENCE { - fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID + fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID } FiveGMMCause ::= INTEGER (0..255) @@ -4424,9 +4424,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index a0b20923..847d912d 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,251 +1,246 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 96f3da73..84c666b5 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,50 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 5f29b559..52fdfabd 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,363 +1,359 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml index a1c77b9f..40659ede 100644 --- a/33128/r18/TS33128Dictionaries.xml +++ b/33128/r18/TS33128Dictionaries.xml @@ -1,95 +1,95 @@ - - 3GPP - ServiceType - - - Voice - Service scoping shall include the Voice service type as defined in clause 4.4.2 - - - Data - Service scoping shall include the Data service type as defined in clause 4.4.2 - - - Messaging - Service scoping shall include the Messaging service type as defined in clause 4.4.2 - - - PTC - Service scoping shall include the Push-to-Talk service type as defined in clause 4.4.2 - - - LALS - Service scoping shall include the LALS service type as defined in clause 4.4.2 - - - RCS - Service scoping shall include the RCS service type as defined in clause 4.4.2 - + + 3GPP + ServiceType + + + Voice + Service scoping shall include the Voice service type as defined in clause 4.4.2 + + + Data + Service scoping shall include the Data service type as defined in clause 4.4.2 + + + Messaging + Service scoping shall include the Messaging service type as defined in clause 4.4.2 + + + PTC + Service scoping shall include the Push-to-Talk service type as defined in clause 4.4.2 + + + LALS + Service scoping shall include the LALS service type as defined in clause 4.4.2 + + + RCS + Service scoping shall include the RCS service type as defined in clause 4.4.2 + - - 3GPP - LATaskFlag - - - HILADelivery - The location information shall be delivered via the LI_HILA interface. - - - HI2Delivery - The location information shall be delivered via the LI_HI2 interface. - + + 3GPP + LATaskFlag + + + HILADelivery + The location information shall be delivered via the LI_HILA interface. + + + HI2Delivery + The location information shall be delivered via the LI_HI2 interface. + - - 3GPP - RequestType - - - IdentityAssociation - A request for a single IdentityResponseDetails response to the query provided. - - - OngoingIdentityAssociation - A request for location information of the target, consisting at least of the TAI and the NCGI. - + + 3GPP + RequestType + + + IdentityAssociation + A request for a single IdentityResponseDetails response to the query provided. + + + OngoingIdentityAssociation + A request for location information of the target, consisting at least of the TAI and the NCGI. + - LocationAcquisition - A request for an ongoing series of IdentityResponseDetails responses matching the query provided. - + LocationAcquisition + A request for an ongoing series of IdentityResponseDetails responses matching the query provided. + - - 3GPP - LIHIQRFlags - - - IncludeNCGIInResponse - A request for returning the NCGI in the response. - + + 3GPP + LIHIQRFlags + + + IncludeNCGIInResponse + A request for returning the NCGI in the response. + - - 3GPP - LIHILAFlags - - - ReqCurrentLoc - Indicates whether the current location of the UE is requested. - + + 3GPP + LIHILAFlags + + + ReqCurrentLoc + Indicates whether the current location of the UE is requested. + - - 3GPP - ManifestSpecification - - - LIHIQRResponse - The delivery contains IdentityResponseDetails (see Annex E). - + + 3GPP + ManifestSpecification + + + LIHIQRResponse + The delivery contains IdentityResponseDetails (see Annex E). + diff --git a/33128/r18/TS33128IdentityAssociation.asn b/33128/r18/TS33128IdentityAssociation.asn index 707aaa27..72d66c5e 100644 --- a/33128/r18/TS33128IdentityAssociation.asn +++ b/33128/r18/TS33128IdentityAssociation.asn @@ -104,4 +104,4 @@ GPSI ::= CHOICE MSISDN ::= NumericString (SIZE(1..15)) -END \ No newline at end of file +END diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5684a1a0..38fa6cc1 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1187,14 +1187,14 @@ UAProtocolID ::= OCTET STRING (SIZE(5)) AKMAAFID ::= SEQUENCE { - aFFQDN [1] FQDN, - uaProtocolID [2] UAProtocolID + aFFQDN [1] FQDN, + uaProtocolID [2] UAProtocolID } UAStarParams ::= CHOICE { - tls12 [1] TLS12UAStarParams, - generic [2] GenericUAStarParams + tls12 [1] TLS12UAStarParams, + generic [2] GenericUAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1216,38 +1216,38 @@ TLSCipherType ::= ENUMERATED TLSCompressionAlgorithm ::= ENUMERATED { - null(1), - deflate(2) + null(1), + deflate(2) } TLSPRFAlgorithm ::= ENUMERATED { - rfc5246(1) + rfc5246(1) } TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(48)), - pRFAlgorithm [3] TLSPRFAlgorithm, - cipherSuite [4] TLSCipherSuite, - cipherType [5] TLSCipherType, - encKeyLength [6] INTEGER (0..255), - blockLength [7] INTEGER (0..255), - fixedIVLength [8] INTEGER (0..255), - recordIVLength [9] INTEGER (0..255), - macLength [10] INTEGER (0..255), - macKeyLength [11] INTEGER (0..255), - compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(32)), - serverRandom [14] OCTET STRING (SIZE(32)), - clientSequenceNumber [15] INTEGER, - serverSequenceNumber [16] INTEGER, - sessionID [17] OCTET STRING (SIZE(0..32)), - tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), - tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), + pRFAlgorithm [3] TLSPRFAlgorithm, + cipherSuite [4] TLSCipherSuite, + cipherType [5] TLSCipherType, + encKeyLength [6] INTEGER (0..255), + blockLength [7] INTEGER (0..255), + fixedIVLength [8] INTEGER (0..255), + recordIVLength [9] INTEGER (0..255), + macLength [10] INTEGER (0..255), + macKeyLength [11] INTEGER (0..255), + compressionAlgorithm [12] TLSCompressionAlgorithm, + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), + clientSequenceNumber [15] INTEGER, + serverSequenceNumber [16] INTEGER, + sessionID [17] OCTET STRING (SIZE(0..32)), + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING @@ -2367,9 +2367,9 @@ FlowDescription ::= SEQUENCE IPAddressOrRangeOrAny ::= CHOICE { - iPAddress [1] IPAddress, - ipAddressRange [2] IPMask, - anyIPAddress [3] AnyIPAddress + iPAddress [1] IPAddress, + ipAddressRange [2] IPMask, + anyIPAddress [3] AnyIPAddress } IPMask ::= SEQUENCE @@ -2385,8 +2385,8 @@ AnyIPAddress ::= ENUMERATED NextLayerProtocolOrAny ::= CHOICE { - nextLayerProtocol [1] NextLayerProtocol, - anyNextLayerProtocol [2] AnyNextLayerProtocol + nextLayerProtocol [1] NextLayerProtocol, + anyNextLayerProtocol [2] AnyNextLayerProtocol } AnyNextLayerProtocol ::= ENUMERATED @@ -4096,21 +4096,20 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } - PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -4939,8 +4938,8 @@ FiveGMSAFUnsuccessfulProcedure ::= SEQUENCE -- See clause 7.15.2.8 for details of this structure FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE ::= SEQUENCE { - gPSI [1] GPSI, - serviceAccessInformationResource [2] SBIType + gPSI [1] GPSI, + serviceAccessInformationResource [2] SBIType } -- ============== @@ -5729,7 +5728,7 @@ FiveGSSubscriberID ::= CHOICE FiveGSSubscriberIDs ::= SEQUENCE { - fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID + fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID } FiveGSMRequestType ::= ENUMERATED diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index d79c3e1f..14495c81 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,121 +1,115 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index 7cea78b8..ab3ba276 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,189 +1,182 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 96f3da73..84c666b5 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,50 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index a81b59f5..f179237f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,407 +1,402 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 6e3f041d..14415107 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,89 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/asn_compile_targets.json b/testing/asn_compile_targets.json index 26ccf77c..989c81de 100644 --- a/testing/asn_compile_targets.json +++ b/testing/asn_compile_targets.json @@ -6,4 +6,4 @@ ["./33128/r17/TS33128IdentityAssociation.asn"], ["./33128/r18/TS33128Payloads.asn"], ["./33128/r18/TS33128IdentityAssociation.asn"] -] \ No newline at end of file +] diff --git a/testing/asn_ignore.txt b/testing/asn_ignore.txt index 70aa0c5b..8c2bf332 100644 --- a/testing/asn_ignore.txt +++ b/testing/asn_ignore.txt @@ -1 +1 @@ -33108 \ No newline at end of file +33108 diff --git a/testing/asn_ignore_lint.txt b/testing/asn_ignore_lint.txt index 03e7f54e..800285ea 100644 --- a/testing/asn_ignore_lint.txt +++ b/testing/asn_ignore_lint.txt @@ -1 +1 @@ -dependencies \ No newline at end of file +dependencies diff --git a/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd b/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd index 1bdcb981..f35c8a3b 100644 --- a/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd +++ b/testing/dependencies/xsd/TS_103_221_01_DestinationSet.xsd @@ -1,40 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd b/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd index f5e735d2..85a303f5 100644 --- a/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd +++ b/testing/dependencies/xsd/TS_103_221_01_HashedID.xsd @@ -1,35 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/TS_103_280_v020401.xsd b/testing/dependencies/xsd/TS_103_280_v020401.xsd index 3ff4ae13..2c2c2b61 100644 --- a/testing/dependencies/xsd/TS_103_280_v020401.xsd +++ b/testing/dependencies/xsd/TS_103_280_v020401.xsd @@ -220,7 +220,7 @@ - + diff --git a/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd index abaf3235..aa073830 100644 --- a/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd +++ b/testing/dependencies/xsd/ts_103120v011102p0_Common.xsd @@ -1,76 +1,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/lint_xml.py b/testing/lint_xml.py new file mode 100644 index 00000000..b7bcf885 --- /dev/null +++ b/testing/lint_xml.py @@ -0,0 +1,49 @@ +from pathlib import Path +from difflib import * +import subprocess + +def lint(file : Path): + completed = subprocess.run(["xmllint", str(file)], capture_output=True, text=True) + + if completed.returncode != 0: + print (f" {str(f)}: FAIL") + print (f" xmlint error code {completed.returncode}") + lines = completed.stderr.splitlines() + for line in lines: + print (f" {line}") + return len(lines) + + linted_xml = completed.stdout + orig_xml = file.read_text() + diff = list(unified_diff(orig_xml.splitlines(), linted_xml.splitlines())) + + if len(diff) == 0: + print (f" {str(f)}: OK") + return 0 + else: + print (f" {str(f)}: {len(diff)} linting errors") + for d in diff: + print("".join(d)) + return len(diff) + + + +if __name__ == "__main__": + root = Path("./") + + files = list(root.rglob("*.xml")) + list(root.rglob("*.xsd")) + + files_with_errors = 0 + errors = 0 + + print ("-------------------------------------------------") + print (f"Linting XML / XSD files...") + + for f in files: + new_errors = lint (f) + errors += new_errors + files_with_errors += 1 if new_errors > 0 else 0 + + print ("-------------------------------------------------") + print (f"Files: {len(files)} ({files_with_errors} with errors) Total errors: {errors}") + print ("-------------------------------------------------") -- GitLab From db98cb022dcbe8d2a08ae64fc86a6610a7810292 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 14 Dec 2023 16:21:46 +0000 Subject: [PATCH 04/51] Fixing XML file --- 33128/r18/TS33128Dictionaries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml index 40659ede..c2e89ca6 100644 --- a/33128/r18/TS33128Dictionaries.xml +++ b/33128/r18/TS33128Dictionaries.xml @@ -92,5 +92,5 @@ - + -- GitLab From 40873caed906cfc7113aaffc283c17c4afee8850 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:16:58 +0000 Subject: [PATCH 05/51] Removing extra line breaks and spaces from R18 dictionary --- 33128/r18/TS33128Dictionaries.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml index c2e89ca6..948c9e5d 100644 --- a/33128/r18/TS33128Dictionaries.xml +++ b/33128/r18/TS33128Dictionaries.xml @@ -1,4 +1,4 @@ - + 3GPP @@ -93,4 +93,3 @@ - -- GitLab From 1ed3fa233fddbdf8df052b5069e5aa9b58d70818 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:21:59 +0000 Subject: [PATCH 06/51] Adding return code --- testing/lint_xml.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testing/lint_xml.py b/testing/lint_xml.py index b7bcf885..79037aac 100644 --- a/testing/lint_xml.py +++ b/testing/lint_xml.py @@ -47,3 +47,8 @@ if __name__ == "__main__": print ("-------------------------------------------------") print (f"Files: {len(files)} ({files_with_errors} with errors) Total errors: {errors}") print ("-------------------------------------------------") + + if (files_with_errors > 0): + exit(-1) + else: + exit(0) \ No newline at end of file -- GitLab From 099219c41b3f6823bfc4b470d5d7317f76435dea Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:23:13 +0000 Subject: [PATCH 07/51] Just seeing if linting works in CI/CD --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acf61b68..0889519d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,7 @@ process_xsd: interruptible: true script: - python3 testing/xsd_process.py + - python3 testing/lint_xml.py generate_artefacts: image: "forge.3gpp.org:5050/sa3/li/forgelib" -- GitLab From 0c92f0c1fe432d3dc8a6b4a6c76c7712f7b0f82b Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:36:28 +0000 Subject: [PATCH 08/51] Changing to test docker image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0889519d..b884ee1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ process_asn: - python3 testing/asn_process.py process_xsd: - image: "forge.3gpp.org:5050/sa3/li/xsdtest:latest" + image: "forge.3gpp.org:5050/sa3/li/forgelib_test:latest" stage: check interruptible: true script: -- GitLab From fef11d14191f60bfd8e04254f41b55c0ae7c0250 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:43:39 +0000 Subject: [PATCH 09/51] Trying new docker --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b884ee1c..4be2e941 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ process_asn: - python3 testing/asn_process.py process_xsd: - image: "forge.3gpp.org:5050/sa3/li/forgelib_test:latest" + image: "forge.3gpp.org:5050/sa3/li/xsdtest_test:latest" stage: check interruptible: true script: -- GitLab From 00ecd56e78b2eb9d38f1135ea6710e8cac5d8452 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:45:26 +0000 Subject: [PATCH 10/51] Introducing an XML linting error... --- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 14495c81..6fbe389c 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -25,7 +25,7 @@ - + -- GitLab From 212b21af966c52aa27d29a963ed656435ff7fc5a Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:46:50 +0000 Subject: [PATCH 11/51] Fixing linting error again --- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 6fbe389c..14495c81 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -25,7 +25,7 @@ - + -- GitLab From 3b9d0623727db3df14605f6518281a9cdfd53c8b Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 12:59:03 +0000 Subject: [PATCH 12/51] Adding ec checking --- .ecrc | 6 ++++++ .gitlab-ci.yml | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100644 .ecrc diff --git a/.ecrc b/.ecrc new file mode 100644 index 00000000..4700c222 --- /dev/null +++ b/.ecrc @@ -0,0 +1,6 @@ +{ + "Exclude" : [ + "33108", + "\\.py" + ] +} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4be2e941..56c28f47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,14 @@ process_xsd: - python3 testing/xsd_process.py - python3 testing/lint_xml.py +editorconfig_check: + image: "forge.3gpp.org:5050/sa3/li/ec_test:latest" + stage: check + interruptible: true + script: + - ec + + generate_artefacts: image: "forge.3gpp.org:5050/sa3/li/forgelib" stage: build -- GitLab From 5ce8a62f815c032e9c8353a0e2dd623cf3a35f5f Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 13:09:32 +0000 Subject: [PATCH 13/51] Updating ec excludes --- .ecrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ecrc b/.ecrc index 4700c222..4f8a6be9 100644 --- a/.ecrc +++ b/.ecrc @@ -1,6 +1,7 @@ { "Exclude" : [ - "33108", - "\\.py" + ".git", + "\\.py", + "33108" ] } -- GitLab From a7df016a9e8d700a38baa8308b23698d45275187 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 13:14:13 +0000 Subject: [PATCH 14/51] Checking ec fails --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 14415107..c462d8fe 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -79,4 +79,4 @@ - + \ No newline at end of file -- GitLab From 8e47e471f0f9e9d2ae13913835f86b0ee2cda342 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 17 Jan 2024 13:20:12 +0000 Subject: [PATCH 15/51] Fixing ec newline --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index c462d8fe..14415107 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -79,4 +79,4 @@ - \ No newline at end of file + -- GitLab From 4e56a57761d96c40546dae2a5e5e32eaafecbbe0 Mon Sep 17 00:00:00 2001 From: hawbakert Date: Thu, 18 Jan 2024 16:56:15 +0000 Subject: [PATCH 16/51] Addition of ProSe UDM Reporting --- 33128/r18/TS33128Payloads.asn | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5684a1a0..6028a8ca 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -251,7 +251,11 @@ XIRIEvent ::= CHOICE ePSRANHandoverCommand [148] EPSRANHandoverCommand, ePSRANHandoverRequest [149] EPSRANHandoverRequest, mMERANTraceReport [150] MMERANTraceReport, - mMEUEServiceAccept [151] MMEUEServiceAccept + mMEUEServiceAccept [151] MMEUEServiceAccept, + + -- UDM events, see clause 7.2.2.3, continued from tag 124 + uDMProSeTargetIdentifierDeconcealment [152] UDMProSeTargetIdentifierDeconcealment, + uDMProSeTargetAuthentication [153] UDMProSeTargetAuthentication } -- ============== @@ -495,7 +499,12 @@ IRIEvent ::= CHOICE ePSRANHandoverCommand [148] EPSRANHandoverCommand, ePSRANHandoverRequest [149] EPSRANHandoverRequest, mMERANTraceReport [150] MMERANTraceReport, - mMEUEServiceAccept [151] MMEUEServiceAccept + mMEUEServiceAccept [151] MMEUEServiceAccept, + + -- UDM events, see clause 7.2.2.3, continued from tag 124 + uDMProSeTargetIdentifierDeconcealment [152] UDMProSeTargetIdentifierDeconcealment, + uDMProSeTargetAuthentication [153] UDMProSeTargetAuthentication +} } IRITargetIdentifier ::= SEQUENCE @@ -2916,6 +2925,20 @@ UDMStartOfInterceptionWithRegisteredTarget ::= SEQUENCE uDMSubscriptionDataSets [3] SBIType } +UDMProSeTargetAuthentication ::= SEQUENCE +{ + sUPI [1] SUPI, + sUCI [2] SUCI +} + +UDMProSeTargetAuthentication ::= SEQUENCE +{ + servingNetworkName [1] STRING, + relayServiceCode [2] INTEGER, + authenticationType [3] PrimaryAuthenticationType, + sUPI [4] SUPI +} + ServerAddressingInfoList ::= SEQUENCE (SIZE(1..MAX)) OF ServerAddressingInfo ServerAddressingInfo ::= SEQUENCE -- GitLab From 975a634454906d3e6841079375b2a1f2e2ea70b1 Mon Sep 17 00:00:00 2001 From: hawbakert Date: Thu, 18 Jan 2024 16:58:45 +0000 Subject: [PATCH 17/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 1 - 1 file changed, 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 6028a8ca..81455159 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -505,7 +505,6 @@ IRIEvent ::= CHOICE uDMProSeTargetIdentifierDeconcealment [152] UDMProSeTargetIdentifierDeconcealment, uDMProSeTargetAuthentication [153] UDMProSeTargetAuthentication } -} IRITargetIdentifier ::= SEQUENCE { -- GitLab From 1905d9004ff543aeecbd89a09716ca785a43f675 Mon Sep 17 00:00:00 2001 From: hawbakert Date: Thu, 18 Jan 2024 17:03:08 +0000 Subject: [PATCH 18/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 81455159..db6b143d 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -2932,7 +2932,7 @@ UDMProSeTargetAuthentication ::= SEQUENCE UDMProSeTargetAuthentication ::= SEQUENCE { - servingNetworkName [1] STRING, + servingNetworkName [1] UTF8String, relayServiceCode [2] INTEGER, authenticationType [3] PrimaryAuthenticationType, sUPI [4] SUPI -- GitLab From 12ed3faa53e9c47fb3375b74245ecb61f39302ab Mon Sep 17 00:00:00 2001 From: hawbakert Date: Thu, 18 Jan 2024 17:05:23 +0000 Subject: [PATCH 19/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index db6b143d..e72d4e4b 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -2924,7 +2924,7 @@ UDMStartOfInterceptionWithRegisteredTarget ::= SEQUENCE uDMSubscriptionDataSets [3] SBIType } -UDMProSeTargetAuthentication ::= SEQUENCE +UDMProSeTargetIdentifierDeconcealment ::= SEQUENCE { sUPI [1] SUPI, sUCI [2] SUCI -- GitLab From f3b204d18dd8e91edb7799dfa2df78cf8f40d739 Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 21 Jan 2024 00:29:54 +0000 Subject: [PATCH 20/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 144 +++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5684a1a0..291a142e 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -251,7 +251,14 @@ XIRIEvent ::= CHOICE ePSRANHandoverCommand [148] EPSRANHandoverCommand, ePSRANHandoverRequest [149] EPSRANHandoverRequest, mMERANTraceReport [150] MMERANTraceReport, - mMEUEServiceAccept [151] MMEUEServiceAccept + mMEUEServiceAccept [151] MMEUEServiceAccept, + + --NWDAF events, see clause 7.X.2 + nWDAFEventsSubscription [152] NWDAFEventsSubscription, + nWDAFEventNotification [153] NWDAFEventNotification, + nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, + nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription, + nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification } -- ============== @@ -495,7 +502,14 @@ IRIEvent ::= CHOICE ePSRANHandoverCommand [148] EPSRANHandoverCommand, ePSRANHandoverRequest [149] EPSRANHandoverRequest, mMERANTraceReport [150] MMERANTraceReport, - mMEUEServiceAccept [151] MMEUEServiceAccept + mMEUEServiceAccept [151] MMEUEServiceAccept, + + --NWDAF events, see clause 7.X.3 + nWDAFEventsSubscription [152] NWDAFEventsSubscription, + nWDAFEventNotification [153] NWDAFEventNotification, + nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, + nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription, + nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification } IRITargetIdentifier ::= SEQUENCE @@ -4994,6 +5008,132 @@ FiveGMSAFErrorCode ::=ENUMERATED unsupportedMediaType415(4) } +-- ================= +-- NWDAF definitions +-- ================= + +NWDAFEventsSubscription ::=SEQUENCE +{ + sUPI [1] SUPI, + nWDAFConsumerNFType [2] NWDAFConsumerNFType, + nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, + nWDAFSubscribedEventList [4] SET OF NWDAFEvent OPTIONAL, + nWDAFEventsSubscription [5] SBIType OPTIONAL, + nWDAFEventsSubscriptionID [6] UTF8String, + nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode +} + +NWDAFEventNotification ::=SEQUENCE +{ + sUPI [1] SUPI, + nWDAFNotifiedEvent [2] NWDAFEvent, + nWDAFEventNotification [3] SBIType, + nWDAFEventsSubscriptionID [4] UTF8String +} + +NWDAFAnalyticsInfoRequestResponse ::=SEQUENCE +{ + sUPI [1] SUPI, + nWDAFEvent [2] NWDAFEvent, + nWDAFEventReportingRequirement [3] SBIType OPTIONAL, + nWDAFEventFilter [4] SBIType OPTIONAL, + nWDAFAnalyticsData [5] SBIType OPTIONAL, + nWDAFAnalyticsInfoResponseCode [6] NWDAFAnalyticsInfoResponseCode +} + +NWDAFRoamingAnalyticsSubscription ::=SEQUENCE +{ + sUPI [1] SUPI, + pLMNID [2] PLMNID, + nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, + nWDAFSubscribedEventList [4] SET OF NWDAFEvent OPTIONAL, + nWDAFEventsSubscription [5] SBIType OPTIONAL, + nWDAFEventsSubscriptionID [6] UTF8String, + nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode +} + +NWDAFRoamingAnalyticsNotification ::=SEQUENCE +{ + sUPI [1] SUPI, + nWDAFNotifiedEvent [2] NWDAFEvent, + nWDAFEventNotification [3] SBIType, + nWDAFEventsSubscriptionID [4] UTF8String +} + +-- ============== +-- NWDAF parameters +-- ============== + +NWDAFEventsSubscriptionOpType ::= ENUMERATED +{ + pOST(1), + pUT(2), + dELETE(3) +} + +NWDAFEventsSubscriptionResponseCode ::= ENUMERATED +{ + oK200(1), + created201(2), + noContent204(3), + temporaryRedirect307(4), + permanentRedirect308(5), + badRequest400(6), + unauthorized401(7), + forbidden403(8), + notFound404(9), + notAcceptable406(10), + lengthRequired411(11), + payloadTooLarge413(12), + unsupportedMediaType415(13), + tooManyRequests429(14), + internalServerError500(15), + notImplemented501(16), + badGateway502(17), + serviceUnavailable503(18) +} + +NWDAFAnalyticsInfoResponseCode ::= ENUMERATED +{ + oK200(1), + noContent204(2), + badRequest400(3), + unauthorized401(4), + forbidden403(5), + notFound404(6), + notAcceptable406(7), + uRITooLong414(8), + tooManyRequests429(9), + internalServerError500(10), + badGateway502(11), + serviceUnavailable503(12) +} + +NWDAFConsumerNFType ::= ENUMERATED +{ + pCF(1), + nSSF(2), + aMF(3), + sMF(4), + nEF(5), + aF(6), + lMF(7), + oAM(8), + nWDAF(9), + dCCF(10), + cEF(11) +} + +NWDAFEvent ::= ENUMERATED +{ + serviceExperience(1), + uEMobility(2), + uEComm(3), + abnormalBehaviour(4), + dispersion(5), + relativeProximity(6), + pDUSessionTraffic(7) +} -- =================== -- 5G LALS definitions -- GitLab From 7f6e9cc83c72e19477d402137a52d69c3e87e062 Mon Sep 17 00:00:00 2001 From: znaty Date: Sun, 21 Jan 2024 00:34:01 +0000 Subject: [PATCH 21/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 291a142e..9d589c7d 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5031,7 +5031,7 @@ NWDAFEventNotification ::=SEQUENCE nWDAFEventsSubscriptionID [4] UTF8String } -NWDAFAnalyticsInfoRequestResponse ::=SEQUENCE +NWDAFAnalyticsInfoQuery ::=SEQUENCE { sUPI [1] SUPI, nWDAFEvent [2] NWDAFEvent, -- GitLab From 60e80a36a414fe7ddac44aca4bffe70756d4f2dd Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 22 Jan 2024 22:24:11 +0000 Subject: [PATCH 22/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 47 +++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5684a1a0..949484df 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -251,7 +251,11 @@ XIRIEvent ::= CHOICE ePSRANHandoverCommand [148] EPSRANHandoverCommand, ePSRANHandoverRequest [149] EPSRANHandoverRequest, mMERANTraceReport [150] MMERANTraceReport, - mMEUEServiceAccept [151] MMEUEServiceAccept + mMEUEServiceAccept [151] MMEUEServiceAccept, + + -- RCS events, see clause 7.13.3, continued from tag 145 + startOfInterceptForRegisteredRCSUser [152] StartOfInterceptForRegisteredRCSUser, + startOfInterceptWithEstablisedRCSSession [153] StartOfInterceptWithEstablisedRCSSession } -- ============== @@ -495,7 +499,11 @@ IRIEvent ::= CHOICE ePSRANHandoverCommand [148] EPSRANHandoverCommand, ePSRANHandoverRequest [149] EPSRANHandoverRequest, mMERANTraceReport [150] MMERANTraceReport, - mMEUEServiceAccept [151] MMEUEServiceAccept + mMEUEServiceAccept [151] MMEUEServiceAccept, + + -- RCS events, see clause 7.13.3, continued from tag 145 + startOfInterceptForRegisteredRCSUser [152] StartOfInterceptForRegisteredRCSUser, + startOfInterceptWithEstablisedRCSSession [153] StartOfInterceptWithEstablisedRCSSession } IRITargetIdentifier ::= SEQUENCE @@ -4441,6 +4449,28 @@ RCSCapabilityDiscovery ::= SEQUENCE location [5] Location OPTIONAL } +-- See clause 7.13.3.6.1.2 for details of this structure +StartOfInterceptForRegisteredRCSUser ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + rCSRegistrationInformation [2] SEQUENCE SIZE (1..MAX) OF RCSRegistrationInformation, + userOnline [3] BOOLEAN, + location [4] Location OPTIONAL +} + +-- See clause 7.13.3.6.1.3 for details of this structure +StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE +{ + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + participants [2] SEQUENCE SIZE (1..MAX) OF RCSDestinations, + conversationID [3] RCSConversationID, + contributionID [4] RCSContributionID, + inReplyToContributionID [5] RCSContributionID OPTIONAL, + sessionReplaces [6] RCSContributionID OPTIONAL, + rCSSessionType [7] RCSSessionType, + rCSSessionEndpoints [8] RCSSessionEndpoints, + location [9] Location OPTIONAL +} -- ============== -- RCS Parameters @@ -4473,6 +4503,13 @@ RCSMessageType ::= ENUMERATED iMDNNotification(4) } +RCSRegistrationInformation ::= CHOICE +{ + sIPRegistration [1] RCSSIPRegistrationExchange, + userProfile [2] XMLType, + presenceDocument [3] XMLType +} + RCSRegistrationType ::= ENUMERATED { registration(1), @@ -4502,6 +4539,12 @@ RCSSessionType ::= ENUMERATED oneTo1Chat(2) } +RCSSIPRegistrationExchange ::= SEQUENCE +{ + rCSRegistrationUpdateRequest [1] IMSPayload, + rCSRegistrationUpdateResponse [2] IMSPayload +} + RCSSIPSessionMessage ::= SEQUENCE { sessionLeg [1] RCSSessionLeg, -- GitLab From 0589010a1d2d99d129fb78a6982a33a97e47ae9d Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 22 Jan 2024 22:33:51 +0000 Subject: [PATCH 23/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 949484df..14f5e1b9 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4469,7 +4469,8 @@ StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE sessionReplaces [6] RCSContributionID OPTIONAL, rCSSessionType [7] RCSSessionType, rCSSessionEndpoints [8] RCSSessionEndpoints, - location [9] Location OPTIONAL + rCSSessionLegs [9] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange, + location [10] Location OPTIONAL } -- ============== @@ -4545,6 +4546,13 @@ RCSSIPRegistrationExchange ::= SEQUENCE rCSRegistrationUpdateResponse [2] IMSPayload } +RCSSIPSessionExchange ::= SEQUENCE +{ + sessionLeg [1] RCSSessionLeg, + sIPRequest [2] IMSPayload, + sIPResponse [3] IMSPayload +} + RCSSIPSessionMessage ::= SEQUENCE { sessionLeg [1] RCSSessionLeg, -- GitLab From acaf043488c29cd0f1a6039115f951608c7dab4c Mon Sep 17 00:00:00 2001 From: znaty Date: Mon, 29 Jan 2024 20:55:54 +0000 Subject: [PATCH 24/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 9d589c7d..8d0c773a 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5019,7 +5019,7 @@ NWDAFEventsSubscription ::=SEQUENCE nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, nWDAFSubscribedEventList [4] SET OF NWDAFEvent OPTIONAL, nWDAFEventsSubscription [5] SBIType OPTIONAL, - nWDAFEventsSubscriptionID [6] UTF8String, + nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode } @@ -5027,8 +5027,7 @@ NWDAFEventNotification ::=SEQUENCE { sUPI [1] SUPI, nWDAFNotifiedEvent [2] NWDAFEvent, - nWDAFEventNotification [3] SBIType, - nWDAFEventsSubscriptionID [4] UTF8String + nWDAFEventNotification [3] SBIType } NWDAFAnalyticsInfoQuery ::=SEQUENCE @@ -5048,7 +5047,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, nWDAFSubscribedEventList [4] SET OF NWDAFEvent OPTIONAL, nWDAFEventsSubscription [5] SBIType OPTIONAL, - nWDAFEventsSubscriptionID [6] UTF8String, + nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode } @@ -5056,8 +5055,7 @@ NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, nWDAFNotifiedEvent [2] NWDAFEvent, - nWDAFEventNotification [3] SBIType, - nWDAFEventsSubscriptionID [4] UTF8String + nWDAFEventNotification [3] SBIType } -- ============== -- GitLab From e90bc4c9d29148059895ea7c217e47474c109319 Mon Sep 17 00:00:00 2001 From: znaty Date: Tue, 30 Jan 2024 23:03:21 +0000 Subject: [PATCH 25/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 8d0c773a..537b06dd 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -255,7 +255,7 @@ XIRIEvent ::= CHOICE --NWDAF events, see clause 7.X.2 nWDAFEventsSubscription [152] NWDAFEventsSubscription, - nWDAFEventNotification [153] NWDAFEventNotification, + nWDAFEventsNotification [153] NWDAFEventNotification, nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription, nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification @@ -506,7 +506,7 @@ IRIEvent ::= CHOICE --NWDAF events, see clause 7.X.3 nWDAFEventsSubscription [152] NWDAFEventsSubscription, - nWDAFEventNotification [153] NWDAFEventNotification, + nWDAFEventsNotification [153] NWDAFEventNotification, nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription, nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification @@ -5023,11 +5023,11 @@ NWDAFEventsSubscription ::=SEQUENCE nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode } -NWDAFEventNotification ::=SEQUENCE +NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEvent [2] NWDAFEvent, - nWDAFEventNotification [3] SBIType + nWDAFNotifiedEventList [2] SET OF NWDAFEvent, + nWDAFEventsNotification [3] SBIType } NWDAFAnalyticsInfoQuery ::=SEQUENCE @@ -5053,9 +5053,9 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { - sUPI [1] SUPI, - nWDAFNotifiedEvent [2] NWDAFEvent, - nWDAFEventNotification [3] SBIType + sUPI [1] SUPI, + nWDAFNotifiedEventList [2] SET OF NWDAFEvent, + nWDAFEventsNotification [3] SBIType } -- ============== -- GitLab From 3688781eb3416c10417fdb2f5ff892cd5a8d6e3b Mon Sep 17 00:00:00 2001 From: znaty Date: Tue, 30 Jan 2024 23:05:07 +0000 Subject: [PATCH 26/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 537b06dd..cef5f452 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -255,7 +255,7 @@ XIRIEvent ::= CHOICE --NWDAF events, see clause 7.X.2 nWDAFEventsSubscription [152] NWDAFEventsSubscription, - nWDAFEventsNotification [153] NWDAFEventNotification, + nWDAFEventsNotification [153] NWDAFEventsNotification, nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription, nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification @@ -506,7 +506,7 @@ IRIEvent ::= CHOICE --NWDAF events, see clause 7.X.3 nWDAFEventsSubscription [152] NWDAFEventsSubscription, - nWDAFEventsNotification [153] NWDAFEventNotification, + nWDAFEventsNotification [153] NWDAFEventsNotification, nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, nWDAFRoamingAnalyticsSubscription [155] NWDAFRoamingAnalyticsSubscription, nWDAFRoamingAnalyticsNotification [156] NWDAFRoamingAnalyticsNotification -- GitLab From ce6b94ff4a2ab351b4c09dfa9e7f9cb27c9113db Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 31 Jan 2024 13:12:31 +0000 Subject: [PATCH 27/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 37 +++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 14f5e1b9..8acf46a8 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4455,28 +4455,36 @@ StartOfInterceptForRegisteredRCSUser ::= SEQUENCE rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, rCSRegistrationInformation [2] SEQUENCE SIZE (1..MAX) OF RCSRegistrationInformation, userOnline [3] BOOLEAN, - location [4] Location OPTIONAL + location [4] Location OPTIONAL, + additionalInstanceLocation [5] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation } -- See clause 7.13.3.6.1.3 for details of this structure StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE { - rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, - participants [2] SEQUENCE SIZE (1..MAX) OF RCSDestinations, - conversationID [3] RCSConversationID, - contributionID [4] RCSContributionID, - inReplyToContributionID [5] RCSContributionID OPTIONAL, - sessionReplaces [6] RCSContributionID OPTIONAL, - rCSSessionType [7] RCSSessionType, - rCSSessionEndpoints [8] RCSSessionEndpoints, - rCSSessionLegs [9] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange, - location [10] Location OPTIONAL + rCSTargetIdentities [1] SEQUENCE SIZE (1..MAX) OF RCSIdentity, + participants [2] SEQUENCE SIZE (1..MAX) OF RCSDestinations, + conversationID [3] RCSConversationID, + contributionID [4] RCSContributionID, + inReplyToContributionID [5] RCSContributionID OPTIONAL, + sessionReplaces [6] RCSContributionID OPTIONAL, + rCSSessionType [7] RCSSessionType, + rCSSessionEndpoints [8] RCSSessionEndpoints, + rCSSessionLegs [9] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange, + location [10] Location OPTIONAL, + additionalInstanceLocation [11] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation } -- ============== -- RCS Parameters -- ============== +AdditionalInstanceLocation ::= SEQUENCE +{ + instance [1] SIPEndpoint, + location [2] Location +} + IMDNMessageID ::= UTF8String RCSConversationID ::= UUID @@ -4508,7 +4516,8 @@ RCSRegistrationInformation ::= CHOICE { sIPRegistration [1] RCSSIPRegistrationExchange, userProfile [2] XMLType, - presenceDocument [3] XMLType + multiDevice [3] XMLType, + presenceDocument [4] XMLType } RCSRegistrationType ::= ENUMERATED @@ -4524,7 +4533,7 @@ RCSServerURI ::= UTF8String RCSSessionEndpoints ::= ENUMERATED { remoteOnly(1), - locatlOnly(2), + localOnly(2), localAndRemote(3) } @@ -4570,6 +4579,8 @@ RCSSessionResult ::= ENUMERATED legRemovalComplete(6) } +SIPEndpoint ::= UTF8String + -- ================= -- EES definitions -- ================= -- GitLab From 33d9f5126d05aa99111b6524127fc190f9abb414 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 31 Jan 2024 14:14:59 +0000 Subject: [PATCH 28/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 8acf46a8..e3569be2 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4466,13 +4466,12 @@ StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE participants [2] SEQUENCE SIZE (1..MAX) OF RCSDestinations, conversationID [3] RCSConversationID, contributionID [4] RCSContributionID, - inReplyToContributionID [5] RCSContributionID OPTIONAL, - sessionReplaces [6] RCSContributionID OPTIONAL, - rCSSessionType [7] RCSSessionType, - rCSSessionEndpoints [8] RCSSessionEndpoints, - rCSSessionLegs [9] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange, - location [10] Location OPTIONAL, - additionalInstanceLocation [11] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation + rCSSessionType [5] RCSSessionType, + rCSSessionEndpoints [6] RCSSessionEndpoints, + rCSSessionLegs [7] SEQUENCE SIZE (0..MAX) OF RCSSIPSessionExchange OPTIONAL, + rCSSessionInformation [8] SEQUENCE SIZE (1..MAX) OF RCSSessionContext, + location [9] Location OPTIONAL, + additionalInstanceLocation [10] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation } -- ============== @@ -4543,6 +4542,11 @@ RCSSessionLeg ::= ENUMERATED localLeg(2) } +RCSSessionContext ::= CHOICE +{ + cPMSessionInfo [1] XMLType +} + RCSSessionType ::= ENUMERATED { largeMessageStandalone(1), -- GitLab From 180cc9e29913b7f755a5fc6b063b3b7eb7d16527 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 31 Jan 2024 15:11:21 +0000 Subject: [PATCH 29/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index e3569be2..2dfeafff 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4544,7 +4544,7 @@ RCSSessionLeg ::= ENUMERATED RCSSessionContext ::= CHOICE { - cPMSessionInfo [1] XMLType + cPMSessionInfo [1] MIMEEntity } RCSSessionType ::= ENUMERATED -- GitLab From e389cb78abed8f978e28b9f03dbff8a9addc27bf Mon Sep 17 00:00:00 2001 From: znaty Date: Wed, 31 Jan 2024 16:51:59 +0000 Subject: [PATCH 30/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index cef5f452..feb085ad 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5017,8 +5017,8 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET OF NWDAFEvent OPTIONAL, - nWDAFEventsSubscription [5] SBIType OPTIONAL, + nWDAFSubscribedEventList [4] SET OF NWDAFEvent, + nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode } @@ -5045,8 +5045,8 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET OF NWDAFEvent OPTIONAL, - nWDAFEventsSubscription [5] SBIType OPTIONAL, + nWDAFSubscribedEventList [4] SET OF NWDAFEvent, + nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode } -- GitLab From c399876e49ca28b51315d08344fe3736368ed896 Mon Sep 17 00:00:00 2001 From: grahamj Date: Thu, 1 Feb 2024 11:41:14 +0000 Subject: [PATCH 31/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 2dfeafff..0b55f04a 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4468,7 +4468,7 @@ StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE contributionID [4] RCSContributionID, rCSSessionType [5] RCSSessionType, rCSSessionEndpoints [6] RCSSessionEndpoints, - rCSSessionLegs [7] SEQUENCE SIZE (0..MAX) OF RCSSIPSessionExchange OPTIONAL, + rCSSessionLegs [7] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange OPTIONAL, rCSSessionInformation [8] SEQUENCE SIZE (1..MAX) OF RCSSessionContext, location [9] Location OPTIONAL, additionalInstanceLocation [10] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation -- GitLab From 906a0d46c136499f45d47f95829c67a234d34638 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Feb 2024 12:27:27 +0000 Subject: [PATCH 32/51] Reverting pre-R18 fies --- 33128/r15/TS33128Payloads.asn | 8 +- 33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 449 +++++------ 33128/r16/TS33128IdentityAssociation.asn | 2 +- 33128/r16/TS33128Payloads.asn | 36 +- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 433 +++++------ .../r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 485 ++++++------ 33128/r17/TS33128Payloads.asn | 96 +-- .../urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 497 ++++++------ .../r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 96 +-- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 722 +++++++++--------- 11 files changed, 1474 insertions(+), 1446 deletions(-) diff --git a/33128/r15/TS33128Payloads.asn b/33128/r15/TS33128Payloads.asn index d56dadbb..59e0a073 100644 --- a/33128/r15/TS33128Payloads.asn +++ b/33128/r15/TS33128Payloads.asn @@ -800,9 +800,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } @@ -1214,8 +1214,8 @@ Point ::= SEQUENCE PointUncertaintyCircle ::= SEQUENCE { geographicalCoordinates [1] GeographicalCoordinates, - -- The uncertainty parameter has been deprecated and shall be set to 0. - -- The uncertaintySBI parameter shall be used instead. + -- The uncertainty parameter has been deprecated and shall be set to 0. + -- The uncertaintySBI parameter shall be used instead. uncertainty [2] Uncertainty, uncertaintySBI [3] UncertaintySBI OPTIONAL } diff --git a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 5e6360e0..20a5ade8 100644 --- a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,223 +1,226 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r16/TS33128IdentityAssociation.asn b/33128/r16/TS33128IdentityAssociation.asn index bf97cb47..82aca7c5 100644 --- a/33128/r16/TS33128IdentityAssociation.asn +++ b/33128/r16/TS33128IdentityAssociation.asn @@ -96,4 +96,4 @@ EUI64 ::= OCTET STRING (SIZE(8)) SUCI ::= OCTET STRING (SIZE(8..3008)) -END +END \ No newline at end of file diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 074c61c8..4f019253 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -117,7 +117,7 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification } @@ -212,8 +212,8 @@ IRIEvent ::= CHOICE pTCAccessPolicy [53] PTCAccessPolicy, -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, -- SMS-related events, continued from choice 12 sMSReport [56] SMSReport, @@ -226,8 +226,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssocation [62] AMFIdentifierAssocation, - mMEIdentifierAssocation [63] MMEIdentifierAssocation, + aMFIdentifierAssocation [62] AMFIdentifierAssocation, + mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification @@ -1845,21 +1845,21 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -1920,7 +1920,7 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, - -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number + -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, location [4] Location OPTIONAL, iMPU [5] IMPU OPTIONAL, @@ -2297,9 +2297,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 9ccd6819..99957b66 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,214 +1,219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd index e393c2f6..f07c0727 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,46 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 64fca7e8..d0939779 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,241 +1,244 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 5f6ad99c..e4dd004d 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -289,8 +289,8 @@ IRIEvent ::= CHOICE pTCAccessPolicy [53] PTCAccessPolicy, -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, -- SMS-related events, continued from choice 12 sMSReport [56] SMSReport, @@ -303,8 +303,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssociation [62] AMFIdentifierAssociation, - mMEIdentifierAssociation [63] MMEIdentifierAssociation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, @@ -1005,14 +1005,14 @@ UAProtocolID ::= OCTET STRING (SIZE(5)) AKMAAFID ::= SEQUENCE { - aFFQDN [1] FQDN, - uaProtocolID [2] UAProtocolID + aFFQDN [1] FQDN, + uaProtocolID [2] UAProtocolID } UAStarParams ::= CHOICE { - tls12 [1] TLS12UAStarParams, - generic [2] GenericUAStarParams + tls12 [1] TLS12UAStarParams, + generic [2] GenericUAStarParams } GenericUAStarParams ::= SEQUENCE @@ -1034,38 +1034,38 @@ TLSCipherType ::= ENUMERATED TLSCompressionAlgorithm ::= ENUMERATED { - null(1), - deflate(2) + null(1), + deflate(2) } TLSPRFAlgorithm ::= ENUMERATED { - rfc5246(1) + rfc5246(1) } TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { - preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(48)), - pRFAlgorithm [3] TLSPRFAlgorithm, - cipherSuite [4] TLSCipherSuite, - cipherType [5] TLSCipherType, - encKeyLength [6] INTEGER (0..255), - blockLength [7] INTEGER (0..255), - fixedIVLength [8] INTEGER (0..255), - recordIVLength [9] INTEGER (0..255), - macLength [10] INTEGER (0..255), - macKeyLength [11] INTEGER (0..255), - compressionAlgorithm [12] TLSCompressionAlgorithm, - clientRandom [13] OCTET STRING (SIZE(32)), - serverRandom [14] OCTET STRING (SIZE(32)), - clientSequenceNumber [15] INTEGER, - serverSequenceNumber [16] INTEGER, - sessionID [17] OCTET STRING (SIZE(0..32)), - tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), - tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL + preMasterSecret [1] OCTET STRING (SIZE(48)) OPTIONAL, + masterSecret [2] OCTET STRING (SIZE(48)), + pRFAlgorithm [3] TLSPRFAlgorithm, + cipherSuite [4] TLSCipherSuite, + cipherType [5] TLSCipherType, + encKeyLength [6] INTEGER (0..255), + blockLength [7] INTEGER (0..255), + fixedIVLength [8] INTEGER (0..255), + recordIVLength [9] INTEGER (0..255), + macLength [10] INTEGER (0..255), + macKeyLength [11] INTEGER (0..255), + compressionAlgorithm [12] TLSCompressionAlgorithm, + clientRandom [13] OCTET STRING (SIZE(32)), + serverRandom [14] OCTET STRING (SIZE(32)), + clientSequenceNumber [15] INTEGER, + serverSequenceNumber [16] INTEGER, + sessionID [17] OCTET STRING (SIZE(0..32)), + tLSServerExtensions [18] OCTET STRING (SIZE(0..65535)), + tLSClientExtensions [19] OCTET STRING (SIZE(0..65535)) OPTIONAL } KAF ::= OCTET STRING @@ -1815,9 +1815,9 @@ FlowDescription ::= SEQUENCE IPAddressOrRangeOrAny ::= CHOICE { - iPAddress [1] IPAddress, - ipAddressRange [2] IPMask, - anyIPAddress [3] AnyIPAddress + iPAddress [1] IPAddress, + ipAddressRange [2] IPMask, + anyIPAddress [3] AnyIPAddress } IPMask ::= SEQUENCE @@ -1833,8 +1833,8 @@ AnyIPAddress ::= ENUMERATED NextLayerProtocolOrAny ::= CHOICE { - nextLayerProtocol [1] NextLayerProtocol, - anyNextLayerProtocol [2] AnyNextLayerProtocol + nextLayerProtocol [1] NextLayerProtocol, + anyNextLayerProtocol [2] AnyNextLayerProtocol } AnyNextLayerProtocol ::= ENUMERATED @@ -3492,21 +3492,21 @@ PTCTBReasonCode ::= ENUMERATED PTCListManagementType ::= ENUMERATED { - contactListManagementAttempt(1), - groupListManagementAttempt(2), - contactListManagementResult(3), - groupListManagementResult(4), - requestUnsuccessful(5) + contactListManagementAttempt(1), + groupListManagementAttempt(2), + contactListManagementResult(3), + groupListManagementResult(4), + requestUnsuccessful(5) } PTCListManagementAction ::= ENUMERATED { - create(1), - modify(2), - retrieve(3), - delete(4), - notify(5) + create(1), + modify(2), + retrieve(3), + delete(4), + notify(5) } PTCAccessPolicyType ::= ENUMERATED @@ -4117,7 +4117,7 @@ FiveGSSubscriberID ::= CHOICE FiveGSSubscriberIDs ::= SEQUENCE { - fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID + fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID } FiveGMMCause ::= INTEGER (0..255) @@ -4424,9 +4424,9 @@ SUCI ::= SEQUENCE -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0 -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0 sUPIType [8] SUPIType OPTIONAL, - -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported + -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported -- as the MCC and MNC above - -- if the sUPIType is not '0' the mCC and mNC fields above + -- if the sUPIType is not '0' the mCC and mNC fields above -- shall be populated with '000' and ignored by the receiver. homeNetworkIdentifier [9] HomeNetworkIdentifier OPTIONAL } diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 847d912d..a0b20923 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,246 +1,251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 84c666b5..96f3da73 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,46 +1,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 52fdfabd..5f29b559 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,359 +1,363 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 526d4b10456681f6466a1f886d5f62cb0eb51cfa Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Feb 2024 12:30:41 +0000 Subject: [PATCH 33/51] Adding ec exclusions for pre-R18 --- .ecrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.ecrc b/.ecrc index 4f8a6be9..830099c0 100644 --- a/.ecrc +++ b/.ecrc @@ -2,6 +2,9 @@ "Exclude" : [ ".git", "\\.py", - "33108" + "33108", + "33128/r17", + "33128/r16", + "33128/r15" ] } -- GitLab From 0b2348783dae69ebf338a79daafddfba5c35de5f Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Feb 2024 12:32:26 +0000 Subject: [PATCH 34/51] Skipping pre-r18 files for xml linting --- testing/lint_xml.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/lint_xml.py b/testing/lint_xml.py index 79037aac..30afb0ad 100644 --- a/testing/lint_xml.py +++ b/testing/lint_xml.py @@ -31,6 +31,8 @@ def lint(file : Path): if __name__ == "__main__": root = Path("./") + print ("Skipping pre-R18 files") + root = root / "33128" / "r18" files = list(root.rglob("*.xml")) + list(root.rglob("*.xsd")) files_with_errors = 0 -- GitLab From 3757bd8122b0fd278b7454eb4bda013b04f018e8 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 1 Feb 2024 14:16:46 +0000 Subject: [PATCH 35/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index feb085ad..0477f1da 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5017,7 +5017,7 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET OF NWDAFEvent, + nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5026,7 +5026,7 @@ NWDAFEventsSubscription ::=SEQUENCE NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SET OF NWDAFEvent, + nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } @@ -5045,7 +5045,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET OF NWDAFEvent, + nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5054,7 +5054,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SET OF NWDAFEvent, + nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } -- GitLab From 3532a4cce95fecc38da4530ea3198fc2123d3c15 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 1 Feb 2024 14:37:51 +0000 Subject: [PATCH 36/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 0477f1da..2a8ec0b4 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -594,7 +594,7 @@ N9HRMessageCause ::= ENUMERATED { pDUSessionEstablished(1), pDUSessionModified(2), - pDUSessionReleased(3), + pDUSessionReleased(3),f² updatedLocationAvailable(4), sMFChanged(5), other(6), @@ -5017,7 +5017,7 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5026,7 +5026,7 @@ NWDAFEventsSubscription ::=SEQUENCE NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } @@ -5045,7 +5045,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5054,7 +5054,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } -- GitLab From bcb3dbe16b1edf7974e207d3b070cb5cf3f6ce27 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 1 Feb 2024 14:40:26 +0000 Subject: [PATCH 37/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 2a8ec0b4..25771403 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5017,7 +5017,7 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5026,7 +5026,7 @@ NWDAFEventsSubscription ::=SEQUENCE NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } @@ -5045,7 +5045,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5054,7 +5054,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SEQUENCE (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } -- GitLab From 055c81cf4d125da3943c7e49f20dc02177a9b1a0 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 1 Feb 2024 14:49:07 +0000 Subject: [PATCH 38/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 25771403..42b6e64f 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5017,7 +5017,7 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5026,7 +5026,7 @@ NWDAFEventsSubscription ::=SEQUENCE NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } @@ -5045,7 +5045,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5054,7 +5054,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } -- GitLab From 28f3d015c1dda85270e97d5866c56cff3ddb1701 Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 1 Feb 2024 15:14:54 +0000 Subject: [PATCH 39/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 42b6e64f..ccea8229 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5017,7 +5017,7 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5026,7 +5026,7 @@ NWDAFEventsSubscription ::=SEQUENCE NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } @@ -5045,7 +5045,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5054,7 +5054,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SEQUENCE SIZE (1..MAX) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } -- GitLab From 7626d8d7fc0ead800ded8e00b673bc381dfde64e Mon Sep 17 00:00:00 2001 From: znaty Date: Thu, 1 Feb 2024 15:17:38 +0000 Subject: [PATCH 40/51] Update 33128/r18/TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index ccea8229..25771403 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -5017,7 +5017,7 @@ NWDAFEventsSubscription ::=SEQUENCE sUPI [1] SUPI, nWDAFConsumerNFType [2] NWDAFConsumerNFType, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5026,7 +5026,7 @@ NWDAFEventsSubscription ::=SEQUENCE NWDAFEventsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } @@ -5045,7 +5045,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE sUPI [1] SUPI, pLMNID [2] PLMNID, nWDAFEventsSubscriptionOpType [3] NWDAFEventsSubscriptionOpType, - nWDAFSubscribedEventList [4] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFSubscribedEventList [4] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsSubscription [5] SBIType, nWDAFEventsSubscriptionID [6] UTF8String OPTIONAL, nWDAFEventsSubscriptionResponseCode [7] NWDAFEventsSubscriptionResponseCode @@ -5054,7 +5054,7 @@ NWDAFRoamingAnalyticsSubscription ::=SEQUENCE NWDAFRoamingAnalyticsNotification ::=SEQUENCE { sUPI [1] SUPI, - nWDAFNotifiedEventList [2] SET (SIZE(1..MAX)) OF NWDAFEvent, + nWDAFNotifiedEventList [2] SEQUENCE SIZE(1..MAX) OF NWDAFEvent, nWDAFEventsNotification [3] SBIType } -- GitLab From ef6999b74cd996be7fa1450fdc5e00d3775b5099 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Feb 2024 15:18:59 +0000 Subject: [PATCH 41/51] Removing weird extra character --- 33128/r18/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 42b6e64f..75a16d31 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -594,7 +594,7 @@ N9HRMessageCause ::= ENUMERATED { pDUSessionEstablished(1), pDUSessionModified(2), - pDUSessionReleased(3),f² + pDUSessionReleased(3), updatedLocationAvailable(4), sMFChanged(5), other(6), -- GitLab From ad42c8dbdf8b06f89f7d617e266f5e6a0f901f99 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 2 Feb 2024 09:29:30 +0000 Subject: [PATCH 42/51] Update file TS33128Payloads.asn --- 33128/r18/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 0b55f04a..a048e201 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4456,7 +4456,7 @@ StartOfInterceptForRegisteredRCSUser ::= SEQUENCE rCSRegistrationInformation [2] SEQUENCE SIZE (1..MAX) OF RCSRegistrationInformation, userOnline [3] BOOLEAN, location [4] Location OPTIONAL, - additionalInstanceLocation [5] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation + additionalInstanceLocation [5] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation OPTIONAL } -- See clause 7.13.3.6.1.3 for details of this structure @@ -4471,7 +4471,7 @@ StartOfInterceptWithEstablisedRCSSession ::= SEQUENCE rCSSessionLegs [7] SEQUENCE SIZE (1..MAX) OF RCSSIPSessionExchange OPTIONAL, rCSSessionInformation [8] SEQUENCE SIZE (1..MAX) OF RCSSessionContext, location [9] Location OPTIONAL, - additionalInstanceLocation [10] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation + additionalInstanceLocation [10] SEQUENCE SIZE (1..MAX) OF AdditionalInstanceLocation OPTIONAL } -- ============== -- GitLab From 1dff6af583d943e57615ec0dcfc193b2f4fe878b Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 9 Feb 2024 13:04:54 +0000 Subject: [PATCH 43/51] TS 33.128 CR 0608 - Solution for the delivery of RCS CC from the CC-POI in the RCS Server --- 33128/r18/TS33128Payloads.asn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5684a1a0..a571b741 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -527,7 +527,8 @@ CCPDU ::= CHOICE nIDDCCPDU [4] NIDDCCPDU, pTCCCPDU [5] PTCCCPDU, - iMSCCPDU [6] IMSCCPDU + iMSCCPDU [6] IMSCCPDU, + rCSCCPDU [7] RCSCCPDU } -- =========================== @@ -4441,6 +4442,10 @@ RCSCapabilityDiscovery ::= SEQUENCE location [5] Location OPTIONAL } +RCSCCPDU ::= CHOICE +{ + encapsulatedRCSPayload [1] EncapsulatedRCSPayload +} -- ============== -- RCS Parameters -- GitLab From 897b6b15e394786b590cfaf76e19b8889a981155 Mon Sep 17 00:00:00 2001 From: DODDSTH Date: Fri, 9 Feb 2024 13:07:03 +0000 Subject: [PATCH 44/51] TS 33.128 CR 0609 - Solution to allow multiple NCGIs to be sent in IEFAssociationRecord and IEFDeassociationRecord. --- 33128/r18/TS33128IdentityAssociation.asn | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128IdentityAssociation.asn b/33128/r18/TS33128IdentityAssociation.asn index 707aaa27..4b8c4998 100644 --- a/33128/r18/TS33128IdentityAssociation.asn +++ b/33128/r18/TS33128IdentityAssociation.asn @@ -35,7 +35,8 @@ IEFAssociationRecord ::= SEQUENCE sUCI [7] SUCI OPTIONAL, pEI [8] PEI OPTIONAL, fiveGSTAIList [9] FiveGSTAIList OPTIONAL, - gPSI [10] GPSI OPTIONAL + gPSI [10] GPSI OPTIONAL, + additionalCGIs [11] AdditionalCGIs OPTIONAL } IEFDeassociationRecord ::= SEQUENCE @@ -44,7 +45,8 @@ IEFDeassociationRecord ::= SEQUENCE fiveGGUTI [2] FiveGGUTI, timestamp [3] GeneralizedTime, nCGI [4] NCGI, - nCGITime [5] GeneralizedTime + nCGITime [5] GeneralizedTime, + additionalCGIs [6] AdditionalCGIs OPTIONAL } IEFKeepaliveMessage ::= SEQUENCE @@ -54,6 +56,16 @@ IEFKeepaliveMessage ::= SEQUENCE FiveGGUTI ::= OCTET STRING (SIZE(10)) +AdditionalCGIs ::= SEQUENCE +{ + additionalNCGIList [1] SEQUENCE (SIZE (1..MAX)) OF AdditionalNCGI OPTIONAL +} + +AdditionalNCGI ::= SEQUENCE +{ + nCGI [1] NCGI +} + NCGI ::= SEQUENCE { pLMNID [1] PLMNID, -- GitLab From 856d2ec39313dd33e07b660e23baebb2b0c9e37d Mon Sep 17 00:00:00 2001 From: eisenschmidm Date: Fri, 9 Feb 2024 13:08:10 +0000 Subject: [PATCH 45/51] TS 33.128 CR0614 - P2T ID association without ObservedTime --- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index d79c3e1f..7e6d4223 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -118,4 +118,15 @@ + + + + + + + + + + + -- GitLab From 23a0b3b254c57f5414562fc7984a2026d715e135 Mon Sep 17 00:00:00 2001 From: grahamj Date: Fri, 9 Feb 2024 13:09:31 +0000 Subject: [PATCH 46/51] TS 33.128 CR 0607 - Addition of MSRP information to RCS Session records --- 33128/r18/TS33128Payloads.asn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index a571b741..5e66b3c9 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -4453,6 +4453,11 @@ RCSCCPDU ::= CHOICE IMDNMessageID ::= UTF8String +MSRPPath ::= SEQUENCE +{ + path [1] UTF8String +} + RCSConversationID ::= UUID RCSContributionID ::= UUID @@ -4511,7 +4516,8 @@ RCSSIPSessionMessage ::= SEQUENCE { sessionLeg [1] RCSSessionLeg, sIPMessage [2] IMSPayload, - rCSSessionResult [3] RCSSessionResult + rCSSessionResult [3] RCSSessionResult, + mSRPPathInfo [4] MSRPPath } RCSSessionResult ::= ENUMERATED -- GitLab From 05d9a8a32fbbe3ae6bb3e6d0182be082623907bc Mon Sep 17 00:00:00 2001 From: eisenschmidm Date: Fri, 9 Feb 2024 13:10:21 +0000 Subject: [PATCH 47/51] TS 33.128 CR0615 - Correction ActivateAssociationUpdates message --- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 7e6d4223..7a35b89e 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -61,6 +61,7 @@ + -- GitLab From 783db9175f9cafdc27fcf84b8da33cbca8fbb90e Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 9 Feb 2024 13:33:14 +0000 Subject: [PATCH 48/51] Updating OIDs and XSD namespaces --- 33128/r18/TS33128IdentityAssociation.asn | 4 ++-- 33128/r18/TS33128Payloads.asn | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 2 +- 33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 2 +- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 4 ++-- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/33128/r18/TS33128IdentityAssociation.asn b/33128/r18/TS33128IdentityAssociation.asn index c0566119..b337180f 100644 --- a/33128/r18/TS33128IdentityAssociation.asn +++ b/33128/r18/TS33128IdentityAssociation.asn @@ -1,12 +1,12 @@ TS33128IdentityAssociation -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) tS33128IdentityAssociation(20) r17(17) version1(1)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN -tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r17(17) version0(0)} +tS33128IdentityAssociationOID RELATIVE-OID ::= {threeGPP(4) tS33128IdentityAssociation(20) r17(17) version1(1)} iEFRecordOID RELATIVE-OID ::= {tS33128IdentityAssociationOID iEF(1)} diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index c8f8cbd2..5db39a39 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version6(6)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version7(7)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version6(6)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version7(7)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index f14f4801..4b28dfd9 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ - + - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index ab3ba276..e3f6e7b3 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,5 +1,5 @@ - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 84c666b5..8bb285e1 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,5 +1,5 @@ - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index f179237f..7348be61 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ - + - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 14415107..6590ea5e 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,9 +1,9 @@ - + - + -- GitLab From 115a35361ca185127c36f8683fb3fa11dbbabc93 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 9 Feb 2024 13:42:02 +0000 Subject: [PATCH 49/51] Correcting XSD namespaces --- 33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd | 2 +- 33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd | 2 +- 33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 4b28dfd9..347ad782 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,5 +1,5 @@ - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd index e3f6e7b3..e8049e8f 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPLIQueryExtensions.xsd @@ -1,5 +1,5 @@ - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd index 8bb285e1..09b8e865 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -1,5 +1,5 @@ - + diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 7348be61..812c8b6d 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,5 +1,5 @@ - + -- GitLab From 66cb6df51a8ca0d38bfb40476b4b1cb8e194a379 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 9 Feb 2024 13:49:58 +0000 Subject: [PATCH 50/51] Corrected remaining XSD namespace --- 33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd index 6590ea5e..9bdd5991 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPXLAExtensions.xsd @@ -1,5 +1,5 @@ - + -- GitLab From 5b2571357008e515b5232b5db2c623270ae31afd Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 18 Mar 2024 07:45:46 +0000 Subject: [PATCH 51/51] Updating references --- 33128/r18/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 5db39a39..3c66b8de 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -253,7 +253,7 @@ XIRIEvent ::= CHOICE mMERANTraceReport [150] MMERANTraceReport, mMEUEServiceAccept [151] MMEUEServiceAccept, - --NWDAF events, see clause 7.X.2 + --NWDAF events, see clause 7.16.2 nWDAFEventsSubscription [152] NWDAFEventsSubscription, nWDAFEventsNotification [153] NWDAFEventsNotification, nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, @@ -512,7 +512,7 @@ IRIEvent ::= CHOICE mMERANTraceReport [150] MMERANTraceReport, mMEUEServiceAccept [151] MMEUEServiceAccept, - --NWDAF events, see clause 7.X.3 + --NWDAF events, see clause 7.16.3 nWDAFEventsSubscription [152] NWDAFEventsSubscription, nWDAFEventsNotification [153] NWDAFEventsNotification, nWDAFAnalyticsInfoQuery [154] NWDAFAnalyticsInfoQuery, -- GitLab