Commit 746b7401 authored by hawbakert's avatar hawbakert
Browse files

Merge branch 'cr/TS33128/AMFHODEV' into 'cr/33128/0344'

Cr/ts33128/AMFHODEV

See merge request !34
parents 329e5bc8 35dbab41
Loading
Loading
Loading
Loading
Loading
+444 −14
Original line number Diff line number Diff line
@@ -190,7 +190,11 @@ XIRIEvent ::= CHOICE
    positioningInfoTransfer                             [111] AMFPositioningInfoTransfer,

    -- MME Events, see clause 6.3.2.2.8
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,

    -- AMF events, see 6.2.2.2.X
    aMFRANHandoverCommandNotify                         [1000] AMFRANHandoverCommandNotify,
    aMFRANHandoverReequest                              [1001] AMFRANHandoverRequest
}

-- ==============
@@ -373,7 +377,11 @@ IRIEvent ::= CHOICE
    positioningInfoTransfer                             [111] AMFPositioningInfoTransfer,

    -- MME Events, see clause 6.3.2.2.8
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer
    mMEPositioningInfoTransfer                          [112] MMEPositioningInfoTransfer,

        -- AMF events, see 6.2.2.2.X
    aMFRANHandoverCommandNotify                         [1000] AMFRANHandoverCommandNotify,
    aMFRANHandoverReequest                              [1001] AMFRANHandoverRequest
}

IRITargetIdentifier ::= SEQUENCE
@@ -1230,6 +1238,53 @@ AMFPositioningInfoTransfer ::= SEQUENCE
    lcsCorrelationId            [8] UTF8String (SIZE(1..255))
}

-- See clause 6.2.2.2.X.2 for details of this structure
AMFRANHandoverCommandNotify ::= SEQUENCE
{
    userIdentifiers              [1] UserIdentifiers,
    aMFmessageType               [2] AMFMessageType,
    aMFUENGAPID                  [3] AMFUENGAPID,
    rANUENGAPID                  [4] RANUENGAPID,
    handoverType                 [5] HandoverType,
    nASSecurityParameters        [6] OCTET STRING OPTIONAL,
    targetToSourceContainer      [7] OCTET STRING,
    aMFProcedureCriticality      [8] AMFProcedureCriticality OPTIONAL,
    location                     [9] Location OPTIONAL
}

-- See clause 6.2.2.2.X.3 for details of this structure
AMFRANHandoverRequest ::= SEQUENCE
{
    userIdentifiers                     [1] UserIdentifiers,
    aMFmessageType                      [2] AMFMessageType,
    aMFUENGAPID                         [3] AMFUENGAPID,
    rANUENGAPID                         [4] RANUENGAPID,
    handoverType                        [5] HandoverType,
    handoverCause                       [6] HandoverCause,
    uEAMBR                              [7] BitRate,
    uESecurityCapabilities              [8] UESecurityCapabilities OPTIONAL,
    securityContext                     [9] SecurityContext,
    pDUSessionResouceInformation        [10] PDUSessionResourceInformation OPTIONAL,
    allowedNSSAI                        [11] AllowedNSSAI,
    aMFTraceActivation                  [12] AMFTraceActivation OPTIONAL,
    rANsourceToTargetContainer          [13] RANSourceToTargetContainer,
    mobilityRestrictionList             [14] MobilityRestrictionList OPTIONAL,
    locationReportingRequestType        [15] LocationReportingRequestType,
    gUAMI                               [16] GUAMI,
    voiceEPSFallback                    [17] VoiceEPSFallback OPTIONAL,
    sRVCCOperation                      [18] SRVCCOperation OPTIONAL,
    iABAuthorizedIndicator              [19] IABAuthorizedIndicator OPTIONAL,
    nRV2XAuthorizedIndicator            [20] NRV2XAuthorizedIndicator OPTIONAL,
    lTEV2XAuthorizedIndicator           [21] LTEV2XAuthorizedIndicator OPTIONAL,
    nRSidelinkAMBR                      [22] BitRate OPTIONAL,
    lTEUESidelinkAMBR                   [23] BitRate OPTIONAL,
    pC5QoSParameters                    [24] PC5QoSParameters OPTIONAL,
    mDTPLMNList                         [25] PLMNList OPTIONAL,
    uERadioCapability                   [26] UERadioCapability OPTIONAL,
    aMFhandoverRequestAcknowledge       [27] AMFHandoverRequestAcknowledge OPTIONAL,
    location                            [28] Location OPTIONAL
}

