Commit 900f78fe authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents eb62ddea ae60a42d

33128/r18/TS33128Payloads.asn

+33 −2
Original line number Diff line number Diff line
@@ -226,7 +226,11 @@ XIRIEvent ::= CHOICE 


    --  NEF events, see clause 7.7.6.1

    nEFAFSessionWithQoSProvision                        [4600] NEFAFSessionWithQoSProvision,

    nEFAFSessionWithQoSNotification                     [4601] NEFAFSessionWithQoSNotification

    nEFAFSessionWithQoSNotification                     [4601] NEFAFSessionWithQoSNotification,



    -- SCEF events, see clause 7.8.6.1

    sCEFASSessionWithQoSProvision                       [4610] SCEFASSessionWithQoSProvision,

    sCEFASSessionWithQoSNotification                    [4611] SCEFASSessionWithQoSNotification

}



-- ==============
@@ -445,7 +449,11 @@ IRIEvent ::= CHOICE 


    -- NEF events, see clause 7.7.6.2

    nEFAFSessionWithQoSProvision                        [4600] NEFAFSessionWithQoSProvision,

    nEFAFSessionWithQoSNotification                     [4601] NEFAFSessionWithQoSNotification

    nEFAFSessionWithQoSNotification                     [4601] NEFAFSessionWithQoSNotification,



    -- SCEF events, see clause 7.8.6.2

    sCEFASSessionWithQoSProvision                       [4610] SCEFASSessionWithQoSProvision,

    sCEFASSessionWithQoSNotification                    [4611] SCEFASSessionWithQoSNotification

}



IRITargetIdentifier ::= SEQUENCE
@@ -879,6 +887,7 @@ AFID ::= UTF8String 


NEFID ::= UTF8String





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

-- SCEF definitions

-- ==================
@@ -1033,6 +1042,28 @@ SCEFCommunicationPatternUpdate ::= SEQUENCE 
    validityTime                          [14] Timestamp OPTIONAL

}



-- See clause 7.8.6.1.2 for details of this structure

SCEFASSessionWithQoSProvision ::= SEQUENCE

{

    mSISDN                               [1] MSISDN OPTIONAL,

    externalIdentifier                   [2] NAI OPTIONAL,

    sCSASID                              [3] SCSASID,

    aSSessionWithQoSOpType               [4] AForASSessionWithQoSOpType,

    aSSessionWithQoSSubscription         [5] SBIType OPTIONAL,

    aSSessionWithQoSSubscriptionPatch    [6] SBIType OPTIONAL,

    aSSessionWithQoSResponseCode         [7] AForASSessionWithQoSResponseCode

}



-- See clause 7.8.6.1.3 for details of this structure

SCEFASSessionWithQoSNotification ::= SEQUENCE

{

    mSISDN                               [1] MSISDN OPTIONAL,

    externalIdentifier                   [2] NAI OPTIONAL,

    sCSASID                              [3] SCSASID,

    userPlaneNotificationData            [4] SBIType,

    aSSessionWithQoSResponseCode         [5] AForASSessionWithQoSResponseCode

}



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

-- SCEF parameters

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