Commit 03d32733 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0750' into 'meeting/SA109'

TS 33.128 rel-18 CR0750 - Reporting Alternative NSSAI

See merge request !331
parents 06f892c8 c66cff18
Loading
Loading
Loading
Loading
Loading
+33 −12
Original line number Diff line number Diff line
@@ -1770,7 +1770,8 @@ AMFRegistration ::= SEQUENCE
    fiveGSUpdateType                [28] FiveGSUpdateType OPTIONAL,
    uEAreaIndication                [29] UEAreaIndication OPTIONAL,
    establishmentCauseNon3GPPAccess [30] EstablishmentCauseNon3GPPAccess OPTIONAL,
    additionalUserIdentifiers       [31] UserIdentifiers OPTIONAL
    additionalUserIdentifiers       [31] UserIdentifiers OPTIONAL,
    alternativeNSSAI                [32] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.2.2.3 for details of this structure
@@ -1844,7 +1845,8 @@ AMFUnsuccessfulProcedure ::= SEQUENCE
    gPSI                        [7] GPSI OPTIONAL,
    gUTI                        [8] FiveGGUTI OPTIONAL,
    location                    [9] Location OPTIONAL,
    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL
    additionalUserIdentifiers   [10] UserIdentifiers OPTIONAL,
    alternativeNSSAI            [11] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.2.2.8 on for details of this structure
@@ -1897,7 +1899,8 @@ AMFUEConfigurationUpdate ::= SEQUENCE
    slice               [5] Slice OPTIONAL,
    serviceAreaList     [6] ServiceAreaList OPTIONAL,
    registrationResult  [7] AMFRegistrationResult OPTIONAL,
    sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL
    sMSOverNASIndicator [8] SMSOverNASIndicator OPTIONAL,
    alternativeNSSAI    [9] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.2.2.10.2 for details of this structure
@@ -2309,7 +2312,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE
    pCCRules                      [26] PCCRuleSet OPTIONAL,
    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL,
    satelliteBackhaulCategory     [28] SBIType OPTIONAL,
    gEOSatelliteID                [29] GEOSatelliteID OPTIONAL
    gEOSatelliteID                [29] GEOSatelliteID OPTIONAL,
    alternativeNSSAI              [30] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.3 for details of this structure
@@ -2336,7 +2340,9 @@ SMFPDUSessionModification ::= SEQUENCE
    uPPathChange                [19] UPPathChange OPTIONAL,
    pFDDataForApp               [20] PFDDataForApp OPTIONAL,
    satelliteBackhaulCategory   [21] SBIType OPTIONAL,
    gEOSatelliteID              [22] GEOSatelliteID OPTIONAL
    gEOSatelliteID              [22] GEOSatelliteID OPTIONAL,
    -- Tag [23] is not used in this version of the specification
    alternativeNSSAI            [24] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.4 for details of this structure
@@ -2356,7 +2362,8 @@ SMFPDUSessionRelease ::= SEQUENCE
    nGAPCause                   [12] NGAPCauseInt OPTIONAL,
    fiveGMMCause                [13] FiveGMMCause OPTIONAL,
    pCCRuleIDs                  [14] PCCRuleIDSet OPTIONAL,
    ePSPDNConnectionRelease     [15] EPSPDNConnectionRelease OPTIONAL
    ePSPDNConnectionRelease     [15] EPSPDNConnectionRelease OPTIONAL,
    alternativeNSSAI            [16] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.5 for details of this structure
@@ -2414,7 +2421,8 @@ SMFUnsuccessfulProcedure ::= SEQUENCE
    rATType                     [17] RATType OPTIONAL,
    sMPDUDNRequest              [18] SMPDUDNRequest OPTIONAL,
    location                    [19] Location OPTIONAL,
    ePSPDNUnsuccessfulProcedure [20] EPSPDNUnsuccessfulProcedure OPTIONAL
    ePSPDNUnsuccessfulProcedure [20] EPSPDNUnsuccessfulProcedure OPTIONAL,
    alternativeNSSAI            [21] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.8 for details of this structure
