diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c54d13097bf4d808ae1d7dd2b4b551c86df80e22..4786e7f9e0ad3df33d04f95daf635d83643d5fb2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,19 @@ workflow: - if: $CI_COMMIT_BRANCH stages: + - preflight - check - build +preflight: + image: "forge.3gpp.org:5050/sa3/li/forgelib" + stage: preflight + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + interruptible: true + script: + - forgelib-preflight https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_MERGE_REQUEST_IID + process_asn: image: "forge.3gpp.org:5050/sa3/li/asn1test:latest" stage: check @@ -24,7 +34,7 @@ process_xsd: - python3 testing/xsd_process.py generate_artefacts: - image: "forge.3gpp.org:5050/sa3/li/artefacts:latest" + image: "forge.3gpp.org:5050/sa3/li/forgelib" stage: build interruptible: true rules: diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 6576c098961d79b55661c2e2f7236a7aea5b0869..4daebfb143938918b97de3256cf90afb680ece77 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) version11(11)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version12(12)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version11(11)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version12(12)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -254,7 +254,15 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, + + -- In Rel-17 and newer (threeGPP(4) ts33128(19) r17(17) version1(1)), + -- tag 4 is nIDDCCPDU and tag 5 is pTCCCPDU. + -- Rel-16 decoders should not decode tag 4 contents as PTCCCPDU if + -- r17 or newer is used in cCPayloadOID. pTCCCPDU [4] PTCCCPDU + + -- Tag 5 is reserved for pTCCCPDU in Rel-17 and newer. + } -- =========================== diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 1304ee377f4ad5586c008855debf20ff46c6a267..701f84cacecd06be7a06dbf89cf183f10862d47c 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) r17(17) version5(5)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version6(6)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version5(5)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version6(6)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -190,7 +190,12 @@ XIRIEvent ::= CHOICE positioningInfoTransfer [111] AMFPositioningInfoTransfer, -- MME Events, see clause 6.3.2.2.8 - mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer + mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, + + -- Tags 113 to 131 are not used in this version of the specification + + -- AMF events, see 6.2.2.2.9, continued from tag 111 + aMFUEConfigurationUpdate [132] AMFUEConfigurationUpdate } -- ============== @@ -373,7 +378,12 @@ IRIEvent ::= CHOICE positioningInfoTransfer [111] AMFPositioningInfoTransfer, -- MME Events, see clause 6.3.2.2.8 - mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer + mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, + + -- Tags 113 to 131 are not used in this version of the specification + + -- AMF events, see 6.2.2.3, continued from tag 111 + aMFUEConfigurationUpdate [132] AMFUEConfigurationUpdate } IRITargetIdentifier ::= SEQUENCE @@ -397,8 +407,14 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, + + -- In Rel-16 (threeGPP(4) ts33128(19) r16(16) version9(9)), + -- tag 4 is pTCCCPDU and tag 5 is not used. + -- Rel-17 or newer decoders should decode tag 4 contents as PTCCCPDU if + -- r16 is used in cCPayloadOID. nIDDCCPDU [4] NIDDCCPDU, pTCCCPDU [5] PTCCCPDU, + iMSCCPDU [6] IMSCCPDU } @@ -1232,6 +1248,19 @@ AMFPositioningInfoTransfer ::= SEQUENCE lcsCorrelationId [8] UTF8String (SIZE(1..255)) } +--See clause 6.2.2.2.9 on for details of this structure +AMFUEConfigurationUpdate ::= SEQUENCE +{ + userIdentifiers [1] UserIdentifiers, + gUTI [2] GUTI, + oldGUTI [3] EPS5GGUTI OPTIONAL, + fiveGSTAIList [4] TAIList OPTIONAL, + slice [5] Slice OPTIONAL, + serviceAreaList [6] ServiceAreaList OPTIONAL, + registrationResult [7] AMFRegistrationResult OPTIONAL, + sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL +} + -- ================= -- 5G AMF parameters -- ================= @@ -1286,6 +1315,9 @@ AMFRegistrationType ::= ENUMERATED AMFSetID ::= INTEGER (0..1023) +-- TS 24.501 [13], clause 9.11.3.49 +ServiceAreaList ::= OCTET STRING (SIZE(4..112)) + -- ================== -- 5G SMF definitions -- ================== @@ -1425,80 +1457,83 @@ SMFUnsuccessfulProcedure ::= SEQUENCE -- See clause 6.2.3.2.8 for details of this structure SMFPDUtoMAPDUSessionModification ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - sNSSAI [5] SNSSAI OPTIONAL, - non3GPPAccessEndpoint [6] UEEndpointAddress OPTIONAL, - location [7] Location OPTIONAL, - requestType [8] FiveGSMRequestType, - accessType [9] AccessType OPTIONAL, - rATType [10] RATType OPTIONAL, - pDUSessionID [11] PDUSessionID, - requestIndication [12] RequestIndication, - aTSSSContainer [13] ATSSSContainer, - uEEndpoint [14] UEEndpointAddress OPTIONAL, - servingNetwork [15] SMFServingNetwork OPTIONAL, - handoverState [16] HandoverState OPTIONAL, - gTPTunnelInfo [17] GTPTunnelInfo OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + sNSSAI [5] SNSSAI OPTIONAL, + non3GPPAccessEndpoint [6] UEEndpointAddress OPTIONAL, + location [7] Location OPTIONAL, + requestType [8] FiveGSMRequestType, + accessType [9] AccessType OPTIONAL, + rATType [10] RATType OPTIONAL, + pDUSessionID [11] PDUSessionID, + requestIndication [12] RequestIndication, + aTSSSContainer [13] ATSSSContainer, + uEEndpoint [14] UEEndpointAddress OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + handoverState [16] HandoverState OPTIONAL, + gTPTunnelInfo [17] GTPTunnelInfo OPTIONAL, + ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL } -- See clause 6.2.3.2.7.1 for details of this structure SMFMAPDUSessionEstablishment ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - pDUSessionType [6] PDUSessionType, - accessInfo [7] SEQUENCE OF AccessInfo, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, - location [10] Location OPTIONAL, - dNN [11] DNN, - aMFID [12] AMFID OPTIONAL, - hSMFURI [13] HSMFURI OPTIONAL, - requestType [14] FiveGSMRequestType, - sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, - servingNetwork [16] SMFServingNetwork, - oldPDUSessionID [17] PDUSessionID OPTIONAL, - mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, - ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, - mAAcceptedIndication [20] SMFMAAcceptedIndication, - aTSSSContainer [21] ATSSSContainer OPTIONAL, - uEEPSPDNConnection [22] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [23] EPS5GSComboInfo OPTIONAL, - selectedDNN [24] DNN OPTIONAL, - handoverState [25] HandoverState OPTIONAL, - pCCRules [26] PCCRuleSet OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + pDUSessionType [6] PDUSessionType, + accessInfo [7] SEQUENCE OF AccessInfo, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + location [10] Location OPTIONAL, + dNN [11] DNN, + aMFID [12] AMFID OPTIONAL, + hSMFURI [13] HSMFURI OPTIONAL, + requestType [14] FiveGSMRequestType, + sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, + servingNetwork [16] SMFServingNetwork, + oldPDUSessionID [17] PDUSessionID OPTIONAL, + mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, + ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, + mAAcceptedIndication [20] SMFMAAcceptedIndication, + aTSSSContainer [21] ATSSSContainer OPTIONAL, + uEEPSPDNConnection [22] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [23] EPS5GSComboInfo OPTIONAL, + selectedDNN [24] DNN OPTIONAL, + handoverState [25] HandoverState OPTIONAL, + pCCRules [26] PCCRuleSet OPTIONAL, + ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL } -- See clause 6.2.3.2.7.2 for details of this structure SMFMAPDUSessionModification ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - accessInfo [6] SEQUENCE OF AccessInfo OPTIONAL, - sNSSAI [7] SNSSAI OPTIONAL, - location [8] Location OPTIONAL, - requestType [9] FiveGSMRequestType OPTIONAL, - servingNetwork [10] SMFServingNetwork, - oldPDUSessionID [11] PDUSessionID OPTIONAL, - mAUpgradeIndication [12] SMFMAUpgradeIndication OPTIONAL, - ePSPDNCnxInfo [13] SMFEPSPDNCnxInfo OPTIONAL, - mAAcceptedIndication [14] SMFMAAcceptedIndication, - aTSSSContainer [15] ATSSSContainer OPTIONAL, - uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, - handoverState [18] HandoverState OPTIONAL, - pCCRules [19] PCCRuleSet OPTIONAL, - uPPathChange [20] UPPathChange OPTIONAL, - pFDDataForApp [21] PFDDataForApp OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + accessInfo [6] SEQUENCE OF AccessInfo OPTIONAL, + sNSSAI [7] SNSSAI OPTIONAL, + location [8] Location OPTIONAL, + requestType [9] FiveGSMRequestType OPTIONAL, + servingNetwork [10] SMFServingNetwork, + oldPDUSessionID [11] PDUSessionID OPTIONAL, + mAUpgradeIndication [12] SMFMAUpgradeIndication OPTIONAL, + ePSPDNCnxInfo [13] SMFEPSPDNCnxInfo OPTIONAL, + mAAcceptedIndication [14] SMFMAAcceptedIndication, + aTSSSContainer [15] ATSSSContainer OPTIONAL, + uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, + handoverState [18] HandoverState OPTIONAL, + pCCRules [19] PCCRuleSet OPTIONAL, + uPPathChange [20] UPPathChange OPTIONAL, + pFDDataForApp [21] PFDDataForApp OPTIONAL, + ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL } -- See clause 6.2.3.2.7.3 for details of this structure @@ -1516,37 +1551,39 @@ SMFMAPDUSessionRelease ::= SEQUENCE cause [10] SMFErrorCodes OPTIONAL, nGAPCause [11] NGAPCauseInt OPTIONAL, fiveGMMCause [12] FiveGMMCause OPTIONAL, - pCCRuleIDs [13] PCCRuleIDSet OPTIONAL + pCCRuleIDs [13] PCCRuleIDSet OPTIONAL, + ePSPDNConnectionRelease [14] EPSPDNConnectionRelease OPTIONAL } -- See clause 6.2.3.2.7.4 for details of this structure SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - pDUSessionType [6] PDUSessionType, - accessInfo [7] SEQUENCE OF AccessInfo, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, - location [10] Location OPTIONAL, - dNN [11] DNN, - aMFID [12] AMFID OPTIONAL, - hSMFURI [13] HSMFURI OPTIONAL, - requestType [14] FiveGSMRequestType OPTIONAL, - sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, - servingNetwork [16] SMFServingNetwork, - oldPDUSessionID [17] PDUSessionID OPTIONAL, - mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, - ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, - mAAcceptedIndication [20] SMFMAAcceptedIndication, - aTSSSContainer [21] ATSSSContainer OPTIONAL, - ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, - uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL, - pFDDataForApps [25] PFDDataForApps OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + pDUSessionType [6] PDUSessionType, + accessInfo [7] SEQUENCE OF AccessInfo, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + location [10] Location OPTIONAL, + dNN [11] DNN, + aMFID [12] AMFID OPTIONAL, + hSMFURI [13] HSMFURI OPTIONAL, + requestType [14] FiveGSMRequestType OPTIONAL, + sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, + servingNetwork [16] SMFServingNetwork, + oldPDUSessionID [17] PDUSessionID OPTIONAL, + mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, + ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, + mAAcceptedIndication [20] SMFMAAcceptedIndication, + aTSSSContainer [21] ATSSSContainer OPTIONAL, + ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, + uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, + pCCRules [24] PCCRuleSet OPTIONAL, + pFDDataForApps [25] PFDDataForApps OPTIONAL, + ePSStartOfInterceptionWithEstablishedPDNConnection [26] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL } -- See clause 6.2.3.2.7.5 for details of this structure @@ -4065,6 +4102,19 @@ FiveGGUTI ::= SEQUENCE fiveGTMSI [6] FiveGTMSI } +FiveGSSubscriberID ::= CHOICE +{ + sUPI [1] SUPI, + sUCI [2] SUCI, + pEI [3] PEI, + gPSI [4] GPSI +} + +FiveGSSubscriberIDs ::= SEQUENCE +{ + fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID +} + FiveGMMCause ::= INTEGER (0..255) FiveGSMRequestType ::= ENUMERATED @@ -4427,6 +4477,12 @@ UEEndpointAddress ::= CHOICE ethernetAddress [3] MACAddress } +UserIdentifiers ::= SEQUENCE +{ + fiveGSSubscriberIDs [1] FiveGSSubscriberIDs OPTIONAL, + ePSSubscriberIDs [2] EPSSubscriberIDs OPTIONAL +} + -- =================== -- Location parameters -- =================== diff --git a/33128/r18/TS33128Dictionaries.xml b/33128/r18/TS33128Dictionaries.xml new file mode 100644 index 0000000000000000000000000000000000000000..da5d2ea8787f16d66b56631a1e9e5230ca854139 --- /dev/null +++ b/33128/r18/TS33128Dictionaries.xml @@ -0,0 +1,34 @@ + + + + 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 + + + + + diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 95a474f32b01f627ae891968b6cea316d76f6da5..eae52be1390b0c7a95f66beaf7d0c596976daca2 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) version1(1)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version2(2)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version1(1)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version2(2)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -29,36 +29,36 @@ XIRIPayload ::= SEQUENCE XIRIEvent ::= CHOICE { - -- Access and mobility related events, see clause 6.2.2 + -- AMF events, see clause 6.2.2.2 registration [1] AMFRegistration, deregistration [2] AMFDeregistration, locationUpdate [3] AMFLocationUpdate, startOfInterceptionWithRegisteredUE [4] AMFStartOfInterceptionWithRegisteredUE, unsuccessfulAMProcedure [5] AMFUnsuccessfulProcedure, - -- PDU session-related events, see clause 6.2.3 + -- SMF events, see clause 6.2.3.2 pDUSessionEstablishment [6] SMFPDUSessionEstablishment, pDUSessionModification [7] SMFPDUSessionModification, pDUSessionRelease [8] SMFPDUSessionRelease, startOfInterceptionWithEstablishedPDUSession [9] SMFStartOfInterceptionWithEstablishedPDUSession, unsuccessfulSMProcedure [10] SMFUnsuccessfulProcedure, - -- Subscriber-management related events, see clause 7.2.2 + -- UDM events, see clause 7.2.2.3 servingSystemMessage [11] UDMServingSystemMessage, - -- SMS-related events, see clause 6.2.5, see also sMSReport ([56] below) + -- SMS events, see clause 6.2.5.2 sMSMessage [12] SMSMessage, - -- LALS-related events, see clause 7.3.1 + -- LALS events, see clause 7.3.1.4 lALSReport [13] LALSReport, - -- PDHR/PDSR-related events, see clause 6.2.3.4.1 + -- PDHR/PDSR events, see clauses 6.2.3.5 and 6.2.3.9 pDHeaderReport [14] PDHeaderReport, pDSummaryReport [15] PDSummaryReport, - -- tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent + -- Tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent. - -- MMS-related events, see clause 7.4.2 + -- MMS events, see clause 7.4.3 mMSSend [17] MMSSend, mMSSendByNonLocalTarget [18] MMSSendByNonLocalTarget, mMSNotification [19] MMSNotification, @@ -79,7 +79,7 @@ XIRIEvent ::= CHOICE mMSMBoxViewRequest [34] MMSMBoxViewRequest, mMSMBoxViewResponse [35] MMSMBoxViewResponse, - -- PTC-related events, see clause 7.5.2 + -- PTC events, see clause 7.5.2 pTCRegistration [36] PTCRegistration, pTCSessionInitiation [37] PTCSessionInitiation, pTCSessionAbandon [38] PTCSessionAbandon, @@ -99,14 +99,14 @@ XIRIEvent ::= CHOICE pTCListManagement [52] PTCListManagement, pTCAccessPolicy [53] PTCAccessPolicy, - -- More Subscriber-management related events, see clause 7.2.2 + -- UDM events, see clause 7.2.2.3, continued from tag 11 subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, cancelLocationMessage [55] UDMCancelLocationMessage, - -- SMS-related events continued from choice 12 + -- SMS events, see clause 6.2.5.2, continued from tag 12 sMSReport [56] SMSReport, - -- MA PDU session-related events, see clause 6.2.3.2.7 + -- SMF MA PDU session events, see clause 6.2.3.2.7 sMFMAPDUSessionEstablishment [57] SMFMAPDUSessionEstablishment, sMFMAPDUSessionModification [58] SMFMAPDUSessionModification, sMFMAPDUSessionRelease [59] SMFMAPDUSessionRelease, @@ -117,10 +117,10 @@ XIRIEvent ::= CHOICE aMFIdentifierAssociation [62] AMFIdentifierAssociation, mMEIdentifierAssociation [63] MMEIdentifierAssociation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + -- SMF PDU to MA PDU session events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, - -- NEF services related events, see clause 7.7.2 + -- NEF events, see clause 7.7.2.1 nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, nEFPDUSessionModification [66] NEFPDUSessionModification, nEFPDUSessionRelease [67] NEFPDUSessionRelease, @@ -133,7 +133,7 @@ XIRIEvent ::= CHOICE nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, - -- SCEF services related events, see clause 7.8.2 + -- SCEF events, see clause 7.8.2.1 sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, @@ -146,16 +146,14 @@ XIRIEvent ::= CHOICE sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, - -- EPS Events, see clause 6.3 - - -- MME Events, see clause 6.3.2.2 + -- MME events, see clause 6.3.2.2 mMEAttach [87] MMEAttach, mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, - -- AKMA key management events, see clause 7.9.1 + -- AKMA key management events, see clauses 7.9.1.3 and 7.9.1.4 aAnFAnchorKeyRegister [92] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [93] AAnFKAKMAApplicationKeyGet, aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [94] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, @@ -165,14 +163,14 @@ XIRIEvent ::= CHOICE aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment, aFApplicationKeyRemoval [99] AFApplicationKeyRemoval, - -- HR LI Events, see clause 7.10.3.3 + -- HR LI events, see clause 7.10.3.3 n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, s8HRBearerInfo [101] S8HRBearerInfo, - -- Separated Location Reporting, see clause 7.3.4 + -- Separated Location Reporting, see clause 7.3.4.1 separatedLocationReporting [102] SeparatedLocationReporting, - -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.2 + -- STIR SHAKEN and RCD/eCNAM events, see clause 7.11.2 sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation, @@ -181,18 +179,18 @@ XIRIEvent ::= CHOICE startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession, iMSCCUnavailable [107] IMSCCUnavailable, - -- UDM events, see clause 7.2.2 + -- UDM events, see clause 7.2.2.3, continued from tag 55 uDMLocationInformationResult [108] UDMLocationInformationResult, uDMUEInformationResponse [109] UDMUEInformationResponse, uDMUEAuthenticationResponse [110] UDMUEAuthenticationResponse, - -- AMF events, see 6.2.2.2.8 + -- AMF events, see 6.2.2.2.8, continued from tag 5 positioningInfoTransfer [111] AMFPositioningInfoTransfer, - -- MME Events, see clause 6.3.2.2.8 + -- MME events, see clause 6.3.2.2.8, continued from tag 91 mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, - -- AMF events, see 6.2.2.2.9 continued from choice 5 + -- AMF events, see 6.2.2.2.9, continued from tag 111 aMFRANHandoverCommand [113] AMFRANHandoverCommand, aMFRANHandoverRequest [114] AMFRANHandoverRequest, @@ -205,7 +203,26 @@ XIRIEvent ::= CHOICE eESACRSubscription [120] EESACRSubscription, eESACRNotification [121] EESACRNotification, eESEECContextRelocation [122] EESEECContextRelocation, - eESStartOfInterceptionWithRegisteredEEC [123] EESStartOfInterceptionWithRegisteredEEC + eESStartOfInterceptionWithRegisteredEEC [123] EESStartOfInterceptionWithRegisteredEEC, + + -- UDM events, see clause 7.2.2.3, continued from tag 110 + uDMStartOfInterceptionWithRegisteredTarget [124] UDMStartOfInterceptionWithRegisteredTarget, + + -- 5GMS AF events, see clause 7.15.2 + fiveGMSAFServiceAccessInformation [125] FiveGMSAFServiceAccessInformation, + fiveGMSAFConsumptionReporting [126] FiveGMSAFConsumptionReporting, + fiveGMSAFDynamicPolicyInvocation [127] FiveGMSAFDynamicPolicyInvocation, + fiveGMSAFMetricsReporting [128] FiveGMSAFMetricsReporting, + fiveGMSAFNetworkAssistance [129] FiveGMSAFNetworkAssistance, + fiveGMSAFUnsuccessfulProcedure [130] FiveGMSAFUnsuccessfulProcedure, + fiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE [131] FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE, + + --AMF events, see 6.2.2.2.10, continued from tag 114 + aMFUEConfigurationUpdate [132] AMFUEConfigurationUpdate, + + -- HSS events, see clause 7.2.3.3 + hSSServingSystemMessage [133] HSSServingSystemMessage, + hSSStartOfInterceptionWithRegisteredTarget [134] HSSStartOfInterceptionWithRegisteredTarget } -- ============== @@ -227,37 +244,37 @@ IRIPayload ::= SEQUENCE IRIEvent ::= CHOICE { - -- Registration-related events, see clause 6.2.2 + -- AMF events, see clause 6.2.2.3 registration [1] AMFRegistration, deregistration [2] AMFDeregistration, locationUpdate [3] AMFLocationUpdate, startOfInterceptionWithRegisteredUE [4] AMFStartOfInterceptionWithRegisteredUE, - unsuccessfulRegistrationProcedure [5] AMFUnsuccessfulProcedure, + unsuccessfulAMProcedure [5] AMFUnsuccessfulProcedure, - -- PDU session-related events, see clause 6.2.3 + -- SMF events, see clause 6.2.3.7 pDUSessionEstablishment [6] SMFPDUSessionEstablishment, pDUSessionModification [7] SMFPDUSessionModification, pDUSessionRelease [8] SMFPDUSessionRelease, startOfInterceptionWithEstablishedPDUSession [9] SMFStartOfInterceptionWithEstablishedPDUSession, - unsuccessfulSessionProcedure [10] SMFUnsuccessfulProcedure, + unsuccessfulSMProcedure [10] SMFUnsuccessfulProcedure, - -- Subscriber-management related events, see clause 7.2.2 + -- UDM events, see clause 7.2.2.4 servingSystemMessage [11] UDMServingSystemMessage, - -- SMS-related events, see clause 6.2.5, see also sMSReport ([56] below) + -- SMS events, see clause 6.2.5.4 sMSMessage [12] SMSMessage, - -- LALS-related events, see clause 7.3.1 + -- LALS events, see clause 7.3.1.5 lALSReport [13] LALSReport, - -- PDHR/PDSR-related events, see clause 6.2.3.4.1 + -- PDHR/PDSR events, see clause 6.2.3.9 pDHeaderReport [14] PDHeaderReport, pDSummaryReport [15] PDSummaryReport, - -- MDF-related events, see clause 7.3.2 + -- MDF events, see clause 7.3.2.2 mDFCellSiteReport [16] MDFCellSiteReport, - -- MMS-related events, see clause 7.4.2 + -- MMS events, see clause 7.4.4.1 mMSSend [17] MMSSend, mMSSendByNonLocalTarget [18] MMSSendByNonLocalTarget, mMSNotification [19] MMSNotification, @@ -278,7 +295,7 @@ IRIEvent ::= CHOICE mMSMBoxViewRequest [34] MMSMBoxViewRequest, mMSMBoxViewResponse [35] MMSMBoxViewResponse, - -- PTC-related events, see clause 7.5.2 + -- PTC events, see clauses 7.5.2 and 7.5.3.1 pTCRegistration [36] PTCRegistration, pTCSessionInitiation [37] PTCSessionInitiation, pTCSessionAbandon [38] PTCSessionAbandon, @@ -298,28 +315,28 @@ IRIEvent ::= CHOICE pTCListManagement [52] PTCListManagement, pTCAccessPolicy [53] PTCAccessPolicy, - -- More Subscriber-management related events, see clause 7.2.2 - subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, - cancelLocationMessage [55] UDMCancelLocationMessage, + -- UDM events, see clause 7.2.2.4, continued from tag 11 + subscriberRecordChangeMessage [54] UDMSubscriberRecordChangeMessage, + cancelLocationMessage [55] UDMCancelLocationMessage, - -- SMS-related events, continued from choice 12 + -- SMS events, see clause 6.2.5.4, continued from tag 12 sMSReport [56] SMSReport, - -- MA PDU session-related events, see clause 6.2.3.2.7 + -- SMF MA PDU session events, see clause 6.2.3.7 sMFMAPDUSessionEstablishment [57] SMFMAPDUSessionEstablishment, sMFMAPDUSessionModification [58] SMFMAPDUSessionModification, sMFMAPDUSessionRelease [59] SMFMAPDUSessionRelease, startOfInterceptionWithEstablishedMAPDUSession [60] SMFStartOfInterceptionWithEstablishedMAPDUSession, 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, + -- Identifier Association events, see clauses 6.2.2.3 and 6.3.2.3 + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + -- SMF PDU to MA PDU session events, see clause 6.2.3.7 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, - -- NEF services related events, see clause 7.7.2, + -- NEF events, see clause 7.7.2.3 nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, nEFPDUSessionModification [66] NEFPDUSessionModification, nEFPDUSessionRelease [67] NEFPDUSessionRelease, @@ -331,7 +348,8 @@ IRIEvent ::= CHOICE nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, - -- SCEF services related events, see clause 7.8.2 + + -- SCEF events, see clause 7.8.2.3 sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, @@ -344,16 +362,14 @@ IRIEvent ::= CHOICE sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, - -- EPS Events, see clause 6.3 - - -- MME Events, see clause 6.3.2.2 + -- MME events, see clause 6.3.2.3 mMEAttach [87] MMEAttach, mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, - -- AKMA key management events, see clause 7.9.1 + -- AKMA key management events, see clause 7.9.1.5 aAnFAnchorKeyRegister [92] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [93] AAnFKAKMAApplicationKeyGet, aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [94] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, @@ -363,36 +379,37 @@ IRIEvent ::= CHOICE aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment, aFApplicationKeyRemoval [99] AFApplicationKeyRemoval, - -- tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent. - -- tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent. - -- Separated Location Reporting, see clause 7.3.4 + -- Tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent. + -- Tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent. + + -- Separated Location Reporting, see clause 7.3.4.1 separatedLocationReporting [102] SeparatedLocationReporting, - -- STIR SHAKEN and RCD/eCNAM Events, see clause 7.11.3 + -- STIR SHAKEN and RCD/eCNAM events, see clause 7.11.3 sTIRSHAKENSignatureGeneration [103] STIRSHAKENSignatureGeneration, sTIRSHAKENSignatureValidation [104] STIRSHAKENSignatureValidation, - -- IMS events, see clause 7.11.4.2 + -- IMS events, see clause 7.12.7 iMSMessage [105] IMSMessage, startOfInterceptionForActiveIMSSession [106] StartOfInterceptionForActiveIMSSession, iMSCCUnavailable [107] IMSCCUnavailable, - -- UDM events, see clause 7.2.2 - uDMLocationInformationResultRecord [108] UDMLocationInformationResult, + -- UDM events, see clause 7.2.2.4, continued from tag 55 + uDMLocationInformationResult [108] UDMLocationInformationResult, uDMUEInformationResponse [109] UDMUEInformationResponse, uDMUEAuthenticationResponse [110] UDMUEAuthenticationResponse, - -- AMF events, see 6.2.2.2.8 + -- AMF events, see 6.2.2.3, continued from tag 5 positioningInfoTransfer [111] AMFPositioningInfoTransfer, - -- MME Events, see clause 6.3.2.2.8 + -- MME events, see clause 6.3.2.3, continued from tag 91 mMEPositioningInfoTransfer [112] MMEPositioningInfoTransfer, - -- AMF events, see 6.2.2.2.9 continued from choice 5 + -- AMF events, see 6.2.2.3, continued from tag 111 aMFRANHandoverCommand [113] AMFRANHandoverCommand, aMFRANHandoverRequest [114] AMFRANHandoverRequest, - -- EES events, see clause 7.14.2 + -- EES events, see clause 7.14.2.11 eESEECRegistration [115] EESEECRegistration, eESEASDiscovery [116] EESEASDiscovery, eESEASDiscoverySubscription [117] EESEASDiscoverySubscription, @@ -401,7 +418,26 @@ IRIEvent ::= CHOICE eESACRSubscription [120] EESACRSubscription, eESACRNotification [121] EESACRNotification, eESEECContextRelocation [122] EESEECContextRelocation, - eESStartOfInterceptionWithRegisteredEEC [123] EESStartOfInterceptionWithRegisteredEEC + eESStartOfInterceptionWithRegisteredEEC [123] EESStartOfInterceptionWithRegisteredEEC, + + -- UDM events, see clause 7.2.2.4, continued from tag 110 + uDMStartOfInterceptionWithRegisteredTarget [124] UDMStartOfInterceptionWithRegisteredTarget, + + -- 5GMS AF events, see clause 7.15.3 + fiveGMSAFServiceAccessInformation [125] FiveGMSAFServiceAccessInformation, + fiveGMSAFConsumptionReporting [126] FiveGMSAFConsumptionReporting, + fiveGMSAFDynamicPolicyInvocation [127] FiveGMSAFDynamicPolicyInvocation, + fiveGMSAFMetricsReporting [128] FiveGMSAFMetricsReporting, + fiveGMSAFNetworkAssistance [129] FiveGMSAFNetworkAssistance, + fiveGMSAFUnsuccessfulProcedure [130] FiveGMSAFUnsuccessfulProcedure, + fiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE [131] FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE, + + --AMF events, see 6.2.2.3, continued from tag 114 + aMFUEConfigurationUpdate [132] AMFUEConfigurationUpdate, + + -- HSS events, see clause 7.2.3.4 + hSSServingSystemMessage [133] HSSServingSystemMessage, + hSSStartOfInterceptionWithRegisteredTarget [134] HSSStartOfInterceptionWithRegisteredTarget } IRITargetIdentifier ::= SEQUENCE @@ -425,8 +461,14 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, + + -- In Rel-16 (threeGPP(4) ts33128(19) r16(16) version9(9)), + -- tag 4 is pTCCCPDU and tag 5 is not used. + -- Rel-17 or newer decoders should decode tag 4 contents as PTCCCPDU if + -- r16 is used in cCPayloadOID. nIDDCCPDU [4] NIDDCCPDU, pTCCCPDU [5] PTCCCPDU, + iMSCCPDU [6] IMSCCPDU } @@ -1287,6 +1329,19 @@ AMFRANHandoverRequest ::= SEQUENCE sourceToTargetContainer [11] RANSourceToTargetContainer } +--See clause 6.2.2.2.10 on for details of this structure +AMFUEConfigurationUpdate ::= SEQUENCE +{ + userIdentifiers [1] UserIdentifiers, + gUTI [2] GUTI, + oldGUTI [3] EPS5GGUTI OPTIONAL, + fiveGSTAIList [4] TAIList OPTIONAL, + slice [5] Slice OPTIONAL, + serviceAreaList [6] ServiceAreaList OPTIONAL, + registrationResult [7] AMFRegistrationResult OPTIONAL, + sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL +} + -- ================= -- 5G AMF parameters -- ================= @@ -1343,6 +1398,9 @@ AMFSetID ::= INTEGER (0..1023) AMFUENGAPID ::= INTEGER (0..1099511627775) +-- TS 24.501 [13], clause 9.11.3.49 +ServiceAreaList ::= OCTET STRING (SIZE(4..112)) + -- ================== -- 5G SMF definitions -- ================== @@ -1482,80 +1540,83 @@ SMFUnsuccessfulProcedure ::= SEQUENCE -- See clause 6.2.3.2.8 for details of this structure SMFPDUtoMAPDUSessionModification ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - sNSSAI [5] SNSSAI OPTIONAL, - non3GPPAccessEndpoint [6] UEEndpointAddress OPTIONAL, - location [7] Location OPTIONAL, - requestType [8] FiveGSMRequestType, - accessType [9] AccessType OPTIONAL, - rATType [10] RATType OPTIONAL, - pDUSessionID [11] PDUSessionID, - requestIndication [12] RequestIndication, - aTSSSContainer [13] ATSSSContainer, - uEEndpoint [14] UEEndpointAddress OPTIONAL, - servingNetwork [15] SMFServingNetwork OPTIONAL, - handoverState [16] HandoverState OPTIONAL, - gTPTunnelInfo [17] GTPTunnelInfo OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + sNSSAI [5] SNSSAI OPTIONAL, + non3GPPAccessEndpoint [6] UEEndpointAddress OPTIONAL, + location [7] Location OPTIONAL, + requestType [8] FiveGSMRequestType, + accessType [9] AccessType OPTIONAL, + rATType [10] RATType OPTIONAL, + pDUSessionID [11] PDUSessionID, + requestIndication [12] RequestIndication, + aTSSSContainer [13] ATSSSContainer, + uEEndpoint [14] UEEndpointAddress OPTIONAL, + servingNetwork [15] SMFServingNetwork OPTIONAL, + handoverState [16] HandoverState OPTIONAL, + gTPTunnelInfo [17] GTPTunnelInfo OPTIONAL, + ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL } -- See clause 6.2.3.2.7.1 for details of this structure SMFMAPDUSessionEstablishment ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - pDUSessionType [6] PDUSessionType, - accessInfo [7] SEQUENCE OF AccessInfo, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, - location [10] Location OPTIONAL, - dNN [11] DNN, - aMFID [12] AMFID OPTIONAL, - hSMFURI [13] HSMFURI OPTIONAL, - requestType [14] FiveGSMRequestType, - sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, - servingNetwork [16] SMFServingNetwork, - oldPDUSessionID [17] PDUSessionID OPTIONAL, - mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, - ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, - mAAcceptedIndication [20] SMFMAAcceptedIndication, - aTSSSContainer [21] ATSSSContainer OPTIONAL, - uEEPSPDNConnection [22] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [23] EPS5GSComboInfo OPTIONAL, - selectedDNN [24] DNN OPTIONAL, - handoverState [25] HandoverState OPTIONAL, - pCCRules [26] PCCRuleSet OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + pDUSessionType [6] PDUSessionType, + accessInfo [7] SEQUENCE OF AccessInfo, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + location [10] Location OPTIONAL, + dNN [11] DNN, + aMFID [12] AMFID OPTIONAL, + hSMFURI [13] HSMFURI OPTIONAL, + requestType [14] FiveGSMRequestType, + sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, + servingNetwork [16] SMFServingNetwork, + oldPDUSessionID [17] PDUSessionID OPTIONAL, + mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, + ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, + mAAcceptedIndication [20] SMFMAAcceptedIndication, + aTSSSContainer [21] ATSSSContainer OPTIONAL, + uEEPSPDNConnection [22] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [23] EPS5GSComboInfo OPTIONAL, + selectedDNN [24] DNN OPTIONAL, + handoverState [25] HandoverState OPTIONAL, + pCCRules [26] PCCRuleSet OPTIONAL, + ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL } -- See clause 6.2.3.2.7.2 for details of this structure SMFMAPDUSessionModification ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - accessInfo [6] SEQUENCE OF AccessInfo OPTIONAL, - sNSSAI [7] SNSSAI OPTIONAL, - location [8] Location OPTIONAL, - requestType [9] FiveGSMRequestType OPTIONAL, - servingNetwork [10] SMFServingNetwork, - oldPDUSessionID [11] PDUSessionID OPTIONAL, - mAUpgradeIndication [12] SMFMAUpgradeIndication OPTIONAL, - ePSPDNCnxInfo [13] SMFEPSPDNCnxInfo OPTIONAL, - mAAcceptedIndication [14] SMFMAAcceptedIndication, - aTSSSContainer [15] ATSSSContainer OPTIONAL, - uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, - ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, - handoverState [18] HandoverState OPTIONAL, - pCCRules [19] PCCRuleSet OPTIONAL, - uPPathChange [20] UPPathChange OPTIONAL, - pFDDataForApp [21] PFDDataForApp OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + accessInfo [6] SEQUENCE OF AccessInfo OPTIONAL, + sNSSAI [7] SNSSAI OPTIONAL, + location [8] Location OPTIONAL, + requestType [9] FiveGSMRequestType OPTIONAL, + servingNetwork [10] SMFServingNetwork, + oldPDUSessionID [11] PDUSessionID OPTIONAL, + mAUpgradeIndication [12] SMFMAUpgradeIndication OPTIONAL, + ePSPDNCnxInfo [13] SMFEPSPDNCnxInfo OPTIONAL, + mAAcceptedIndication [14] SMFMAAcceptedIndication, + aTSSSContainer [15] ATSSSContainer OPTIONAL, + uEEPSPDNConnection [16] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [17] EPS5GSComboInfo OPTIONAL, + handoverState [18] HandoverState OPTIONAL, + pCCRules [19] PCCRuleSet OPTIONAL, + uPPathChange [20] UPPathChange OPTIONAL, + pFDDataForApp [21] PFDDataForApp OPTIONAL, + ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL } -- See clause 6.2.3.2.7.3 for details of this structure @@ -1573,37 +1634,39 @@ SMFMAPDUSessionRelease ::= SEQUENCE cause [10] SMFErrorCodes OPTIONAL, nGAPCause [11] NGAPCauseInt OPTIONAL, fiveGMMCause [12] FiveGMMCause OPTIONAL, - pCCRuleIDs [13] PCCRuleIDSet OPTIONAL + pCCRuleIDs [13] PCCRuleIDSet OPTIONAL, + ePSPDNConnectionRelease [14] EPSPDNConnectionRelease OPTIONAL } -- See clause 6.2.3.2.7.4 for details of this structure SMFStartOfInterceptionWithEstablishedMAPDUSession ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, - pEI [3] PEI OPTIONAL, - gPSI [4] GPSI OPTIONAL, - pDUSessionID [5] PDUSessionID, - pDUSessionType [6] PDUSessionType, - accessInfo [7] SEQUENCE OF AccessInfo, - sNSSAI [8] SNSSAI OPTIONAL, - uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, - location [10] Location OPTIONAL, - dNN [11] DNN, - aMFID [12] AMFID OPTIONAL, - hSMFURI [13] HSMFURI OPTIONAL, - requestType [14] FiveGSMRequestType OPTIONAL, - sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, - servingNetwork [16] SMFServingNetwork, - oldPDUSessionID [17] PDUSessionID OPTIONAL, - mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, - ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, - mAAcceptedIndication [20] SMFMAAcceptedIndication, - aTSSSContainer [21] ATSSSContainer OPTIONAL, - ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, - uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, - pCCRules [24] PCCRuleSet OPTIONAL, - pFDDataForApps [25] PFDDataForApps OPTIONAL + sUPI [1] SUPI OPTIONAL, + sUPIUnauthenticated [2] SUPIUnauthenticatedIndication OPTIONAL, + pEI [3] PEI OPTIONAL, + gPSI [4] GPSI OPTIONAL, + pDUSessionID [5] PDUSessionID, + pDUSessionType [6] PDUSessionType, + accessInfo [7] SEQUENCE OF AccessInfo, + sNSSAI [8] SNSSAI OPTIONAL, + uEEndpoint [9] SEQUENCE OF UEEndpointAddress OPTIONAL, + location [10] Location OPTIONAL, + dNN [11] DNN, + aMFID [12] AMFID OPTIONAL, + hSMFURI [13] HSMFURI OPTIONAL, + requestType [14] FiveGSMRequestType OPTIONAL, + sMPDUDNRequest [15] SMPDUDNRequest OPTIONAL, + servingNetwork [16] SMFServingNetwork, + oldPDUSessionID [17] PDUSessionID OPTIONAL, + mAUpgradeIndication [18] SMFMAUpgradeIndication OPTIONAL, + ePSPDNCnxInfo [19] SMFEPSPDNCnxInfo OPTIONAL, + mAAcceptedIndication [20] SMFMAAcceptedIndication, + aTSSSContainer [21] ATSSSContainer OPTIONAL, + ePS5GSComboInfo [22] EPS5GSComboInfo OPTIONAL, + uEEPSPDNConnection [23] UEEPSPDNConnection OPTIONAL, + pCCRules [24] PCCRuleSet OPTIONAL, + pFDDataForApps [25] PFDDataForApps OPTIONAL, + ePSStartOfInterceptionWithEstablishedPDNConnection [26] EPSStartOfInterceptionWithEstablishedPDNConnection OPTIONAL } -- See clause 6.2.3.2.7.5 for details of this structure @@ -2330,7 +2393,9 @@ UDMCancelLocationMessage ::= SEQUENCE gPSI [3] GPSI OPTIONAL, gUAMI [4] GUAMI OPTIONAL, pLMNID [5] PLMNID OPTIONAL, - cancelLocationMethod [6] UDMCancelLocationMethod + cancelLocationMethod [6] UDMCancelLocationMethod, + aMFDeregistrationInfo [7] UDMAMFDeregistrationInfo OPTIONAL, + deregistrationData [8] UDMDeregistrationData OPTIONAL } UDMLocationInformationResult ::= SEQUENCE @@ -2365,6 +2430,13 @@ UDMUEAuthenticationResponse ::= SEQUENCE problemDetails [4] UDMProblemDetails OPTIONAL } +UDMStartOfInterceptionWithRegisteredTarget ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI OPTIONAL, + uDMSubscriptionDataSets [3] SBIType +} + -- ================= -- 5G UDM parameters -- ================= @@ -2469,6 +2541,31 @@ UDMInvalidParameters ::= SEQUENCE RoamingIndicator ::= BOOLEAN +UDMAMFDeregistrationInfo ::= SEQUENCE +{ + gUAMI [1] GUAMI, + purgeFlag [2] BOOLEAN +} + +UDMDeregistrationData ::= SEQUENCE +{ + deregReason [1] UDMDeregReason OPTIONAL, + accessType [2] AccessType OPTIONAL, + pDUSessionID [3] PDUSessionID OPTIONAL +} + +UDMDeregReason ::= ENUMERATED +{ + uEInitialRegistration(1), + uERegistrationAreaChange(2), + subscriptionWithdrawn(3), + fiveGSToEPSMobility(4), + fiveGSToEPSMobilityUeInitialRegistration(5), + reregistrationRequired(6), + sMFContextTransferred(7), + duplicatePDUSession(8), + fiveGSRVCCToUTRANMobility(9) +} -- =================== -- 5G SMSF definitions -- =================== @@ -4122,6 +4219,112 @@ EESEndpoint ::= SEQUENCE uRI [4] UTF8String OPTIONAL } +-- ================= +-- 5GMS AF definitions +-- ================= + +-- See clause 7.15.2.2 for details of this structure +FiveGMSAFServiceAccessInformation ::= SEQUENCE +{ + gPSI [1] GPSI, + serviceAccessInformationResource [2] SBIType +} + +-- See clause 7.15.2.3 for details of this structure +FiveGMSAFConsumptionReporting ::= SEQUENCE +{ + gPSI [1] GPSI, + consumptionReport [2] SBIType +} + +-- See clause 7.15.2.4 for details of this structure +FiveGMSAFDynamicPolicyInvocation ::= SEQUENCE +{ + gPSI [1] GPSI, + dynamicPolicyResource [2] SBIType, + dPIoperationType [3] DPIOperationType +} + +-- See clause 7.15.2.5 for details of this structure +FiveGMSAFMetricsReporting ::= SEQUENCE +{ + gPSI [1] GPSI, + metricsReport [2] XMLType +} + +-- See clause 7.15.2.6 for details of this structure +FiveGMSAFNetworkAssistance ::= SEQUENCE +{ + gPSI [1] GPSI, + networkAssistanceSessionResource [2] SBIType, + nAOperationType [3] NAOperationType +} + +-- See clause 7.15.2.7 for details of this structure +FiveGMSAFUnsuccessfulProcedure ::= SEQUENCE +{ + gPSI [1] GPSI, + fiveGMSAFUnsuccessfulOperation [2] FiveGMSAFUnsuccessfulOperation, + fiveGMSAFErrorCode [3] FiveGMSAFErrorCode +} + +-- See clause 7.15.2.8 for details of this structure +FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE ::= SEQUENCE +{ + gPSI [1] GPSI, + serviceAccessInformationResource [2] SBIType +} + +-- ============== +-- 5GMS AF parameters +-- ============== + +DPIOperationType ::= ENUMERATED +{ + createDynamicPolicy(1), + retrieveDynamicPolicy(2), + updateDynamicPolicy(3), + patchDynamicPolicy(4), + destroyDynamicPolicy(5) +} + +NAOperationType ::= ENUMERATED +{ + createNetworkAssistanceSession(1), + retrieveNetworkAssistanceSession(2), + updateNetworkAssistanceSession(3), + patchNetworkAssistanceSession(4), + destroyNetworkAssistanceSession(5), + requestBitRateRecommendation(6), + requestDeliveryBoost(7) +} + +FiveGMSAFUnsuccessfulOperation::= ENUMERATED +{ + retrieveServiceAccessInformation(1), + submitConsumptionReport(2), + submitMetricsReport(3), + createDynamicPolicy(4), + retrieveDynamicPolicy(5), + updateDynamicPolicy(6), + patchDynamicPolicy(7), + destroyDynamicPolicy(8), + createNetworkAssistanceSession(9), + retrieveNetworkAssistanceSession(10), + updateNetworkAssistanceSession(11), + patchNetworkAssistanceSession(12), + destroyNetworkAssistanceSession(13), + requestBitRateRecommendation(14), + requestDeliveryBoost(15) +} + +FiveGMSAFErrorCode ::=ENUMERATED +{ + badRequest400(1), + unauthorized401(2), + notFound404(3), + unsupportedMediaType415(4) +} -- =================== @@ -4457,6 +4660,37 @@ SeparatedLocationReporting ::= SEQUENCE rATType [8] RATType OPTIONAL } +-- ======================= +-- HSS definitions +-- ======================= + +HSSServingSystemMessage ::= SEQUENCE +{ + iMSI [1] IMSI, + oldPLMNID [2] PLMNID, + newPLMNID [3] PLMNID, + roamingIndicator [4] RoamingIndicator, + responseCodes [5] UTF8String +} + +HSSStartOfInterceptionWithRegisteredTarget ::= SEQUENCE +{ + hSSIdentities [1] HSSIdentities, + subscriptionDataSets [2] SubscriptionDataSets, + pSUserState [3] SBIType +} + +HSSIdentities ::= SEQUENCE +{ + ePSSubscriberIDs [1] EPSSubscriberIDs OPTIONAL, + iMSSubscriberIDs [2] IMSSubscriberIDs OPTIONAL +} + +SubscriptionDataSets ::= CHOICE +{ + iMSSubscriptionData [1] SBIType +} + -- ================= -- Common Parameters -- ================= @@ -4743,6 +4977,12 @@ IMSI ::= NumericString (SIZE(6..15)) IMSIUnauthenticatedIndication ::= BOOLEAN +IMSSubscriberIDs ::= CHOICE +{ + iMPI [1] IMPI, + iMPU [2] IMPU +} + Initiator ::= ENUMERATED { uE(1), @@ -4964,6 +5204,19 @@ ReRegRequiredIndicator ::= ENUMERATED RoutingIndicator ::= INTEGER (0..9999) +-- Details for the encoding and use of this parameter may be found in the clause +-- that defines the xIRI that carries it. This parameter provides a generic +-- mechanism to convey service based interface structures defined in Stage 3 working groups. +SBIType ::= SEQUENCE +{ + sBIReference [1] SBIReference, + sBIValue [2] SBIValue +} + +SBIReference ::= UTF8String + +SBIValue ::= UTF8String + SchemeOutput ::= OCTET STRING ServiceAreaInformation ::= SEQUENCE (SIZE(1..MAX)) OF ServiceAreaInfo @@ -5087,6 +5340,17 @@ UserIdentifiers ::= SEQUENCE ePSSubscriberIDs [2] EPSSubscriberIDs OPTIONAL } +XMLType ::= SEQUENCE +{ + xMLNamespace [1] XMLNamespace, + xMLValue [2] XMLValue +} + +XMLNamespace ::= UTF8String + +XMLValue ::= UTF8String + + -- =================== -- Location parameters -- =================== diff --git a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bef6ae33472a3901aac1733bf5624b2df090ddf7..788f1d1f5a109dcdd947e7dcf7a2ce7df77ea0c2 100644 --- a/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r18/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,8 +1,8 @@ @@ -89,6 +89,7 @@ + @@ -97,7 +98,8 @@ - + + @@ -371,4 +373,10 @@ + + + + + + diff --git a/README.md b/README.md index f28b74c24b7c740b8835bf20583f7b77ee0f061e..7eac37d3719bcd5edfbf4859f166f0a0d8497e99 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ -# 3GPP SA3-LI - Trial repository +# 3GPP SA3-LI Repository -Trial repository for the 3GPP SA3-LI working group. +Repository for the 3GPP SA3-LI working group. ## Guides and How-To -Visit the [Wiki](https://forge.etsi.org/rep/3GPP/SA3LI/wikis/home) for guides on how to: -* [Log in to the Forge](https://forge.etsi.org/rep/3GPP/SA3LI/wikis/Logging%20in%20to%20the%20Forge) -* [Join the project](https://forge.etsi.org/rep/3GPP/SA3LI/wikis/Joining%20a%20project) -* [Make a CR](https://forge.etsi.org/rep/3GPP/SA3LI/wikis/Making%20a%20CR) +Visit the [Wiki](https://forge.3gpp.org/rep/sa3/li/-/wikis/home) for guides on how to: +* [Log in to the Forge](https://forge.3gpp.org/rep/sa3/li/-/wikis/How-To/Log-in) +* [Join the project](https://forge.3gpp.org/rep/sa3/li/-/wikis/How-To/Join-a-project) +* [Make a CR](https://forge.3gpp.org/rep/sa3/li/-/wikis/How-To/Create-a-CR) Don't see a page on something you think should be documented? Then create one! ## Contribute to the discussion -Visit the [Issues](https://forge.etsi.org/rep/3GPP/SA3LI/issues) page and give +Visit the [Issues](https://forge.3gpp.org/rep/sa3/li/-/issues) page and give your thoughts and feedback on how we should use the Forge in SA3-LI. -Have a question that you don't see an Issue for? Then [create one](https://forge.etsi.org/rep/3GPP/SA3LI/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=)! +Have a question that you don't see an Issue for? Then [create one](https://forge.3gpp.org/rep/sa3/li/-/issues/new?issue%5Bmilestone_id%5D=)! ## Licence (c) 2019, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -All rights reserved. \ No newline at end of file +All rights reserved.