-- =================
-- 5G AMF parameters
-- =================
@@ -1260,8 +1315,34 @@ AMFFailureCause ::= CHOICE
    fiveGSMCause        [2] FiveGSMCause
}

AMFHandoverRequestAcknowledge ::= OCTET STRING

AMFIECriticality ::= ENUMERATED
{
    reject(1),
    ignore(2),
    notify(3)
}

AMFIEIdentifier ::= INTEGER (0..65535)

AMFMessageType ::= SEQUENCE
{
    aMFprocedureCode [1] AMFProcedureCode,
    typeOfMessage    [2] TypeOfMessage
}

AMFPointer ::= INTEGER (0..63)

AMFProcedureCode ::= INTEGER (0..255)

AMFProcedureCriticality ::= SEQUENCE
{
    aMFIECriticality     [1] AMFIECriticality,
    aMFIEIdentifier      [2] AMFIEIdentifier,
    typeOfError          [3] TypeOfError
}

AMFRegistrationResult ::= ENUMERATED
{
    threeGPPAccess(1),
@@ -1281,6 +1362,30 @@ AMFRegistrationType ::= ENUMERATED

AMFSetID ::= INTEGER (0..1023)

AMFTraceActivation ::= SEQUENCE
{
    nGRANTraceID                    [1] NGRANTraceID,
    interfacesToTrace               [2] InterfacesToTrace,
    aMFtraceDepth                   [3] AMFTraceDepth,
    traceCollectionEntityIPAddress  [4] IPAddress
}

AMFTraceDepth ::= ENUMERATED
{
    minimum(1),
    medium(2),
    maximum(3),
    minimumWithoutVendorSpecificExtension(4),
    mediumWithoutVendorSpecificExtension(5),
    maximumWithoutVendorSpecificExtension(6)
}

AMFUENGAPID ::= INTEGER (0..1099511627775)

InterfacesToTrace ::= BIT STRING (SIZE(8))

NGRANTraceID ::= OCTET STRING (SIZE(8))

-- ==================
-- 5G SMF definitions
-- ==================
@@ -3442,6 +3547,120 @@ AccessType ::= ENUMERATED
    threeGPPandNonThreeGPPAccess(3)
}

AllowedNSSAI ::= SEQUENCE OF NSSAI

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

AreaOfInterest ::= SEQUENCE
{
    areaOfInterestTAIList     [1] AreaOfInterestTAIList OPTIONAL,
    areaOfInterestCellList    [2] AreaOfInterestCellList OPTIONAL,
    areaOfInterestRANNodeList [3] AreaOfInterestRANNodeList OPTIONAL
}

AreaOfInterestCellList ::= SEQUENCE (SIZE(1..MAX)) OF NCGI

AreaOfInterestItem ::= SEQUENCE
{
    areaOfInterest  [1] AreaOfInterest
}

AreaOfInterestRANNodeList ::= SEQUENCE (SIZE(1..MAX)) OF GlobalRANNodeID

AreaOfInterestTAIList ::= SEQUENCE (SIZE(1..MAX)) OF TAI

BitRate ::= INTEGER

CauseMisc ::= ENUMERATED
{
    controlProcessingOverload(1),
    notEnoughUserPlaneProcessingResources(2),
    hardwareFailure(3),
    oMIntervention(4),
    unknownPLMNOrSNPN(5),
    unspecified(6)
}

CauseNas ::= ENUMERATED
{
    normalRelease(1),
    authenticationFailure(2),
    deregister(3),
    unspecified(4)
}

CauseProtocol ::= ENUMERATED
{
    transferSyntaxError(1),
    abstractSyntaxError-reject(2),
    abstractSyntaxErrorIgnoreAndNotify(3),
    messageNotCompatibleWithReceiverState(4),
    semanticError(5),
    abstractSyntaxErrorFalselyConstructedMessage(6),
    unspecified(7)
}

