Commit cd88b6af authored by canterburym's avatar canterburym
Browse files

From draft_s3i210329-r2

parent ed0fd96b
Loading
Loading
Loading
Loading
Loading
+66 −60
Original line number Diff line number Diff line
@@ -121,17 +121,17 @@ XIRIEvent ::= CHOICE
sMFPDUtoMAPDUSessionModification                        [64] SMFPDUtoMAPDUSessionModification,
    -- NEF services related events

    nEFPDUSessionEstablishment                          [65] NEFPDUSessionEstablishment,
    nEFPDUSessionModification                           [66] NEFPDUSessionModification,
    nEFPDUSessionRelease                                [67] NEFPDUSessionRelease,
    nEFUnsuccessfulProcedure                            [68] NEFUnsuccessfulProcedure,
    nEFStartOfInterceptionWithEstablishedPDUSession     [69] NEFStartOfInterceptionWithEstablishedPDUSession,
    nEFdeviceTrigger                                    [70] NEFDeviceTrigger,
    nEFdeviceTriggerReplace                             [71] NEFDeviceTriggerReplace,
    nEFdeviceTriggerCancellation                        [72] NEFDeviceTriggerCancellation,
    nEFdeviceTriggerReportNotify                        [73] NEFDeviceTriggerReportNotify,
    nEFMSISDNLessMOSMS                                  [74] NEFMSISDNLessMOSMS,
    nEFExpectedUEBehaviourUpdate                        [75] NEFExpectedUEBehaviourUpdate
    nEFPDUSessionEstablishment                          [70] NEFPDUSessionEstablishment,
    nEFPDUSessionModification                           [71] NEFPDUSessionModification,
    nEFPDUSessionRelease                                [72] NEFPDUSessionRelease,
    nEFUnsuccessfulProcedure                            [73] NEFUnsuccessfulProcedure,
    nEFStartOfInterceptionWithEstablishedPDUSession     [74] NEFStartOfInterceptionWithEstablishedPDUSession,
    nEFdeviceTrigger                                    [75] NEFDeviceTrigger,
    nEFdeviceTriggerReplace                             [76] NEFDeviceTriggerReplace,
    nEFdeviceTriggerCancellation                        [77] NEFDeviceTriggerCancellation,
    nEFdeviceTriggerReportNotify                        [78] NEFDeviceTriggerReportNotify,
    nEFMSISDNLessMOSMS                                  [79] NEFMSISDNLessMOSMS,
    nEFExpectedUEBehaviourUpdate                        [80] NEFExpectedUEBehaviourUpdate
}

-- ==============
@@ -246,17 +246,17 @@ IRIEvent ::= CHOICE
    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification,
    -- NEF services related events

    nEFPDUSessionEstablishment                          [65] NEFPDUSessionEstablishment,
    nEFPDUSessionModification                           [66] NEFPDUSessionModification,
    nEFPDUSessionRelease                                [67] NEFPDUSessionRelease,
    nEFUnsuccessfulProcedure                            [68] NEFUnsuccessfulProcedure,
    nEFStartOfInterceptionWithEstablishedPDUSession     [69] NEFStartOfInterceptionWithEstablishedPDUSession,
    nEFdeviceTrigger                                    [70] NEFDeviceTrigger,
    nEFdeviceTriggerReplace                             [71] NEFDeviceTriggerReplace,
    nEFdeviceTriggerCancellation                        [72] NEFDeviceTriggerCancellation,
    nEFdeviceTriggerReportNotify                        [73] NEFDeviceTriggerReportNotify,
    nEFMSISDNLessMOSMS                                  [74] NEFMSISDNLessMOSMS,
    nEFExpectedUEBehaviourUpdate                        [75] NEFExpectedUEBehaviourUpdate 
    nEFPDUSessionEstablishment                          [70] NEFPDUSessionEstablishment,
    nEFPDUSessionModification                           [71] NEFPDUSessionModification,
    nEFPDUSessionRelease                                [72] NEFPDUSessionRelease,
    nEFUnsuccessfulProcedure                            [73] NEFUnsuccessfulProcedure,
    nEFStartOfInterceptionWithEstablishedPDUSession     [74] NEFStartOfInterceptionWithEstablishedPDUSession,
    nEFdeviceTrigger                                    [75] NEFDeviceTrigger,
    nEFdeviceTriggerReplace                             [76] NEFDeviceTriggerReplace,
    nEFdeviceTriggerCancellation                        [77] NEFDeviceTriggerCancellation,
    nEFdeviceTriggerReportNotify                        [78] NEFDeviceTriggerReportNotify,
    nEFMSISDNLessMOSMS                                  [79] NEFMSISDNLessMOSMS,
    nEFExpectedUEBehaviourUpdate                        [80] NEFExpectedUEBehaviourUpdate
}

IRITargetIdentifier ::= SEQUENCE
@@ -302,7 +302,7 @@ LINotificationMessage ::= CHOICE
-- ==================


-- See clause 6.2.X.2.1.2 for details of this structure
-- See clause 7.Y.2.1.2 for details of this structure

NEFPDUSessionEstablishment ::= SEQUENCE
{
@@ -317,7 +317,7 @@ NEFPDUSessionEstablishment ::= SEQUENCE
    aFID                  [9] AFID
}

-- See clause 6.2.X.2.1.3 for details of this structure
-- See clause 7.Y.2.1.3 for details of this structure

NEFPDUSessionModification ::= SEQUENCE
{
@@ -334,7 +334,7 @@ NEFPDUSessionModification ::= SEQUENCE

}

-- See clause 6.2.X.2.1.4 for details of this structure
-- See clause 7.Y.2.1.4 for details of this structure