@@ -2437,7 +2445,8 @@ SMFPDUtoMAPDUSessionModification ::= SEQUENCE
    servingNetwork               [15] SMFServingNetwork OPTIONAL,
    handoverState                [16] HandoverState OPTIONAL,
    gTPTunnelInfo                [17] GTPTunnelInfo OPTIONAL,
    ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL
    ePSPDNConnectionModification [18] EPSPDNConnectionModification OPTIONAL,
    alternativeNSSAI             [19] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.7.1 for details of this structure
@@ -2469,7 +2478,8 @@ SMFMAPDUSessionEstablishment ::= SEQUENCE
    selectedDNN                   [24] DNN OPTIONAL,
    handoverState                 [25] HandoverState OPTIONAL,
    pCCRules                      [26] PCCRuleSet OPTIONAL,
    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL
    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL,
    alternativeNSSAI              [28] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.7.2 for details of this structure
@@ -2496,7 +2506,8 @@ SMFMAPDUSessionModification ::= SEQUENCE
    pCCRules                     [19] PCCRuleSet OPTIONAL,
    uPPathChange                 [20] UPPathChange OPTIONAL,
    pFDDataForApp                [21] PFDDataForApp OPTIONAL,
    ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL
    ePSPDNConnectionModification [22] EPSPDNConnectionModification OPTIONAL,
    alternativeNSSAI             [23] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.7.3 for details of this structure
@@ -2515,7 +2526,8 @@ SMFMAPDUSessionRelease ::= SEQUENCE
    nGAPCause                   [11] NGAPCauseInt OPTIONAL,
    fiveGMMCause                [12] FiveGMMCause OPTIONAL,
    pCCRuleIDs                  [13] PCCRuleIDSet OPTIONAL,
    ePSPDNConnectionRelease     [14] EPSPDNConnectionRelease OPTIONAL
    ePSPDNConnectionRelease     [14] EPSPDNConnectionRelease OPTIONAL,
    alternativeNSSAI            [15] AlternativeNSSAIList OPTIONAL
}

-- See clause 6.2.3.2.7.4 for details of this structure
@@ -2568,7 +2580,8 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE
    aMFID                       [14] AMFID OPTIONAL,
    hSMFURI                     [15] HSMFURI OPTIONAL,
    requestType                 [16] FiveGSMRequestType OPTIONAL,
    sMPDUDNRequest              [17] SMPDUDNRequest OPTIONAL
    sMPDUDNRequest              [17] SMPDUDNRequest OPTIONAL,
    alternativeNSSAI            [18] AlternativeNSSAIList OPTIONAL
}


@@ -6308,6 +6321,14 @@ AllowedNSSAI ::= SEQUENCE OF NSSAI

AllowedTACs ::= SEQUENCE (SIZE(1..MAX)) OF TAC

AlternativeNSSAIEntry ::= SEQUENCE
{
    sNSSAIToBeReplaced [1] SNSSAI,
    alternativeSNSSAI  [2] SNSSAI
}

AlternativeNSSAIList ::= SEQUENCE (SIZE(1..8)) OF AlternativeNSSAIEntry

AreaOfInterest ::= SEQUENCE
{
    areaOfInterestTAIList     [1] AreaOfInterestTAIList OPTIONAL,
+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@
        "Tags 167-175 missing in XIRIEvent",
        "Tags 167-175 missing in IRIEvent",
        "Tags 182-185 missing in XIRIEvent",
        "Tags 182-185 missing in IRIEvent"
        "Tags 182-185 missing in IRIEvent",
        "Tag 23 missing in SMFPDUSessionModification"
    ],
    "33128/r19/TS33128Payloads.asn" : [
        "Tag 100 XIRIEvent field 'n9HRPDUSessionInfo' is not present in IRIEvent",