CauseRadioNetwork ::= ENUMERATED
{
    unspecified(1),
    txnrelocoverallExpiry(2),
    successfulHandover(3),
    releaseDueToNGRANGeneratedReason(4),
    releaseDueTo5gcGeneratedReason(5),
    handoverCancelled(6),
    partialHandover(7),
    hoFailureInTarget5GCNGRANNodeOrTargetSystem(8),
    hoTargetNotAllowed(9),
    tNGRelocOverallExpiry(10),
    tNGRelocPrepExpiry(11),
    cellNotAvailable(12),
    unknownTargetID(13),
    noRadioResourcesAvailableInTargetCell(14),
    unknownLocalUENGAPID(15),
    inconsistentRemoteUENGAPID(16),
    handoverDesirableForRadioReason(17),
    timeCriticalHandover(18),
    resourceOptimisationHandover(19),
    reduceLoadInServingCell(20),
    userInactivity(21),
    radioConnectionWithUELost(22),
    radioResourcesNotAvailable(23),
    invalidQoSCombination(24),
    failureInRadioInterfaceProcedure(25),
    interactionWithOtherProcedure(26),
    unknownPDUSessionID(27),
    multiplePDUSessionIDInstances(29),
    multipleQoSFlowIDInstances(30),
    encryptionAndOrIntegrityProtectionAlgorithmsNotSupported(31),
    nGIntraSystemHandoverTriggered(32),
    nGInterSystemHandoverTriggered(33),
    xNHandoverTriggered(34),
    notSupported5QIValue(35),
    uEContextTransfer(36),
    iMSVoiceeEPSFallbackOrRATFallbackTriggered(37),
    uPIntegrityProtectioNotPossible(38),
    uPConfidentialityProtectionNotPossible(39),
    sliceNotSupported(40),
    uEInRRCInactiveStateNotReachable(41),
    redirection(42),
    resourcesNotAvailableForTheSlice(43),
    uEMaxIntegrityProtectedDataRateReason(44),
    releaseDueToCNDetectedMobility(45),
    n26InterfaceNotAvailable(46),
    releaseDueToPreemption(47),
    multipleLocationReportingReferenceIDInstances(48),
    rSNNotAvailableForTheUP(49),
    nPMAccessDenied(50),
    cAGOnlyAccessDenied(51),
    insufficientUECapabilities(52)
}

CauseTransport ::= ENUMERATED
{
    transportResourceUnavailable(1),
    unspecified(2)
}