NEFPDUSessionRelease ::= SEQUENCE
{
@@ -348,7 +348,7 @@ NEFPDUSessionRelease ::= SEQUENCE
    releaseCause           [8] NEFReleaseCause
}

-- See clause 6.2.X.2.1.5 for details of this structure
-- See clause 7.Y.2.1.5 for details of this structure

NEFUnsuccessfulProcedure ::= SEQUENCE
{
@@ -363,7 +363,7 @@ NEFUnsuccessfulProcedure ::= SEQUENCE
    aFID                  [9] AFID
}

-- See clause 6.2.X.2.1.6 for details of this structure
-- See clause 7.Y.2.1.6 for details of this structure

NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
{
@@ -378,7 +378,7 @@ NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
    aFID               [9] AFID
}

-- See clause 6.2.X.3.1.1 for details of this structure
-- See clause 7.Y.3.1.1 for details of this structure

NEFDeviceTrigger ::= SEQUENCE
{
@@ -393,7 +393,7 @@ NEFDeviceTrigger ::= SEQUENCE
    destinationPortId     [9] PortNumber OPTIONAL
}

-- See clause 6.2.X.3.1.2 for details of this structure
-- See clause 7.Y.3.1.2 for details of this structure

NEFDeviceTriggerReplace ::= SEQUENCE
{
@@ -408,7 +408,7 @@ NEFDeviceTriggerReplace ::= SEQUENCE
    destinationPortId        [9] PortNumber OPTIONAL
}

-- See clause 6.2.X.3.1.3 for details of this structure
-- See clause 7.Y.3.1.3 for details of this structure

NEFDeviceTriggerCancellation ::= SEQUENCE
{
@@ -417,7 +417,7 @@ NEFDeviceTriggerCancellation ::= SEQUENCE
    triggerId             [3] TriggerID
}

-- See clause 6.2.X.3.1.4 for details of this structure
-- See clause 7.Y.3.1.4 for details of this structure

NEFDeviceTriggerReportNotify ::= SEQUENCE
{
@@ -427,7 +427,7 @@ NEFDeviceTriggerReportNotify ::= SEQUENCE
    deviceTriggerDeliveryResult      [4] DeviceTriggerDeliveryResult
}

-- See clause 6.2.X.4.1.1 for details of this structure
-- See clause 7.Y.4.1.1 for details of this structure

NEFMSISDNLessMOSMS ::= SEQUENCE
{
@@ -439,7 +439,7 @@ NEFMSISDNLessMOSMS ::= SEQUENCE
    destinationPort           [6] PortNumber OPTIONAL
}

-- See clause 6.2.X.5.1.1 for details of this structure
-- See clause 7.Y.5.1.1 for details of this structure

NEFExpectedUEBehaviourUpdate ::= SEQUENCE
{
@@ -452,33 +452,15 @@ NEFExpectedUEBehaviourUpdate ::= SEQUENCE
    scheduledCommunicationType    [7] ScheduledCommunicationType OPTIONAL,
    batteryIndication             [8] BatteryIndication OPTIONAL,
    trafficProfile                [9] TrafficProfile OPTIONAL,
    expectedTimeAndDayOfWeekInTrajectory  [10] ExpectedTimeAndDayOfWeekInTrajectory OPTIONAL,
    expectedTimeAndDayOfWeekInTrajectory  [10] SEQUENCE OF UMTLocationArea5G OPTIONAL,
    aFID                          [11] AFID,
    validityTime                  [12] Timestamp OPTIONAL
}

ExpectedTimeAndDayOfWeekInTrajectory ::= SEQUENCE OF Daytime

-- =================
-- 5G NEF parameters
-- Common SCEF/NEF parameters
-- =================

NEFFailureCause ::= ENUMERATED
{
    userUnknown(1),
    niddConfigurationNotAvailable(2),
    contextNotFound(3)
}

NEFReleaseCause ::= ENUMERATED
{
    sMFRelease(1),
    dNRelease(2),
    uDMRelease(3),
    cHFRelease(4),
    localConfigurationPolicy(5),
    unknownCause(6)
}

RDSSupport ::= BOOLEAN

@@ -486,8 +468,8 @@ RDSPortNumber ::= INTEGER (0..15)

RDSAction ::= ENUMERATED
{
    reserve (1),
    release (2)
    reservePort (1),
    releasePort (2)
}

SerializationFormat ::= ENUMERATED
@@ -497,10 +479,6 @@ SerializationFormat ::= ENUMERATED
    cbor (3)
}

AFID ::= UTF8String

NEFID ::= UTF8String

ApplicationID ::= OCTET STRING

NIDDCCPDU ::= OCTET STRING
@@ -588,6 +566,33 @@ ScheduledCommunicationType ::= ENUMERATED
    bidirectional (3)
}

-- =================
-- 5G NEF parameters
-- =================

NEFFailureCause ::= ENUMERATED
{
    userUnknown(1),
    niddConfigurationNotAvailable(2),
    contextNotFound(3),
    portNotFree(4),
    PortNotAssociatedWithSpecifiedApplication(5)
}

NEFReleaseCause ::= ENUMERATED
{
    sMFRelease(1),
    dNRelease(2),
    uDMRelease(3),
    cHFRelease(4),
    localConfigurationPolicy(5),
    unknownCause(6)
}

AFID ::= UTF8String

NEFID ::= UTF8String

-- ==================
-- 5G AMF definitions
-- ==================
@@ -954,6 +959,7 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE
-- =================
-- 5G SMF parameters
-- =================

SMFID ::= UTF8String

SMFFailedProcedureType ::= ENUMERATED