Merge branch 'cr/33128/0353' into 'cr/33128/0355'

    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    uEEPSPDNConnection          [19] UEEPSPDNConnection OPTIONAL,

    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL

    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL,

    selectedDNN                 [21] DNN OPTIONAL,

    servingNetwork              [22] SMFServingNetwork OPTIONAL,

    oldPDUSessionID             [23] PDUSessionID OPTIONAL,

    handoverState               [24] HandoverState OPTIONAL,

    gTPTunnelInfo               [25] GTPTunnelInfo

}

-- See clause 6.2.3.2.3 for details of this structure

    accessType                  [9] AccessType OPTIONAL,

    rATType                     [10] RATType OPTIONAL,

    pDUSessionID                [11] PDUSessionID OPTIONAL,

    ePS5GSComboInfo             [12] EPS5GSComboInfo OPTIONAL

    ePS5GSComboInfo             [12] EPS5GSComboInfo OPTIONAL,

    uEEndpoint                  [13] UEEndpointAddress OPTIONAL,

    servingNetwork              [14] SMFServingNetwork OPTIONAL,

    handoverState               [15] HandoverState OPTIONAL,

    gTPTunnelInfo               [16] GTPTunnelInfo

}

-- See clause 6.2.3.2.4 for details of this structure

    downlinkVolume              [8] INTEGER OPTIONAL,

    location                    [9] Location OPTIONAL,

    cause                       [10] SMFErrorCodes OPTIONAL,

    ePS5GSComboInfo             [11] EPS5GSComboInfo OPTIONAL

    ePS5GSComboInfo             [11] EPS5GSComboInfo OPTIONAL,

    nGAPCause                   [12] NGAPCauseInt OPTIONAL,

    fiveGMMCause                [13] FiveGMMCause OPTIONAL

}

-- See clause 6.2.3.2.5 for details of this structure

    rATType                     [17] RATType OPTIONAL,

    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,

    timeOfSessionEstablishment  [19] Timestamp OPTIONAL,

    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL

    ePS5GSComboInfo             [20] EPS5GSComboInfo OPTIONAL,

    uEEPSPDNConnection          [21] UEEPSPDNConnection OPTIONAL,

    servingNetwork              [22] SMFServingNetwork OPTIONAL,

    gTPTunnelInfo               [23] GTPTunnelInfo

}

-- See clause 6.2.3.2.6 for details of this structure

    rATType                     [10] RATType OPTIONAL,

    pDUSessionID                [11] PDUSessionID,

    requestIndication           [12] RequestIndication,

    aTSSSContainer              [13] ATSSSContainer

    aTSSSContainer              [13] ATSSSContainer,

    uEEndpoint                  [14] UEEndpointAddress OPTIONAL,

    servingNetwork              [15] SMFServingNetwork OPTIONAL,

    handoverState               [16] HandoverState OPTIONAL,

    gTPTunnelInfo               [17] GTPTunnelInfo

}

-- See clause 6.2.3.2.7.1 for details of this structure

    mAUpgradeIndication         [18] SMFMAUpgradeIndication OPTIONAL,

    ePSPDNCnxInfo               [19] SMFEPSPDNCnxInfo OPTIONAL,

    mAAcceptedIndication        [20] SMFMAAcceptedIndication,

    aTSSSContainer              [21] ATSSSContainer OPTIONAL

    aTSSSContainer              [21] ATSSSContainer OPTIONAL,

    uEEPSPDNConnection          [22] UEEPSPDNConnection OPTIONAL,

    ePS5GSComboInfo             [23] EPS5GSComboInfo OPTIONAL,

    selectedDNN                 [24] DNN OPTIONAL,

    handoverState               [25] HandoverState OPTIONAL

}

-- See clause 6.2.3.2.7.2 for details of this structure

    mAUpgradeIndication         [12] SMFMAUpgradeIndication OPTIONAL,

    ePSPDNCnxInfo               [13] SMFEPSPDNCnxInfo OPTIONAL,

    mAAcceptedIndication        [14] SMFMAAcceptedIndication,

    aTSSSContainer              [15] ATSSSContainer OPTIONAL

    aTSSSContainer              [15] ATSSSContainer OPTIONAL,

    uEEPSPDNConnection          [16] UEEPSPDNConnection OPTIONAL,

    ePS5GSComboInfo             [17] EPS5GSComboInfo OPTIONAL,

    handoverState               [18] HandoverState OPTIONAL

}

-- See clause 6.2.3.2.7.3 for details of this structure

    uplinkVolume                [7] INTEGER OPTIONAL,

    downlinkVolume              [8] INTEGER OPTIONAL,

    location                    [9] Location OPTIONAL,

    cause                       [10] SMFErrorCodes OPTIONAL

    cause                       [10] SMFErrorCodes OPTIONAL,

    nGAPCause                   [11] NGAPCauseInt OPTIONAL,

    fiveGMMCause                [12] FiveGMMCause OPTIONAL

}

