From 254776843c747ec84e0784ef4e49c726f2083e84 Mon Sep 17 00:00:00 2001 From: Luke Mewburn Date: Wed, 28 Sep 2022 16:04:11 +1000 Subject: [PATCH] TS 33.128 CR0415 - XIRIEvent vs IRIEvent consistency Improve consistency in describing XIRIEvent and IRIEvent. Refer to the specific xIRI versus IRI clause. Fix whitespace alignment and inter-event blank lines. Rename IRIEvent fields to have the same name as XIRIEvent: unsuccessfulAMProcedure[5] unsuccessfulSMProcedure[10] uDMLocationInformationResult[108] --- 33128/r18/TS33128Payloads.asn | 124 +++++++++++++++++----------------- 1 file changed, 61 insertions(+), 63 deletions(-) diff --git a/33128/r18/TS33128Payloads.asn b/33128/r18/TS33128Payloads.asn index 7904e094..2783c29b 100644 --- a/33128/r18/TS33128Payloads.asn +++ b/33128/r18/TS33128Payloads.asn @@ -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, @@ -227,37 +225,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 +276,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 +296,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 +329,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 +343,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 +360,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, -- GitLab