Direction ::= ENUMERATED
{
    fromTarget(1),
@@ -3454,8 +3673,14 @@ E164Number ::= NumericString (SIZE(1..15))

EmailAddress ::= UTF8String

EquivalentPLMNs ::= SEQUENCE (SIZE(1..MAX)) OF PLMNID

EUI64 ::= OCTET STRING (SIZE(8))

EUTRAEncryptionAlgorithms ::= BIT STRING (SIZE(16, ...))

EUTRAIntegrityProtectionAlgorithms ::= BIT STRING (SIZE(16, ...))

FiveGGUTI ::= SEQUENCE
{
    mCC         [1] MCC,
@@ -3468,6 +3693,19 @@ FiveGGUTI ::= SEQUENCE

FiveGMMCause ::= INTEGER (0..255)

FiveGSSubscriberID ::= CHOICE
{
    sUPI [1] SUPI,
    sUCI [2] SUCI,
    pEI  [3] PEI,
    gPSI [4] GPSI
}

FiveGSSubscriberIDs ::= SEQUENCE
{
   fiveGSSubscriberID [1] SEQUENCE SIZE(1..MAX) OF FiveGSSubscriberID
}

FiveGSMRequestType ::= ENUMERATED
{
    initialRequest(1),
@@ -3506,6 +3744,16 @@ FiveGSUserState ::= ENUMERATED
    notProvidedFromAMF(6)
}

FiveQI ::= INTEGER (0..255)

ForbiddenAreaInformation ::= SEQUENCE
{
    pLMNIdentity  [1] PLMNID,
    forbiddenTACs [2] ForbiddenTACs
}

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

FTEID ::= SEQUENCE
{
    tEID        [1] INTEGER (0.. 4294967295),
@@ -3541,10 +3789,31 @@ GUTI ::= SEQUENCE
    mTMSI        [5] TMSI
}

HandoverCause ::= CHOICE
{
    radioNetwork    [1] CauseRadioNetwork,
    transport       [2] CauseTransport,
    nas             [3] CauseNas,
    protocol        [4] CauseProtocol,
    misc            [5] CauseMisc
}
HandoverType ::= ENUMERATED
{
    intra5GS(1),
    fiveGStoEPS(2),
    ePSto5GS(3),
    fiveGStoUTRA(4)
}
HomeNetworkPublicKeyID ::= OCTET STRING

HSMFURI ::= UTF8String

IABAuthorizedIndicator ::= ENUMERATED
{
    authorized(1),
    notAuthorized(2)
}

IMEI ::= NumericString (SIZE(14))

IMEISV ::= NumericString (SIZE(16))
@@ -3578,6 +3847,36 @@ IPv6Address ::= OCTET STRING (SIZE(16))

IPv6FlowLabel ::= INTEGER(0..1048575)

LocationAreaOfInterestList  ::= SEQUENCE (SIZE(1..MAX)) OF AreaOfInterestItem

LocationEventType ::= ENUMERATED
{
    direct(1),
    changeOfServeCell(2),
    uEPrescenceInAreaOfInterest(3),
    stopChangeOfServeCell(4),
    stopUEPresenceInAreaOfInterest(5),
    cancelLocationReportingForTheUE(6)
}

LocationReportArea ::= ENUMERATED
{
    cell(1)
}

LocationReportingRequestType ::= SEQUENCE
{
    eventType           [1] LocationEventType,
    reportArea          [2] LocationReportArea,
    areaOfInterestList  [3] LocationAreaOfInterestList
}

LTEV2XAuthorizedIndicator ::= SEQUENCE
{
    vehicleUE    [1] VehicleUE,
    pedestrianUE [2] PedestrianUE
}

MACAddress ::= OCTET STRING (SIZE(6))

MACRestrictionIndicator ::= ENUMERATED
@@ -3601,10 +3900,21 @@ MMEC ::= NumericString

MMEGI ::= NumericString

MobilityRestrictionList ::= SEQUENCE
{
    servingPLMN               [1] PLMNID,
    equivalentPLMNs           [2] EquivalentPLMNs OPTIONAL,
    rATRestrictions           [3] RATRestrictions OPTIONAL,
    forbiddenAreaInformation  [4] ForbiddenAreaInformation OPTIONAL,
    serviceAreaInformation    [5] ServiceAreaInformation OPTIONAL
}

MSISDN ::= NumericString (SIZE(1..15))

NAI ::= UTF8String

NextHopChainingCount ::= INTEGER (0..7)

NextLayerProtocol ::= INTEGER(0..255)

NonLocalID ::= ENUMERATED
@@ -3618,16 +3928,47 @@ NonIMEISVPEI ::= CHOICE
    mACAddress [1] MACAddress
}

NREncryptionAlgorithms ::= BIT STRING (SIZE(16, ...))

NRIntegrityProtectionAlgorithms ::= BIT STRING (SIZE(16, ...))

NRV2XAuthorizedIndicator ::= SEQUENCE
{
    vehicleUE      [1] VehicleUE,
    pedestrianUE   [2] PedestrianUE
}

NSSAI ::= SEQUENCE OF SNSSAI

PC5QoSFlowItem ::= SEQUENCE
{
    pQI                [1] FiveQI,
    pC5QoSFlowBitRate  [2] BitRate OPTIONAL
}

PC5QoSFlowList ::= SEQUENCE (SIZE(1..MAX)) OF PC5QoSFlowItem

PC5QoSParameters ::= SEQUENCE
{
    pC5QoSFlowList     [1] PC5QoSFlowList,
    pC5LinkAMBR        [2] BitRate OPTIONAL
}

PLMNID ::= SEQUENCE
{
    mCC [1] MCC,
    mNC [2] MNC
}

PLMNList ::= SEQUENCE (SIZE(1..MAX)) OF PLMNID

PDUSessionID ::= INTEGER (0..255)

PDUSessionResourceInformation ::= SEQUENCE
{
    pDUSessionID              [1] PDUSessionID
}

PDUSessionType ::= ENUMERATED
{
    iPv4(1),
@@ -3637,6 +3978,12 @@ PDUSessionType ::= ENUMERATED
    ethernet(5)
}

PedestrianUE ::= ENUMERATED
{
    authorized(1),
    notAuthorized(2)
}

PEI ::= CHOICE
{
    iMEI        [1] IMEI,
@@ -3662,6 +4009,21 @@ PrimaryAuthenticationType ::= ENUMERATED

ProtectionSchemeID ::= INTEGER (0..15)

RANUENGAPID ::= INTEGER (0..4294967295)

RANSourceToTargetContainer ::= OCTET STRING

RATRestrictions ::= SEQUENCE (SIZE(1..MAX)) OF RATRestrictionItem

RATRestrictionInformation ::= BIT STRING (SIZE(8, ...))

RATRestrictionItem ::= SEQUENCE
{
    pLMNIdentity               [1] PLMNID,
    rATRestrictionInformation  [2] RATRestrictionInformation

}

RATType ::= ENUMERATED
{
    nR(1),
@@ -3706,6 +4068,24 @@ RoutingIndicator ::= INTEGER (0..9999)

SchemeOutput ::= OCTET STRING

SecurityContext ::= SEQUENCE
{
    nextHopChainingCount    [1] NextHopChainingCount,
    nextHopNH               [2] SecurityKey
}


SecurityKey ::= BIT STRING (SIZE(256))

ServiceAreaInformation ::= SEQUENCE (SIZE(1..MAX)) OF ServiceAreaInfo

ServiceAreaInfo ::= SEQUENCE
{
    pLMNIdentity    [1] PLMNID,
    allowedTACs     [2] AllowedTACs OPTIONAL,
    notAllowedTACs  [3] ForbiddenTACs OPTIONAL
}

SIPURI ::= UTF8String

Slice ::= SEQUENCE
@@ -3730,6 +4110,12 @@ SNSSAI ::= SEQUENCE
    sliceDifferentiator [2] OCTET STRING (SIZE(3)) OPTIONAL
}

SRVCCOperation ::= ENUMERATED
{
    possible(1),
    notPossible(2)
}

SubscriberIdentifier ::= CHOICE
{
    sUCI   [1] SUCI,
@@ -3789,6 +4175,21 @@ TELURI ::= UTF8String

Timestamp ::= GeneralizedTime

TypeOfError ::= ENUMERATED
{
    notunderstood(1),
    missing(2),
    other(3)
}

TypeOfMessage ::= ENUMERATED
{
    initiatingMessage(1),
    successfulOutcome(2),
    unsuccessfulOutcome(3),
    other(4)
}

UEContextInfo ::= SEQUENCE
{
    supportVoPS         [1] BOOLEAN OPTIONAL,
@@ -3805,6 +4206,35 @@ UEEndpointAddress ::= CHOICE
    ethernetAddress     [3] MACAddress
}

UERadioCapability ::= OCTET STRING

UESecurityCapabilities ::= SEQUENCE
{
    nREncryptionAlgorithms              [1] NREncryptionAlgorithms,
    nRIntegrityProtectionAlgorithms     [2] NRIntegrityProtectionAlgorithms,
    eUTRAEncryptionAlgorithms           [3] EUTRAEncryptionAlgorithms,
    eUTRAIntegrityProtectionAlgorithms  [4] EUTRAIntegrityProtectionAlgorithms
}

UserIdentifiers ::= SEQUENCE
{
    fiveGSSubscriberIDs [1] FiveGSSubscriberIDs OPTIONAL,
    ePSSubscriberIDs    [2] EPSSubscriberIDs OPTIONAL,
    targetIdentifiers   [3] TargetIdentifier
}

VehicleUE ::= ENUMERATED
{
    authorized(1),
    notAuthorized(2)
}

VoiceEPSFallback ::= ENUMERATED
{
    possible(1),
    notPossible(2)
}

-- ===================
-- Location parameters
-- ===================