-- See clause 6.2.3.2.7.4 for details of this structure

    mAUpgradeIndication         [18] SMFMAUpgradeIndication OPTIONAL,

    ePSPDNCnxInfo               [19] SMFEPSPDNCnxInfo OPTIONAL,

    mAAcceptedIndication        [20] SMFMAAcceptedIndication,

    aTSSSContainer              [21] ATSSSContainer OPTIONAL

    aTSSSContainer              [21] ATSSSContainer OPTIONAL,

    ePS5GSComboInfo             [22] EPS5GSComboInfo OPTIONAL,

    uEEPSPDNConnection          [23] UEEPSPDNConnection OPTIONAL

}

-- See clause 6.2.3.2.7.5 for details of this structure

    gTPTunnelID           [3] FTEID,

    non3GPPAccessEndpoint [4] UEEndpointAddress OPTIONAL,

    establishmentStatus   [5] EstablishmentStatus,

    aNTypeToReactivate    [6] AccessType OPTIONAL

    aNTypeToReactivate    [6] AccessType OPTIONAL,

    gTPTunnelInfo         [7] GTPTunnelInfo

}

-- see Clause 6.1.2 of TS 24.193[44] for the details of the ATSSS container contents.

ATSSSContainer ::= OCTET STRING

DLRANTunnelInformation ::= SEQUENCE

{

    dLQOSFlowTunnelInformation                    [1] QOSFlowTunnelInformation OPTIONAL,

    additionalDLQOSFlowTunnelInformation          [2] QOSFlowTunnelInformationList OPTIONAL,

    redundantDLQOSFlowTunnelInformation           [3] QOSFlowTunnelInformationList OPTIONAL,

    additionalredundantDLQOSFlowTunnelInformation [4] QOSFlowTunnelInformationList OPTIONAL

}

EstablishmentStatus ::= ENUMERATED

{

    established(0),

    released(1)

}

FiveGSGTPTunnels ::= SEQUENCE

{

    uLNGUUPTunnelInformation           [1] FTEID OPTIONAL,

    additionalULNGUUPTunnelInformation [2] FTEIDList OPTIONAL,

    dLRANTunnelInformation             [3] DLRANTunnelInformation OPTIONAL

}

FiveQI ::= INTEGER (0..255)

HandoverState ::= ENUMERATED

{

    none(1),

    preparing(2),

    prepared(3),

    completed(4),

    cancelled(5)

}

NGAPCauseInt ::= SEQUENCE

{

    group [1] NGAPCauseGroupInt,

    value [2] NGAPCauseValueInt

}

-- derived as described in TS 29.571 [17] clause 5.4.4.12

NGAPCauseGroupInt ::= INTEGER

NGAPCauseValueInt ::= INTEGER

SMFMAUpgradeIndication ::= BOOLEAN

-- Given in YAML encoding as defined in clause 6.1.6.2.31 of TS 29.502[16]

    rELDUETO5GANREQUEST(7)

}

QOSFlowTunnelInformation ::= SEQUENCE

{

    uPTunnelInformation   [1] FTEID,

    associatedQOSFlowList [2] QOSFlowLists

}

QOSFlowTunnelInformationList ::= SEQUENCE OF QOSFlowTunnelInformation

QOSFlowDescription ::= OCTET STRING

QOSFlowLists ::= SEQUENCE OF QOSFlowList

QOSFlowList ::= SEQUENCE

{

    qFI                      [1] QFI,

    qOSRules                 [2] QOSRules OPTIONAL,

    eBI                      [3] EPSBearerID OPTIONAL,

    qOSFlowDescription       [4] QOSFlowDescription OPTIONAL,

    qOSFlowProfile           [5] QOSFlowProfile OPTIONAL,

    associatedANType         [6] AccessType OPTIONAL,

    defaultQOSRuleIndication [7] BOOLEAN OPTIONAL

}

QOSFlowProfile ::= SEQUENCE

{

    fiveQI [1] FiveQI

}

QOSRules ::= OCTET STRING

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

-- PGW-C + SMF Parameters

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

}

QCI ::= INTEGER (0..255)

GTPTunnelInfo ::= SEQUENCE

{

    fiveGSGTPTunnels [1] FiveGSGTPTunnels OPTIONAL

}

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

-- 5G UPF definitions

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

    iPv6Address [3] IPv6Address OPTIONAL

}

FTEIDList ::= SEQUENCE OF FTEID

GPSI ::= CHOICE

{

    mSISDN      [1] MSISDN,