diff --git a/33128/r15/TS33128Payloads.asn b/33128/r15/TS33128Payloads.asn index f1abf2475fc6342dc258d7fbc65f1b166d0d0e6c..fce967396ca66aadfacc23d11201b0bc45202173 100644 --- a/33128/r15/TS33128Payloads.asn +++ b/33128/r15/TS33128Payloads.asn @@ -141,7 +141,7 @@ LINotificationPayload ::= SEQUENCE LINotificationMessage ::= CHOICE { - lINotification [1] LINotification + lINotification [1] LINotification } -- ================== @@ -413,7 +413,7 @@ QFI ::= INTEGER (0..63) -- 5G UDM definitions -- ================== -UDMServingSystemMessage ::= SEQUENCE +UDMServingSystemMessage ::= SEQUENCE { sUPI [1] SUPI, pEI [2] PEI OPTIONAL, @@ -512,7 +512,7 @@ LALSReport ::= SEQUENCE PDHeaderReport ::= SEQUENCE { - pDUSessionID [1] PDUSessionID, + pDUSessionID [1] PDUSessionID, sourceIPAddress [2] IPAddress, sourcePort [3] PortNumber OPTIONAL, destinationIPAddress [4] IPAddress, @@ -834,9 +834,9 @@ UEEndpointAddress ::= CHOICE Location ::= SEQUENCE { - locationInfo [1] LocationInfo OPTIONAL, - positioningInfo [2] PositioningInfo OPTIONAL, - locationPresenceReport [3] LocationPresenceReport OPTIONAL + locationInfo [1] LocationInfo OPTIONAL, + positioningInfo [2] PositioningInfo OPTIONAL, + locationPresenceReport [3] LocationPresenceReport OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -850,7 +850,7 @@ CellSiteInformation ::= SEQUENCE LocationInfo ::= SEQUENCE { userLocation [1] UserLocation OPTIONAL, - currentLoc [2] BOOLEAN OPTIONAL, + currentLoc [2] BOOLEAN OPTIONAL, geoInfo [3] GeographicArea OPTIONAL, rATType [4] RATType OPTIONAL, timeZone [5] TimeZone OPTIONAL, @@ -872,8 +872,8 @@ EUTRALocation ::= SEQUENCE eCGI [2] ECGI, ageOfLocatonInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, - geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalNGENbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL } @@ -886,7 +886,7 @@ NRLocation ::= SEQUENCE ageOfLocatonInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalGNbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL } @@ -895,7 +895,7 @@ NRLocation ::= SEQUENCE N3GALocation ::= SEQUENCE { tAI [1] TAI OPTIONAL, - n3IWFID [2] N3IWFIDNGAP OPTIONAL, + n3IWFID [2] N3IWFIDNGAP OPTIONAL, uEIPAddr [3] IPAddr OPTIONAL, portNumber [4] INTEGER OPTIONAL } @@ -949,7 +949,7 @@ RANCGI ::= CHOICE nCGI [2] NCGI } -CellInformation ::= SEQUENCE +CellInformation ::= SEQUENCE { rANCGI [1] RANCGI, cellSiteinformation [2] CellSiteInformation OPTIONAL, @@ -983,12 +983,12 @@ NGENbID ::= CHOICE PositioningInfo ::= SEQUENCE { positionInfo [1] LocationData OPTIONAL, - rawMLPResponse [2] RawMLPResponse OPTIONAL + rawMLPResponse [2] RawMLPResponse OPTIONAL } RawMLPResponse ::= CHOICE { - -- The following parameter contains a copy of unparsed XML code of the + -- The following parameter contains a copy of unparsed XML code of the -- MLP response message, i.e. the entire XML document containing -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message. @@ -1287,7 +1287,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE vUncertainty [6] SpeedUncertainty } --- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 +-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 Altitude ::= UTF8String Angle ::= INTEGER (0..360) Uncertainty ::= INTEGER (0..127) @@ -1351,4 +1351,4 @@ Usage ::= ENUMERATED -- TS 29.571 [17], table 5.2.2-1 TimeZone ::= UTF8String -END \ No newline at end of file +END diff --git a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 196afbf86ffc976b3ecdc4bcb24192f7391fa8d7..de3e2f2019ff781fe86a97e689e2a410d3580e48 100644 --- a/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r15/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -155,13 +155,13 @@ - + - + @@ -225,5 +225,5 @@ - - \ No newline at end of file + + diff --git a/33128/r16/TS33128IdentityAssociation.asn b/33128/r16/TS33128IdentityAssociation.asn index bf97cb47d1a412f89c37d68e5987fd4bbc9a6ae4..82aca7c5de53349463bb0497a4021197bdcef220 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 46381fce08d02dd0debb8d825f162a036f5d754d..723948f8486213215a246147872d922a47346142 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version6(6)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version5(5)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version6(6)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -118,7 +118,7 @@ XIRIEvent ::= CHOICE mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 -sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification } -- ============== @@ -245,7 +245,7 @@ IRITargetIdentifier ::= SEQUENCE CCPayload ::= SEQUENCE { - cCPayloadOID [1] RELATIVE-OID, + cCPayloadOID [1] RELATIVE-OID, pDU [2] CCPDU } @@ -263,12 +263,12 @@ CCPDU ::= CHOICE LINotificationPayload ::= SEQUENCE { lINotificationPayloadOID [1] RELATIVE-OID, - notification [2] LINotificationMessage + notification [2] LINotificationMessage } LINotificationMessage ::= CHOICE { - lINotification [1] LINotification + lINotification [1] LINotification } -- ================== @@ -680,10 +680,10 @@ SMFMAAcceptedIndication ::= BOOLEAN -- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure. SMFErrorCodes ::= UTF8String --- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. +-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. UEEPSPDNConnection ::= OCTET STRING --- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. +-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. RequestIndication ::= ENUMERATED { uEREQPDUSESMOD(0), @@ -726,7 +726,7 @@ QFI ::= INTEGER (0..63) -- 5G UDM definitions -- ================== -UDMServingSystemMessage ::= SEQUENCE +UDMServingSystemMessage ::= SEQUENCE { sUPI [1] SUPI, pEI [2] PEI OPTIONAL, @@ -952,7 +952,7 @@ MMSSendByNonLocalTarget ::= SEQUENCE dRMContent [23] BOOLEAN OPTIONAL, adaptationAllowed [24] MMSAdaptation OPTIONAL } - + MMSNotification ::= SEQUENCE { transactionID [1] UTF8String, @@ -968,7 +968,7 @@ MMSNotification ::= SEQUENCE expiry [11] MMSExpiry, replyCharging [12] MMSReplyCharging OPTIONAL } - + MMSSendToNonLocalTarget ::= SEQUENCE { version [1] MMSVersion, @@ -1022,7 +1022,7 @@ MMSRetrieval ::= SEQUENCE state [12] MMState OPTIONAL, flags [13] MMFlags OPTIONAL, messageClass [14] MMSMessageClass OPTIONAL, - priority [15] MMSPriority, + priority [15] MMSPriority, deliveryReport [16] BOOLEAN OPTIONAL, readReport [17] BOOLEAN OPTIONAL, replyCharging [18] MMSReplyCharging OPTIONAL, @@ -1056,7 +1056,7 @@ MMSForward ::= SEQUENCE cCRecipients [6] SEQUENCE OF MMSParty OPTIONAL, bCCRecipients [7] SEQUENCE OF MMSParty OPTIONAL, direction [8] MMSDirection, - expiry [9] MMSExpiry OPTIONAL, + expiry [9] MMSExpiry OPTIONAL, desiredDeliveryTime [10] Timestamp OPTIONAL, deliveryReportAllowed [11] BOOLEAN OPTIONAL, deliveryReport [12] BOOLEAN OPTIONAL, @@ -1068,10 +1068,10 @@ MMSForward ::= SEQUENCE responseStatus [18] MMSResponseStatus, responseStatusText [19] UTF8String OPTIONAL, messageID [20] UTF8String OPTIONAL, - contentLocationConf [21] UTF8String OPTIONAL, + contentLocationConf [21] UTF8String OPTIONAL, storeStatus [22] MMSStoreStatus OPTIONAL, storeStatusText [23] UTF8String OPTIONAL -} +} MMSDeleteFromRelay ::= SEQUENCE { @@ -1089,13 +1089,13 @@ MMSMBoxStore ::= SEQUENCE transactionID [1] UTF8String, version [2] MMSVersion, direction [3] MMSDirection, - contentLocationReq [4] UTF8String, + contentLocationReq [4] UTF8String, state [5] MMState OPTIONAL, flags [6] MMFlags OPTIONAL, - contentLocationConf [7] UTF8String OPTIONAL, + contentLocationConf [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL -} +} MMSMBoxUpload ::= SEQUENCE { @@ -1105,11 +1105,11 @@ MMSMBoxUpload ::= SEQUENCE state [4] MMState OPTIONAL, flags [5] MMFlags OPTIONAL, contentType [6] UTF8String, - contentLocation [7] UTF8String OPTIONAL, + contentLocation [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL, mMessages [10] SEQUENCE OF MMBoxDescription -} +} MMSMBoxDelete ::= SEQUENCE { @@ -1189,7 +1189,7 @@ MMSCancel ::= SEQUENCE version [2] MMSVersion, cancelID [3] UTF8String, direction [4] MMSDirection -} +} MMSMBoxViewRequest ::= SEQUENCE { @@ -1246,7 +1246,7 @@ MMBoxDescription ::= SEQUENCE -- ========= -- MMS CCPDU -- ========= - + MMSCCPDU ::= SEQUENCE { version [1] MMSVersion, @@ -1312,7 +1312,7 @@ MMSDeleteResponseStatus ::= ENUMERATED errorPermanentReplyChargingNotSupported(24), errorPermanentAddressHidingNotSupported(25), errorPermanentLackOfPrepaid(26) -} +} MMSDirection ::= ENUMERATED { @@ -1327,13 +1327,13 @@ MMSElementDescriptor ::= SEQUENCE value [3] UTF8String OPTIONAL } -MMSExpiry ::= SEQUENCE +MMSExpiry ::= SEQUENCE { expiryPeriod [1] INTEGER, - periodFormat [2] MMSPeriodFormat + periodFormat [2] MMSPeriodFormat } -MMFlags ::= SEQUENCE +MMFlags ::= SEQUENCE { length [1] INTEGER, flag [2] MMStateFlag, @@ -1363,7 +1363,7 @@ MMSPartyID ::= CHOICE iMPI [5] IMPI, sUPI [6] SUPI, gPSI [7] GPSI -} +} MMSPeriodFormat ::= ENUMERATED { @@ -1511,7 +1511,7 @@ MMSVersion ::= SEQUENCE { majorVersion [1] INTEGER, minorVersion [2] INTEGER -} +} -- ================== -- 5G PTC definitions @@ -1568,7 +1568,7 @@ PTCSessionEnd ::= SEQUENCE pTCDirection [2] Direction, pTCServerURI [3] UTF8String, pTCSessionInfo [4] PTCSessionInfo, - pTCParticipants [5] SEQUENCE OF PTCTargetInformation OPTIONAL, + pTCParticipants [5] SEQUENCE OF PTCTargetInformation OPTIONAL, location [6] Location OPTIONAL, pTCSessionEndCause [7] PTCSessionEndCause } @@ -1578,7 +1578,7 @@ PTCStartOfInterception ::= SEQUENCE pTCTargetInformation [1] PTCTargetInformation, pTCDirection [2] Direction, preEstSessionID [3] PTCSessionInfo OPTIONAL, - pTCOriginatingID [4] PTCTargetInformation, + pTCOriginatingID [4] PTCTargetInformation, pTCSessionInfo [5] PTCSessionInfo OPTIONAL, pTCHost [6] PTCTargetInformation OPTIONAL, pTCParticipants [7] SEQUENCE OF PTCTargetInformation OPTIONAL, @@ -1748,7 +1748,7 @@ PTCIdentifiers ::= CHOICE PTCSessionInfo ::= SEQUENCE { - pTCSessionURI [1] UTF8String, + pTCSessionURI [1] UTF8String, pTCSessionType [2] PTCSessionType } @@ -1792,7 +1792,7 @@ RTPSetting ::= SEQUENCE PTCIDList ::= SEQUENCE { pTCPartyID [1] PTCTargetInformation, - pTCChatGroupID [2] PTCChatGroupID + pTCChatGroupID [2] PTCChatGroupID } PTCChatGroupID ::= SEQUENCE @@ -1897,7 +1897,7 @@ PTCAccessPolicyFailure ::= ENUMERATED { requestUnsuccessful(1), requestUnknown(2) -} +} -- =================== -- 5G LALS definitions @@ -1906,9 +1906,12 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, - pEI [2] PEI OPTIONAL, + -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, - location [4] Location OPTIONAL + location [4] Location OPTIONAL, + iMPU [5] IMPU OPTIONAL, + iMSI [7] IMSI OPTIONAL, + mSISDN [8] MSISDN OPTIONAL } -- ===================== @@ -1917,7 +1920,7 @@ LALSReport ::= SEQUENCE PDHeaderReport ::= SEQUENCE { - pDUSessionID [1] PDUSessionID, + pDUSessionID [1] PDUSessionID, sourceIPAddress [2] IPAddress, sourcePort [3] PortNumber OPTIONAL, destinationIPAddress [4] IPAddress, @@ -2317,9 +2320,9 @@ UEEndpointAddress ::= CHOICE Location ::= SEQUENCE { - locationInfo [1] LocationInfo OPTIONAL, - positioningInfo [2] PositioningInfo OPTIONAL, - locationPresenceReport [3] LocationPresenceReport OPTIONAL + locationInfo [1] LocationInfo OPTIONAL, + positioningInfo [2] PositioningInfo OPTIONAL, + locationPresenceReport [3] LocationPresenceReport OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -2333,7 +2336,7 @@ CellSiteInformation ::= SEQUENCE LocationInfo ::= SEQUENCE { userLocation [1] UserLocation OPTIONAL, - currentLoc [2] BOOLEAN OPTIONAL, + currentLoc [2] BOOLEAN OPTIONAL, geoInfo [3] GeographicArea OPTIONAL, rATType [4] RATType OPTIONAL, timeZone [5] TimeZone OPTIONAL, @@ -2355,8 +2358,8 @@ EUTRALocation ::= SEQUENCE eCGI [2] ECGI, ageOfLocatonInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, - geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalNGENbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL, globalENbID [9] GlobalRANNodeID OPTIONAL @@ -2370,7 +2373,7 @@ NRLocation ::= SEQUENCE ageOfLocatonInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalGNbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL } @@ -2379,9 +2382,15 @@ NRLocation ::= SEQUENCE N3GALocation ::= SEQUENCE { tAI [1] TAI OPTIONAL, - n3IWFID [2] N3IWFIDNGAP OPTIONAL, + n3IWFID [2] N3IWFIDNGAP OPTIONAL, uEIPAddr [3] IPAddr OPTIONAL, - portNumber [4] INTEGER OPTIONAL + portNumber [4] INTEGER OPTIONAL, + tNAPID [5] TNAPID OPTIONAL, + tWAPID [6] TWAPID OPTIONAL, + hFCNodeID [7] HFCNodeID OPTIONAL, + gLI [8] GLI OPTIONAL, + w5GBANLineType [9] W5GBANLineType OPTIONAL, + gCI [10] GCI OPTIONAL } -- TS 38.413 [23], clause 9.3.2.4 @@ -2404,7 +2413,9 @@ ANNodeID ::= CHOICE n3IWFID [1] N3IWFIDSBI, gNbID [2] GNbID, nGENbID [3] NGENbID, - eNbID [4] ENbID + eNbID [4] ENbID, + wAGFID [5] WAGFID, + tNGFID [6] TNGFID } -- TS 38.413 [23], clause 9.3.1.6 @@ -2423,7 +2434,7 @@ ECGI ::= SEQUENCE { pLMNID [1] PLMNID, eUTRACellID [2] EUTRACellID, - nID [3] NID OPTIONAL + nID [3] NID OPTIONAL } TAIList ::= SEQUENCE OF TAI @@ -2442,7 +2453,7 @@ RANCGI ::= CHOICE nCGI [2] NCGI } -CellInformation ::= SEQUENCE +CellInformation ::= SEQUENCE { rANCGI [1] RANCGI, cellSiteinformation [2] CellSiteInformation OPTIONAL, @@ -2455,6 +2466,51 @@ N3IWFIDNGAP ::= BIT STRING (SIZE(16)) -- TS 29.571 [17], clause 5.4.4.28 N3IWFIDSBI ::= UTF8String +-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1 +TNGFID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1 +WAGFID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.62 +TNAPID ::= SEQUENCE +{ + sSID [1] SSID OPTIONAL, + bSSID [2] BSSID OPTIONAL, + civicAddress [3] CivicAddressBytes OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.64 +TWAPID ::= SEQUENCE +{ + sSID [1] SSID OPTIONAL, + bSSID [2] BSSID OPTIONAL, + civicAddress [3] CivicAddressBytes OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64 +SSID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64 +BSSID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.36 and table 5.4.2-1 +HFCNodeID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1 +-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed +GLI ::= OCTET STRING (SIZE(0..150)) + +-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1 +GCI ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.10 and clause 5.4.3.33 +W5GBANLineType ::= ENUMERATED +{ + dSL(1), + pON(2) +} + -- TS 29.571 [17], table 5.4.2-1 TAC ::= OCTET STRING (SIZE(2..3)) @@ -2488,12 +2544,12 @@ ENbID ::= CHOICE PositioningInfo ::= SEQUENCE { positionInfo [1] LocationData OPTIONAL, - rawMLPResponse [2] RawMLPResponse OPTIONAL + rawMLPResponse [2] RawMLPResponse OPTIONAL } RawMLPResponse ::= CHOICE { - -- The following parameter contains a copy of unparsed XML code of the + -- The following parameter contains a copy of unparsed XML code of the -- MLP response message, i.e. the entire XML document containing -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message. @@ -2674,6 +2730,10 @@ CivicAddress ::= SEQUENCE pom [31] UTF8String OPTIONAL } +-- TS 29.571 [17], clauses 5.4.4.62 and 5.4.4.64 +-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed +CivicAddressBytes ::= OCTET STRING + -- TS 29.572 [24], clause 6.1.6.2.15 PositioningMethodAndUsage ::= SEQUENCE { @@ -2797,7 +2857,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE vUncertainty [6] SpeedUncertainty } --- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 +-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 Altitude ::= UTF8String Angle ::= INTEGER (0..360) Uncertainty ::= INTEGER (0..127) @@ -2877,4 +2937,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index da7b1b01b98d5dc25a803380d3f6895fca6affd6..c707b84e44cd2475ac0eca771ec6c11f2d0793a5 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ @@ -87,6 +87,7 @@ + @@ -112,5 +113,107 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000000000000000000000000000000000000..f07c07279806306d38f715c4a89722d4cfc88330 --- /dev/null +++ b/33128/r16/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -0,0 +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 20e67843d527f533a7d4a6dcc5ecc6ed997411e9..5b042a9ac5c7806192fdac23a40c18ea4d701347 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -25,11 +25,11 @@ - + - + @@ -186,13 +186,13 @@ - + - + @@ -245,4 +245,5 @@ - + + \ No newline at end of file diff --git a/33128/r17/TS33128IdentityAssociation.asn b/33128/r17/TS33128IdentityAssociation.asn index bf97cb47d1a412f89c37d68e5987fd4bbc9a6ae4..82aca7c5de53349463bb0497a4021197bdcef220 100644 --- a/33128/r17/TS33128IdentityAssociation.asn +++ b/33128/r17/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/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 46381fce08d02dd0debb8d825f162a036f5d754d..0a9e60115d0cde2284a19480c43230fe447b9d52 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version0(0)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version5(5)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version0(0)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -117,8 +117,43 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 -sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, + + -- NEF services related events, see clause 7.7.2 + nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, + nEFPDUSessionModification [66] NEFPDUSessionModification, + nEFPDUSessionRelease [67] NEFPDUSessionRelease, + nEFUnsuccessfulProcedure [68] NEFUnsuccessfulProcedure, + nEFStartOfInterceptionWithEstablishedPDUSession [69] NEFStartOfInterceptionWithEstablishedPDUSession, + nEFdeviceTrigger [70] NEFDeviceTrigger, + nEFdeviceTriggerReplace [71] NEFDeviceTriggerReplace, + nEFdeviceTriggerCancellation [72] NEFDeviceTriggerCancellation, + nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, + nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, + nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, + + -- SCEF services related events, see clause 7.8.2 + sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, + sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, + sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, + sCEFUnsuccessfulProcedure [79] SCEFUnsuccessfulProcedure, + sCEFStartOfInterceptionWithEstablishedPDNConnection [80] SCEFStartOfInterceptionWithEstablishedPDNConnection, + sCEFdeviceTrigger [81] SCEFDeviceTrigger, + sCEFdeviceTriggerReplace [82] SCEFDeviceTriggerReplace, + sCEFdeviceTriggerCancellation [83] SCEFDeviceTriggerCancellation, + sCEFdeviceTriggerReportNotify [84] SCEFDeviceTriggerReportNotify, + sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, + sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, + + --EPS Events, see clause 6.3 + + --MME Events, see clause 6.3.2.2 + mMEAttach [87] MMEAttach, + mMEDetach [88] MMEDetach, + mMELocationUpdate [89] MMELocationUpdate, + mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure } -- ============== @@ -230,7 +265,42 @@ IRIEvent ::= CHOICE mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 - sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, + + -- NEF services related events, see clause 7.7.2, + nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, + nEFPDUSessionModification [66] NEFPDUSessionModification, + nEFPDUSessionRelease [67] NEFPDUSessionRelease, + nEFUnsuccessfulProcedure [68] NEFUnsuccessfulProcedure, + nEFStartOfInterceptionWithEstablishedPDUSession [69] NEFStartOfInterceptionWithEstablishedPDUSession, + nEFdeviceTrigger [70] NEFDeviceTrigger, + nEFdeviceTriggerReplace [71] NEFDeviceTriggerReplace, + nEFdeviceTriggerCancellation [72] NEFDeviceTriggerCancellation, + nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, + nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, + nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, + + -- SCEF services related events, see clause 7.8.2 + sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, + sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, + sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, + sCEFUnsuccessfulProcedure [79] SCEFUnsuccessfulProcedure, + sCEFStartOfInterceptionWithEstablishedPDNConnection [80] SCEFStartOfInterceptionWithEstablishedPDNConnection, + sCEFdeviceTrigger [81] SCEFDeviceTrigger, + sCEFdeviceTriggerReplace [82] SCEFDeviceTriggerReplace, + sCEFdeviceTriggerCancellation [83] SCEFDeviceTriggerCancellation, + sCEFdeviceTriggerReportNotify [84] SCEFDeviceTriggerReportNotify, + sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, + sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, + + --EPS Events, see clause 6.3 + + --MME Events, see clause 6.3.2.2 + mMEAttach [87] MMEAttach, + mMEDetach [88] MMEDetach, + mMELocationUpdate [89] MMELocationUpdate, + mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure } IRITargetIdentifier ::= SEQUENCE @@ -246,14 +316,15 @@ IRITargetIdentifier ::= SEQUENCE CCPayload ::= SEQUENCE { cCPayloadOID [1] RELATIVE-OID, - pDU [2] CCPDU + pDU [2] CCPDU } CCPDU ::= CHOICE { uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, - mMSCCPDU [3] MMSCCPDU + mMSCCPDU [3] MMSCCPDU, + nIDDCCPDU [4] NIDDCCPDU } -- =========================== @@ -263,14 +334,487 @@ CCPDU ::= CHOICE LINotificationPayload ::= SEQUENCE { lINotificationPayloadOID [1] RELATIVE-OID, - notification [2] LINotificationMessage + notification [2] LINotificationMessage } LINotificationMessage ::= CHOICE { - lINotification [1] LINotification + lINotification [1] LINotification +} +-- ================== +-- 5G NEF definitions +-- ================== + +-- See clause 7.7.2.1.2 for details of this structure +NEFPDUSessionEstablishment ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + pDUSessionID [3] PDUSessionID, + sNSSAI [4] SNSSAI, + nEFID [5] NEFID, + dNN [6] DNN, + rDSSupport [7] RDSSupport, + sMFID [8] SMFID, + aFID [9] AFID +} + +-- See clause 7.7.2.1.3 for details of this structure +NEFPDUSessionModification ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + sNSSAI [3] SNSSAI, + initiator [4] Initiator, + rDSSourcePortNumber [5] RDSPortNumber OPTIONAL, + rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL, + applicationID [7] ApplicationID OPTIONAL, + aFID [8] AFID OPTIONAL, + rDSAction [9] RDSAction OPTIONAL, + serializationFormat [10] SerializationFormat OPTIONAL +} + +-- See clause 7.7.2.1.4 for details of this structure +NEFPDUSessionRelease ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + pDUSessionID [3] PDUSessionID, + timeOfFirstPacket [4] Timestamp OPTIONAL, + timeOfLastPacket [5] Timestamp OPTIONAL, + uplinkVolume [6] INTEGER OPTIONAL, + downlinkVolume [7] INTEGER OPTIONAL, + releaseCause [8] NEFReleaseCause +} + +-- See clause 7.7.2.1.5 for details of this structure +NEFUnsuccessfulProcedure ::= SEQUENCE +{ + failureCause [1] NEFFailureCause, + sUPI [2] SUPI, + gPSI [3] GPSI OPTIONAL, + pDUSessionID [4] PDUSessionID, + dNN [5] DNN OPTIONAL, + sNSSAI [6] SNSSAI OPTIONAL, + rDSDestinationPortNumber [7] RDSPortNumber, + applicationID [8] ApplicationID, + aFID [9] AFID +} + +-- See clause 7.7.2.1.6 for details of this structure +NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + pDUSessionID [3] PDUSessionID, + dNN [4] DNN, + sNSSAI [5] SNSSAI, + nEFID [6] NEFID, + rDSSupport [7] RDSSupport, + sMFID [8] SMFID, + aFID [9] AFID +} + +-- See clause 7.7.3.1.1 for details of this structure +NEFDeviceTrigger ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID, + aFID [4] AFID, + triggerPayload [5] TriggerPayload OPTIONAL, + validityPeriod [6] INTEGER OPTIONAL, + priorityDT [7] PriorityDT OPTIONAL, + sourcePortId [8] PortNumber OPTIONAL, + destinationPortId [9] PortNumber OPTIONAL +} + +-- See clause 7.7.3.1.2 for details of this structure +NEFDeviceTriggerReplace ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID, + aFID [4] AFID, + triggerPayload [5] TriggerPayload OPTIONAL, + validityPeriod [6] INTEGER OPTIONAL, + priorityDT [7] PriorityDT OPTIONAL, + sourcePortId [8] PortNumber OPTIONAL, + destinationPortId [9] PortNumber OPTIONAL +} + +-- See clause 7.7.3.1.3 for details of this structure +NEFDeviceTriggerCancellation ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID +} + +-- See clause 7.7.3.1.4 for details of this structure +NEFDeviceTriggerReportNotify ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID, + deviceTriggerDeliveryResult [4] DeviceTriggerDeliveryResult +} + +-- See clause 7.7.4.1.1 for details of this structure +NEFMSISDNLessMOSMS ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + terminatingSMSParty [3] AFID, + sMS [4] SMSTPDUData OPTIONAL, + sourcePort [5] PortNumber OPTIONAL, + destinationPort [6] PortNumber OPTIONAL +} + +-- See clause 7.7.5.1.1 for details of this structure +NEFExpectedUEBehaviourUpdate ::= SEQUENCE +{ + gPSI [1] GPSI, + expectedUEMovingTrajectory [2] SEQUENCE OF UMTLocationArea5G OPTIONAL, + stationaryIndication [3] StationaryIndication OPTIONAL, + communicationDurationTime [4] INTEGER OPTIONAL, + periodicTime [5] INTEGER OPTIONAL, + scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL, + scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL, + batteryIndication [8] BatteryIndication OPTIONAL, + trafficProfile [9] TrafficProfile OPTIONAL, + expectedTimeAndDayOfWeekInTrajectory [10] SEQUENCE OF UMTLocationArea5G OPTIONAL, + aFID [11] AFID, + validityTime [12] Timestamp OPTIONAL +} + +-- ========================== +-- Common SCEF/NEF parameters +-- ========================== + +RDSSupport ::= BOOLEAN + +RDSPortNumber ::= INTEGER (0..15) + +RDSAction ::= ENUMERATED +{ + reservePort(1), + releasePort(2) +} + +SerializationFormat ::= ENUMERATED +{ + xml(1), + json(2), + cbor(3) } +ApplicationID ::= OCTET STRING + +NIDDCCPDU ::= OCTET STRING + +TriggerID ::= UTF8String + +PriorityDT ::= ENUMERATED +{ + noPriority(1), + priority(2) +} + +TriggerPayload ::= OCTET STRING + +DeviceTriggerDeliveryResult ::= ENUMERATED +{ + success(1), + unknown(2), + failure(3), + triggered(4), + expired(5), + unconfirmed(6), + replaced(7), + terminate(8) +} + +StationaryIndication ::= ENUMERATED +{ + stationary(1), + mobile(2) +} + +BatteryIndication ::= ENUMERATED +{ + batteryRecharge(1), + batteryReplace(2), + batteryNoRecharge(3), + batteryNoReplace(4), + noBattery(5) +} + +ScheduledCommunicationTime ::= SEQUENCE +{ + days [1] SEQUENCE OF Daytime +} + +UMTLocationArea5G ::= SEQUENCE +{ + timeOfDay [1] Daytime, + durationSec [2] INTEGER, + location [3] NRLocation +} + +Daytime ::= SEQUENCE +{ + daysOfWeek [1] Day OPTIONAL, + timeOfDayStart [2] Timestamp OPTIONAL, + timeOfDayEnd [3] Timestamp OPTIONAL +} + +Day ::= ENUMERATED +{ + monday(1), + tuesday(2), + wednesday(3), + thursday(4), + friday(5), + saturday(6), + sunday(7) +} + +TrafficProfile ::= ENUMERATED +{ + singleTransUL(1), + singleTransDL(2), + dualTransULFirst(3), + dualTransDLFirst(4), + multiTrans(5) +} + +ScheduledCommunicationType ::= ENUMERATED +{ + downlinkOnly(1), + uplinkOnly(2), + bidirectional(3) +} + +-- ================= +-- 5G NEF parameters +-- ================= + +NEFFailureCause ::= ENUMERATED +{ + userUnknown(1), + niddConfigurationNotAvailable(2), + contextNotFound(3), + portNotFree(4), + portNotAssociatedWithSpecifiedApplication(5) +} + +NEFReleaseCause ::= ENUMERATED +{ + sMFRelease(1), + dNRelease(2), + uDMRelease(3), + cHFRelease(4), + localConfigurationPolicy(5), + unknownCause(6) +} + +AFID ::= UTF8String + +NEFID ::= UTF8String + +-- ================== +-- SCEF definitions +-- ================== + +-- See clause 7.8.2.1.2 for details of this structure +SCEFPDNConnectionEstablishment ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + iMEI [4] IMEI OPTIONAL, + ePSBearerID [5] EPSBearerID, + sCEFID [6] SCEFID, + aPN [7] APN, + rDSSupport [8] RDSSupport, + sCSASID [9] SCSASID +} + +-- See clause 7.8.2.1.3 for details of this structure +SCEFPDNConnectionUpdate ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + initiator [4] Initiator, + rDSSourcePortNumber [5] RDSPortNumber OPTIONAL, + rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL, + applicationID [7] ApplicationID OPTIONAL, + sCSASID [8] SCSASID OPTIONAL, + rDSAction [9] RDSAction OPTIONAL, + serializationFormat [10] SerializationFormat OPTIONAL +} + +-- See clause 7.8.2.1.4 for details of this structure +SCEFPDNConnectionRelease ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + ePSBearerID [4] EPSBearerID, + timeOfFirstPacket [5] Timestamp OPTIONAL, + timeOfLastPacket [6] Timestamp OPTIONAL, + uplinkVolume [7] INTEGER OPTIONAL, + downlinkVolume [8] INTEGER OPTIONAL, + releaseCause [9] SCEFReleaseCause +} + +-- See clause 7.8.2.1.5 for details of this structure +SCEFUnsuccessfulProcedure ::= SEQUENCE +{ + failureCause [1] SCEFFailureCause, + iMSI [2] IMSI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + externalIdentifier [4] NAI OPTIONAL, + ePSBearerID [5] EPSBearerID, + aPN [6] APN, + rDSDestinationPortNumber [7] RDSPortNumber OPTIONAL, + applicationID [8] ApplicationID OPTIONAL, + sCSASID [9] SCSASID +} + +-- See clause 7.8.2.1.6 for details of this structure +SCEFStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + iMEI [4] IMEI OPTIONAL, + ePSBearerID [5] EPSBearerID, + sCEFID [6] SCEFID, + aPN [7] APN, + rDSSupport [8] RDSSupport, + sCSASID [9] SCSASID +} + +-- See clause 7.8.3.1.1 for details of this structure +SCEFDeviceTrigger ::= SEQUENCE +{ + iMSI [1] IMSI, + mSISDN [2] MSISDN, + externalIdentifier [3] NAI, + triggerId [4] TriggerID, + sCSASID [5] SCSASID OPTIONAL, + triggerPayload [6] TriggerPayload OPTIONAL, + validityPeriod [7] INTEGER OPTIONAL, + priorityDT [8] PriorityDT OPTIONAL, + sourcePortId [9] PortNumber OPTIONAL, + destinationPortId [10] PortNumber OPTIONAL +} + +-- See clause 7.8.3.1.2 for details of this structure +SCEFDeviceTriggerReplace ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + triggerId [4] TriggerID, + sCSASID [5] SCSASID OPTIONAL, + triggerPayload [6] TriggerPayload OPTIONAL, + validityPeriod [7] INTEGER OPTIONAL, + priorityDT [8] PriorityDT OPTIONAL, + sourcePortId [9] PortNumber OPTIONAL, + destinationPortId [10] PortNumber OPTIONAL +} + +-- See clause 7.8.3.1.3 for details of this structure +SCEFDeviceTriggerCancellation ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + triggerId [4] TriggerID +} + +-- See clause 7.8.3.1.4 for details of this structure +SCEFDeviceTriggerReportNotify ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + triggerId [4] TriggerID, + deviceTriggerDeliveryResult [5] DeviceTriggerDeliveryResult +} + +-- See clause 7.8.4.1.1 for details of this structure +SCEFMSISDNLessMOSMS ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifie [3] NAI OPTIONAL, + terminatingSMSParty [4] SCSASID, + sMS [5] SMSTPDUData OPTIONAL, + sourcePort [6] PortNumber OPTIONAL, + destinationPort [7] PortNumber OPTIONAL +} + +-- See clause 7.8.5.1.1 for details of this structure +SCEFCommunicationPatternUpdate ::= SEQUENCE +{ + mSISDN [1] MSISDN OPTIONAL, + externalIdentifier [2] NAI OPTIONAL, + periodicCommunicationIndicator [3] PeriodicCommunicationIndicator OPTIONAL, + communicationDurationTime [4] INTEGER OPTIONAL, + periodicTime [5] INTEGER OPTIONAL, + scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL, + scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL, + stationaryIndication [8] StationaryIndication OPTIONAL, + batteryIndication [9] BatteryIndication OPTIONAL, + trafficProfile [10] TrafficProfile OPTIONAL, + expectedUEMovingTrajectory [11] SEQUENCE OF UMTLocationArea5G OPTIONAL, + sCSASID [13] SCSASID, + validityTime [14] Timestamp OPTIONAL +} + +-- ================= +-- SCEF parameters +-- ================= + +SCEFFailureCause ::= ENUMERATED +{ + userUnknown(1), + niddConfigurationNotAvailable(2), + invalidEPSBearer(3), + operationNotAllowed(4), + portNotFree(5), + portNotAssociatedWithSpecifiedApplication(6) +} + +SCEFReleaseCause ::= ENUMERATED +{ + mMERelease(1), + dNRelease(2), + hSSRelease(3), + localConfigurationPolicy(4), + unknownCause(5) +} + +SCSASID ::= UTF8String + +SCEFID ::= UTF8String + +PeriodicCommunicationIndicator ::= ENUMERATED +{ + periodic(1), + nonPeriodic(2) +} + +EPSBearerID ::= INTEGER (0..255) + +APN ::= UTF8String + + -- ================== -- 5G AMF definitions -- ================== @@ -288,7 +832,10 @@ AMFRegistration ::= SEQUENCE gUTI [8] FiveGGUTI, location [9] Location OPTIONAL, non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - fiveGSTAIList [11] TAIList OPTIONAL + fiveGSTAIList [11] TAIList OPTIONAL, + sMSOverNasIndicator [12] SMSOverNASIndicator OPTIONAL, + oldGUTI [13] EPS5GGUTI OPTIONAL, + eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -302,7 +849,9 @@ AMFDeregistration ::= SEQUENCE gPSI [6] GPSI OPTIONAL, gUTI [7] FiveGGUTI OPTIONAL, cause [8] FiveGMMCause OPTIONAL, - location [9] Location OPTIONAL + location [9] Location OPTIONAL, + switchOffIndicator [10] SwitchOffIndicator OPTIONAL, + reRegRequiredIndicator [11] ReRegRequiredIndicator OPTIONAL } -- See clause 6.2.2.2.4 for details of this structure @@ -313,7 +862,9 @@ AMFLocationUpdate ::= SEQUENCE pEI [3] PEI OPTIONAL, gPSI [4] GPSI OPTIONAL, gUTI [5] FiveGGUTI OPTIONAL, - location [6] Location + location [6] Location, + sMSOverNASIndicator [7] SMSOverNASIndicator OPTIONAL, + oldGUTI [8] EPS5GGUTI OPTIONAL } -- See clause 6.2.2.2.5 for details of this structure @@ -330,7 +881,10 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE location [9] Location OPTIONAL, non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, timeOfRegistration [11] Timestamp OPTIONAL, - fiveGSTAIList [12] TAIList OPTIONAL + fiveGSTAIList [12] TAIList OPTIONAL, + sMSOverNASIndicator [13] SMSOverNASIndicator OPTIONAL, + oldGUTI [14] EPS5GGUTI OPTIONAL, + eMM5GRegStatus [15] EMM5GMMStatus OPTIONAL } -- See clause 6.2.2.2.6 for details of this structure @@ -638,6 +1192,8 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE -- 5G SMF parameters -- ================= +SMFID ::= UTF8String + SMFFailedProcedureType ::= ENUMERATED { pDUSessionEstablishment(1), @@ -680,10 +1236,10 @@ SMFMAAcceptedIndication ::= BOOLEAN -- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure. SMFErrorCodes ::= UTF8String --- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. +-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. UEEPSPDNConnection ::= OCTET STRING --- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. +-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. RequestIndication ::= ENUMERATED { uEREQPDUSESMOD(0), @@ -726,7 +1282,7 @@ QFI ::= INTEGER (0..63) -- 5G UDM definitions -- ================== -UDMServingSystemMessage ::= SEQUENCE +UDMServingSystemMessage ::= SEQUENCE { sUPI [1] SUPI, pEI [2] PEI OPTIONAL, @@ -952,7 +1508,7 @@ MMSSendByNonLocalTarget ::= SEQUENCE dRMContent [23] BOOLEAN OPTIONAL, adaptationAllowed [24] MMSAdaptation OPTIONAL } - + MMSNotification ::= SEQUENCE { transactionID [1] UTF8String, @@ -968,7 +1524,7 @@ MMSNotification ::= SEQUENCE expiry [11] MMSExpiry, replyCharging [12] MMSReplyCharging OPTIONAL } - + MMSSendToNonLocalTarget ::= SEQUENCE { version [1] MMSVersion, @@ -1022,7 +1578,7 @@ MMSRetrieval ::= SEQUENCE state [12] MMState OPTIONAL, flags [13] MMFlags OPTIONAL, messageClass [14] MMSMessageClass OPTIONAL, - priority [15] MMSPriority, + priority [15] MMSPriority, deliveryReport [16] BOOLEAN OPTIONAL, readReport [17] BOOLEAN OPTIONAL, replyCharging [18] MMSReplyCharging OPTIONAL, @@ -1056,7 +1612,7 @@ MMSForward ::= SEQUENCE cCRecipients [6] SEQUENCE OF MMSParty OPTIONAL, bCCRecipients [7] SEQUENCE OF MMSParty OPTIONAL, direction [8] MMSDirection, - expiry [9] MMSExpiry OPTIONAL, + expiry [9] MMSExpiry OPTIONAL, desiredDeliveryTime [10] Timestamp OPTIONAL, deliveryReportAllowed [11] BOOLEAN OPTIONAL, deliveryReport [12] BOOLEAN OPTIONAL, @@ -1068,10 +1624,10 @@ MMSForward ::= SEQUENCE responseStatus [18] MMSResponseStatus, responseStatusText [19] UTF8String OPTIONAL, messageID [20] UTF8String OPTIONAL, - contentLocationConf [21] UTF8String OPTIONAL, + contentLocationConf [21] UTF8String OPTIONAL, storeStatus [22] MMSStoreStatus OPTIONAL, storeStatusText [23] UTF8String OPTIONAL -} +} MMSDeleteFromRelay ::= SEQUENCE { @@ -1089,13 +1645,13 @@ MMSMBoxStore ::= SEQUENCE transactionID [1] UTF8String, version [2] MMSVersion, direction [3] MMSDirection, - contentLocationReq [4] UTF8String, + contentLocationReq [4] UTF8String, state [5] MMState OPTIONAL, flags [6] MMFlags OPTIONAL, - contentLocationConf [7] UTF8String OPTIONAL, + contentLocationConf [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL -} +} MMSMBoxUpload ::= SEQUENCE { @@ -1105,11 +1661,11 @@ MMSMBoxUpload ::= SEQUENCE state [4] MMState OPTIONAL, flags [5] MMFlags OPTIONAL, contentType [6] UTF8String, - contentLocation [7] UTF8String OPTIONAL, + contentLocation [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL, mMessages [10] SEQUENCE OF MMBoxDescription -} +} MMSMBoxDelete ::= SEQUENCE { @@ -1189,7 +1745,7 @@ MMSCancel ::= SEQUENCE version [2] MMSVersion, cancelID [3] UTF8String, direction [4] MMSDirection -} +} MMSMBoxViewRequest ::= SEQUENCE { @@ -1246,7 +1802,7 @@ MMBoxDescription ::= SEQUENCE -- ========= -- MMS CCPDU -- ========= - + MMSCCPDU ::= SEQUENCE { version [1] MMSVersion, @@ -1312,7 +1868,7 @@ MMSDeleteResponseStatus ::= ENUMERATED errorPermanentReplyChargingNotSupported(24), errorPermanentAddressHidingNotSupported(25), errorPermanentLackOfPrepaid(26) -} +} MMSDirection ::= ENUMERATED { @@ -1327,13 +1883,13 @@ MMSElementDescriptor ::= SEQUENCE value [3] UTF8String OPTIONAL } -MMSExpiry ::= SEQUENCE +MMSExpiry ::= SEQUENCE { expiryPeriod [1] INTEGER, - periodFormat [2] MMSPeriodFormat + periodFormat [2] MMSPeriodFormat } -MMFlags ::= SEQUENCE +MMFlags ::= SEQUENCE { length [1] INTEGER, flag [2] MMStateFlag, @@ -1363,7 +1919,7 @@ MMSPartyID ::= CHOICE iMPI [5] IMPI, sUPI [6] SUPI, gPSI [7] GPSI -} +} MMSPeriodFormat ::= ENUMERATED { @@ -1511,7 +2067,7 @@ MMSVersion ::= SEQUENCE { majorVersion [1] INTEGER, minorVersion [2] INTEGER -} +} -- ================== -- 5G PTC definitions @@ -1568,7 +2124,7 @@ PTCSessionEnd ::= SEQUENCE pTCDirection [2] Direction, pTCServerURI [3] UTF8String, pTCSessionInfo [4] PTCSessionInfo, - pTCParticipants [5] SEQUENCE OF PTCTargetInformation OPTIONAL, + pTCParticipants [5] SEQUENCE OF PTCTargetInformation OPTIONAL, location [6] Location OPTIONAL, pTCSessionEndCause [7] PTCSessionEndCause } @@ -1578,7 +2134,7 @@ PTCStartOfInterception ::= SEQUENCE pTCTargetInformation [1] PTCTargetInformation, pTCDirection [2] Direction, preEstSessionID [3] PTCSessionInfo OPTIONAL, - pTCOriginatingID [4] PTCTargetInformation, + pTCOriginatingID [4] PTCTargetInformation, pTCSessionInfo [5] PTCSessionInfo OPTIONAL, pTCHost [6] PTCTargetInformation OPTIONAL, pTCParticipants [7] SEQUENCE OF PTCTargetInformation OPTIONAL, @@ -1748,7 +2304,7 @@ PTCIdentifiers ::= CHOICE PTCSessionInfo ::= SEQUENCE { - pTCSessionURI [1] UTF8String, + pTCSessionURI [1] UTF8String, pTCSessionType [2] PTCSessionType } @@ -1792,7 +2348,7 @@ RTPSetting ::= SEQUENCE PTCIDList ::= SEQUENCE { pTCPartyID [1] PTCTargetInformation, - pTCChatGroupID [2] PTCChatGroupID + pTCChatGroupID [2] PTCChatGroupID } PTCChatGroupID ::= SEQUENCE @@ -1897,7 +2453,7 @@ PTCAccessPolicyFailure ::= ENUMERATED { requestUnsuccessful(1), requestUnknown(2) -} +} -- =================== -- 5G LALS definitions @@ -1906,9 +2462,12 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, - pEI [2] PEI OPTIONAL, +-- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, - location [4] Location OPTIONAL + location [4] Location OPTIONAL, + iMPU [5] IMPU OPTIONAL, + iMSI [7] IMSI OPTIONAL, + mSISDN [8] MSISDN OPTIONAL } -- ===================== @@ -1917,7 +2476,7 @@ LALSReport ::= SEQUENCE PDHeaderReport ::= SEQUENCE { - pDUSessionID [1] PDUSessionID, + pDUSessionID [1] PDUSessionID, sourceIPAddress [2] IPAddress, sourcePort [3] PortNumber OPTIONAL, destinationIPAddress [4] IPAddress, @@ -1987,14 +2546,6 @@ MMEIdentifierAssocation ::= SEQUENCE -- Identifier Association parameters -- ================================= -GUTI ::= SEQUENCE -{ - mCC [1] MCC, - mNC [2] MNC, - mMEGroupID [3] MMEGroupID, - mMECode [4] MMECode, - mTMSI [5] TMSI -} MMEGroupID ::= OCTET STRING (SIZE(2)) @@ -2002,6 +2553,144 @@ MMECode ::= OCTET STRING (SIZE(1)) TMSI ::= OCTET STRING (SIZE(4)) +-- =================== +-- EPS MME definitions +-- =================== + +MMEAttach ::= SEQUENCE +{ + attachType [1] EPSAttachType, + attachResult [2] EPSAttachResult, + iMSI [3] IMSI, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + location [7] Location OPTIONAL, + ePSTAIList [8] TAIList OPTIONAL, + sMSServiceStatus [9] EPSSMSServiceStatus OPTIONAL, + oldGUTI [10] GUTI OPTIONAL, + eMM5GRegStatus [11] EMM5GMMStatus OPTIONAL +} + +MMEDetach ::= SEQUENCE +{ + detachDirection [1] MMEDirection, + detachType [2] EPSDetachType, + iMSI [3] IMSI, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + cause [7] EMMCause OPTIONAL, + location [8] Location OPTIONAL, + switchOffIndicator [9] SwitchOffIndicator OPTIONAL +} + +MMELocationUpdate ::= SEQUENCE +{ + iMSI [1] IMSI, + iMEI [2] IMEI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + gUTI [4] GUTI OPTIONAL, + location [5] Location OPTIONAL, + oldGUTI [6] GUTI OPTIONAL, + sMSServiceStatus [7] EPSSMSServiceStatus OPTIONAL +} + +MMEStartOfInterceptionWithEPSAttachedUE ::= SEQUENCE +{ + attachType [1] EPSAttachType, + attachResult [2] EPSAttachResult, + iMSI [3] IMSI, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + location [7] Location OPTIONAL, + ePSTAIList [9] TAIList OPTIONAL, + sMSServiceStatus [10] EPSSMSServiceStatus OPTIONAL, + eMM5GRegStatus [12] EMM5GMMStatus OPTIONAL +} + +MMEUnsuccessfulProcedure ::= SEQUENCE +{ + failedProcedureType [1] MMEFailedProcedureType, + failureCause [2] MMEFailureCause, + iMSI [3] IMSI OPTIONAL, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + location [7] Location OPTIONAL +} + +-- ================== +-- EPS MME parameters +-- ================== + +EMMCause ::= INTEGER (0..255) + +ESMCause ::= INTEGER (0..255) + +EPSAttachType ::= ENUMERATED +{ + ePSAttach(1), + combinedEPSIMSIAttach(2), + ePSRLOSAttach(3), + ePSEmergencyAttach(4), + reserved(5) +} + +EPSAttachResult ::= ENUMERATED +{ + ePSOnly(1), + combinedEPSIMSI(2) +} + + +EPSDetachType ::= ENUMERATED +{ + ePSDetach(1), + iMSIDetach(2), + combinedEPSIMSIDetach(3), + reAttachRequired(4), + reAttachNotRequired(5), + reserved(6) +} + +EPSSMSServiceStatus ::= ENUMERATED +{ + sMSServicesNotAvailable(1), + sMSServicesNotAvailableInThisPLMN(2), + networkFailure(3), + congestion(4) +} + +MMEDirection ::= ENUMERATED +{ + networkInitiated(1), + uEInitiated(2) +} + +MMEFailedProcedureType ::= ENUMERATED +{ + attachReject(1), + authenticationReject(2), + securityModeReject(3), + serviceReject(4), + trackingAreaUpdateReject(5), + activateDedicatedEPSBearerContextReject(6), + activateDefaultEPSBearerContextReject(7), + bearerResourceAllocationReject(8), + bearerResourceModificationReject(9), + modifyEPSBearerContectReject(10), + pDNConnectivityReject(11), + pDNDisconnectReject(12) +} + +MMEFailureCause ::= CHOICE +{ + eMMCause [1] EMMCause, + eSMCause [2] ESMCause +} + -- =========================== -- LI Notification definitions -- =========================== @@ -2040,6 +2729,36 @@ LIAppliedDeliveryInformation ::= SEQUENCE MDFCellSiteReport ::= SEQUENCE OF CellInformation +-- ============================== +-- 5G EPS Interworking Parameters +-- ============================== + + +EMM5GMMStatus ::= SEQUENCE +{ + eMMRegStatus [1] EMMRegStatus OPTIONAL, + fiveGMMStatus [2] FiveGMMStatus OPTIONAL +} + + +EPS5GGUTI ::= CHOICE +{ + gUTI [1] GUTI, + fiveGGUTI [2] FiveGGUTI +} + +EMMRegStatus ::= ENUMERATED +{ + uEEMMRegistered(1), + uENotEMMRegistered(2) +} + +FiveGMMStatus ::= ENUMERATED +{ + uE5GMMRegistered(1), + uENot5GMMRegistered(2) +} + -- ================= -- Common Parameters -- ================= @@ -2116,6 +2835,15 @@ GUMMEI ::= SEQUENCE mNC [3] MNC } +GUTI ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC, + mMEGroupID [3] MMEGroupID, + mMECode [4] MMECode, + mTMSI [5] TMSI +} + HomeNetworkPublicKeyID ::= OCTET STRING HSMFURI ::= UTF8String @@ -2239,6 +2967,12 @@ RejectedSNSSAI ::= SEQUENCE RejectedSliceCauseValue ::= INTEGER (0..255) +ReRegRequiredIndicator ::= ENUMERATED +{ + reRegistrationRequired(1), + reRegistrationNotRequired(2) +} + RoutingIndicator ::= INTEGER (0..9999) SchemeOutput ::= OCTET STRING @@ -2254,6 +2988,13 @@ Slice ::= SEQUENCE SMPDUDNRequest ::= OCTET STRING +-- TS 24.501 [13], clause 9.11.3.6.1 +SMSOverNASIndicator ::= ENUMERATED +{ + sMSOverNASNotAllowed(1), + sMSOverNASAllowed(2) +} + SNSSAI ::= SEQUENCE { sliceServiceType [1] INTEGER (0..255), @@ -2278,6 +3019,12 @@ SUPI ::= CHOICE SUPIUnauthenticatedIndication ::= BOOLEAN +SwitchOffIndicator ::= ENUMERATED +{ + normalDetach(1), + switchOff(2) +} + TargetIdentifier ::= CHOICE { sUPI [1] SUPI, @@ -2317,9 +3064,10 @@ UEEndpointAddress ::= CHOICE Location ::= SEQUENCE { - locationInfo [1] LocationInfo OPTIONAL, - positioningInfo [2] PositioningInfo OPTIONAL, - locationPresenceReport [3] LocationPresenceReport OPTIONAL + locationInfo [1] LocationInfo OPTIONAL, + positioningInfo [2] PositioningInfo OPTIONAL, + locationPresenceReport [3] LocationPresenceReport OPTIONAL, + ePSLocationInfo [4] EPSLocationInfo OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -2333,7 +3081,7 @@ CellSiteInformation ::= SEQUENCE LocationInfo ::= SEQUENCE { userLocation [1] UserLocation OPTIONAL, - currentLoc [2] BOOLEAN OPTIONAL, + currentLoc [2] BOOLEAN OPTIONAL, geoInfo [3] GeographicArea OPTIONAL, rATType [4] RATType OPTIONAL, timeZone [5] TimeZone OPTIONAL, @@ -2353,10 +3101,10 @@ EUTRALocation ::= SEQUENCE { tAI [1] TAI, eCGI [2] ECGI, - ageOfLocatonInfo [3] INTEGER OPTIONAL, + ageOfLocationInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, - geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalNGENbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL, globalENbID [9] GlobalRANNodeID OPTIONAL @@ -2367,10 +3115,10 @@ NRLocation ::= SEQUENCE { tAI [1] TAI, nCGI [2] NCGI, - ageOfLocatonInfo [3] INTEGER OPTIONAL, + ageOfLocationInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalGNbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL } @@ -2379,9 +3127,15 @@ NRLocation ::= SEQUENCE N3GALocation ::= SEQUENCE { tAI [1] TAI OPTIONAL, - n3IWFID [2] N3IWFIDNGAP OPTIONAL, + n3IWFID [2] N3IWFIDNGAP OPTIONAL, uEIPAddr [3] IPAddr OPTIONAL, - portNumber [4] INTEGER OPTIONAL + portNumber [4] INTEGER OPTIONAL, + tNAPID [5] TNAPID OPTIONAL, + tWAPID [6] TWAPID OPTIONAL, + hFCNodeID [7] HFCNodeID OPTIONAL, + gLI [8] GLI OPTIONAL, + w5GBANLineType [9] W5GBANLineType OPTIONAL, + gCI [10] GCI OPTIONAL } -- TS 38.413 [23], clause 9.3.2.4 @@ -2404,7 +3158,9 @@ ANNodeID ::= CHOICE n3IWFID [1] N3IWFIDSBI, gNbID [2] GNbID, nGENbID [3] NGENbID, - eNbID [4] ENbID + eNbID [4] ENbID, + wAGFID [5] WAGFID, + tNGFID [6] TNGFID } -- TS 38.413 [23], clause 9.3.1.6 @@ -2418,6 +3174,31 @@ TAI ::= SEQUENCE nID [3] NID OPTIONAL } +CGI ::= SEQUENCE +{ + lAI [1] LAI, + cellID [2] CellID +} + +LAI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + lAC [2] LAC +} + +LAC ::= OCTET STRING (SIZE(2)) + +CellID ::= OCTET STRING (SIZE(2)) + +SAI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + lAC [2] LAC, + sAC [3] SAC +} + +SAC ::= OCTET STRING (SIZE(2)) + -- TS 29.571 [17], clause 5.4.4.5 ECGI ::= SEQUENCE { @@ -2442,7 +3223,7 @@ RANCGI ::= CHOICE nCGI [2] NCGI } -CellInformation ::= SEQUENCE +CellInformation ::= SEQUENCE { rANCGI [1] RANCGI, cellSiteinformation [2] CellSiteInformation OPTIONAL, @@ -2455,6 +3236,51 @@ N3IWFIDNGAP ::= BIT STRING (SIZE(16)) -- TS 29.571 [17], clause 5.4.4.28 N3IWFIDSBI ::= UTF8String +-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1 +TNGFID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.28 and table 5.4.2-1 +WAGFID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.62 +TNAPID ::= SEQUENCE +{ + sSID [1] SSID OPTIONAL, + bSSID [2] BSSID OPTIONAL, + civicAddress [3] CivicAddressBytes OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.64 +TWAPID ::= SEQUENCE +{ + sSID [1] SSID OPTIONAL, + bSSID [2] BSSID OPTIONAL, + civicAddress [3] CivicAddressBytes OPTIONAL +} + +-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64 +SSID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.62 and clause 5.4.4.64 +BSSID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.36 and table 5.4.2-1 +HFCNodeID ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1 +-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed +GLI ::= OCTET STRING (SIZE(0..150)) + +-- TS 29.571 [17], clause 5.4.4.10 and table 5.4.2-1 +GCI ::= UTF8String + +-- TS 29.571 [17], clause 5.4.4.10 and clause 5.4.3.33 +W5GBANLineType ::= ENUMERATED +{ + dSL(1), + pON(2) +} + -- TS 29.571 [17], table 5.4.2-1 TAC ::= OCTET STRING (SIZE(2..3)) @@ -2488,12 +3314,12 @@ ENbID ::= CHOICE PositioningInfo ::= SEQUENCE { positionInfo [1] LocationData OPTIONAL, - rawMLPResponse [2] RawMLPResponse OPTIONAL + rawMLPResponse [2] RawMLPResponse OPTIONAL } RawMLPResponse ::= CHOICE { - -- The following parameter contains a copy of unparsed XML code of the + -- The following parameter contains a copy of unparsed XML code of the -- MLP response message, i.e. the entire XML document containing -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message. @@ -2518,6 +3344,25 @@ LocationData ::= SEQUENCE barometricPressure [11] BarometricPressure OPTIONAL } +-- TS 29.172 [53], table 6.2.2-2 +EPSLocationInfo ::= SEQUENCE +{ + locationData [1] LocationData, + cGI [2] CGI OPTIONAL, + sAI [3] SAI OPTIONAL, + eSMLCCellInfo [4] ESMLCCellInfo OPTIONAL +} + +-- TS 29.172 [53], clause 7.4.57 +ESMLCCellInfo ::= SEQUENCE +{ + eCGI [1] ECGI, + cellPortionID [2] CellPortionID +} + +-- TS 29.171 [54], clause 7.4.31 +CellPortionID ::= INTEGER (0..4095) + -- TS 29.518 [22], clause 6.2.6.2.5 LocationPresenceReport ::= SEQUENCE { @@ -2674,6 +3519,10 @@ CivicAddress ::= SEQUENCE pom [31] UTF8String OPTIONAL } +-- TS 29.571 [17], clauses 5.4.4.62 and 5.4.4.64 +-- Contains the original binary data i.e. value of the YAML field after base64 encoding is removed +CivicAddressBytes ::= OCTET STRING + -- TS 29.572 [24], clause 6.1.6.2.15 PositioningMethodAndUsage ::= SEQUENCE { @@ -2789,7 +3638,7 @@ HorizontalVelocityWithUncertainty ::= SEQUENCE -- TS 29.572 [24], clause 6.1.6.2.21 HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE { - hspeed [1] HorizontalSpeed, + hSpeed [1] HorizontalSpeed, bearing [2] Angle, vSpeed [3] VerticalSpeed, vDirection [4] VerticalDirection, @@ -2797,7 +3646,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE vUncertainty [6] SpeedUncertainty } --- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 +-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 Altitude ::= UTF8String Angle ::= INTEGER (0..360) Uncertainty ::= INTEGER (0..127) @@ -2877,4 +3726,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index da7b1b01b98d5dc25a803380d3f6895fca6affd6..4764bc745cbb3c5fea4bd39143fe164a04ff73a8 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ @@ -87,6 +87,7 @@ + @@ -113,4 +114,107 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd new file mode 100644 index 0000000000000000000000000000000000000000..96f3da73e84b4809d90e9a8b2555c8cc2e58788a --- /dev/null +++ b/33128/r17/urn_3GPP_ns_li_3GPPStateTransfer.xsd @@ -0,0 +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 20e67843d527f533a7d4a6dcc5ecc6ed997411e9..bb8de4325f0736ef81c2aa4a3d88cb63de311e0c 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -245,4 +245,4 @@ - + \ No newline at end of file diff --git a/testing/check_xsd.py b/testing/check_xsd.py index 70cf11fc50534cbc1f69acba0245aa983184d5ab..bbe8a72afa4824f409a90941af00fe244addc42f 100644 --- a/testing/check_xsd.py +++ b/testing/check_xsd.py @@ -1,5 +1,5 @@ import logging - +logging.basicConfig(level=logging.INFO) import glob import sys from pathlib import Path @@ -60,9 +60,7 @@ def ValidateXSDFiles (fileList): def ValidateAllXSDFilesInPath (path): - globPattern = str(Path(path)) + '/*.xsd' - logging.info("Searching: " + globPattern) - schemaGlob = glob.glob(globPattern, recursive=True) + schemaGlob = [str(f) for f in Path(path).rglob("*.xsd")] return ValidateXSDFiles(schemaGlob) diff --git a/testing/dependencies/xsd/TS_103_221_01_v010801.xsd b/testing/dependencies/xsd/TS_103_221_01_v010801.xsd new file mode 100644 index 0000000000000000000000000000000000000000..2cf5206327d992c5f46c749e1cbc4b176f61e05b --- /dev/null +++ b/testing/dependencies/xsd/TS_103_221_01_v010801.xsd @@ -0,0 +1,790 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testing/dependencies/xsd/TS_103_280_v020401.xsd b/testing/dependencies/xsd/TS_103_280_v020401.xsd new file mode 100644 index 0000000000000000000000000000000000000000..e5c0bdea3682e1962175e2c84bd36a09a20ae821 --- /dev/null +++ b/testing/dependencies/xsd/TS_103_280_v020401.xsd @@ -0,0 +1,239 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +