Commit 67d8f0ac authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/TS33128/0201' of forge.3gpp.org:sa3/li-trial into test_merge

parents d48c62f0 b9dd5e87
......@@ -117,8 +117,21 @@ XIRIEvent ::= CHOICE
aMFIdentifierAssocation [62] AMFIdentifierAssocation,
mMEIdentifierAssocation [63] MMEIdentifierAssocation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
-- NEF services related events, see clause 7.Y.2
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
}
-- ==============
......@@ -230,7 +243,20 @@ IRIEvent ::= CHOICE
mMEIdentifierAssocation [63] MMEIdentifierAssocation,
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
-- NEF services related events, see clause 7.Y.2,
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
......@@ -246,14 +272,15 @@ IRITargetIdentifier ::= SEQUENCE
CCPayload ::= SEQUENCE
{
cCPayloadOID [1] RELATIVE-OID,
pDU [2] CCPDU
pDU [2] CCPDU
}
CCPDU ::= CHOICE
{
uPFCCPDU [1] UPFCCPDU,
extendedUPFCCPDU [2] ExtendedUPFCCPDU,
mMSCCPDU [3] MMSCCPDU
mMSCCPDU [3] MMSCCPDU,
nIDDCCPDU [4] NIDDCCPDU
}
-- ===========================
......@@ -263,13 +290,294 @@ CCPDU ::= CHOICE
LINotificationPayload ::= SEQUENCE
{
lINotificationPayloadOID [1] RELATIVE-OID,
notification [2] LINotificationMessage
notification [2] LINotificationMessage
}
LINotificationMessage ::= CHOICE
{
lINotification [1] LINotification
}
-- ==================
-- 5G NEF definitions
-- ==================
-- See clause 7.Y.2.1.2 for details of this structure
NEFPDUSessionEstablishment ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
pDUSessionID [3] PDUSessionID,
sNSSAI [4] SNSSAI,
nEFID [5] NEFID,
dNN [6] DNN,
rDSSupport [7] RDSSupport,
sMFID [8] SMFID,
aFID [9] AFID
}
-- See clause 7.Y.2.1.3 for details of this structure
NEFPDUSessionModification ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
sNSSAI [3] SNSSAI,
initiator [4] Initiator,
rDSSourcePortNumber [5] RDSPortNumber OPTIONAL,
rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL,
applicationID [7] ApplicationID OPTIONAL,
aFID [8] AFID OPTIONAL,
rDSAction [9] RDSAction OPTIONAL,
serializationFormat [10] SerializationFormat OPTIONAL
}
-- See clause 7.Y.2.1.4 for details of this structure
NEFPDUSessionRelease ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
pDUSessionID [3] PDUSessionID,
timeOfFirstPacket [4] Timestamp OPTIONAL,
timeOfLastPacket [5] Timestamp OPTIONAL,
uplinkVolume [6] INTEGER OPTIONAL,
downlinkVolume [7] INTEGER OPTIONAL,
releaseCause [8] NEFReleaseCause
}
-- See clause 7.Y.2.1.5 for details of this structure
NEFUnsuccessfulProcedure ::= SEQUENCE
{
failureCause [1] NEFFailureCause,
sUPI [2] SUPI,
gPSI [3] GPSI OPTIONAL,
pDUSessionID [4] PDUSessionID,
dNN [5] DNN OPTIONAL,
sNSSAI [6] SNSSAI OPTIONAL,
rDSDestinationPortNumber [7] RDSPortNumber,
applicationID [8] ApplicationID,
aFID [9] AFID
}
-- See clause 7.Y.2.1.6 for details of this structure
NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
pDUSessionID [3] PDUSessionID,
dNN [4] DNN,
sNSSAI [5] SNSSAI,
nEFID [6] NEFID,
rDSSupport [7] RDSSupport,
sMFID [8] SMFID,
aFID [9] AFID
}
-- See clause 7.Y.3.1.1 for details of this structure
NEFDeviceTrigger ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
triggerId [3] TriggerID,
aFID [4] AFID,
triggerPayload [5] TriggerPayload OPTIONAL,
validityPeriod [6] INTEGER OPTIONAL,
priorityDT [7] PriorityDT OPTIONAL,
sourcePortId [8] PortNumber OPTIONAL,
destinationPortId [9] PortNumber OPTIONAL
}
-- See clause 7.Y.3.1.2 for details of this structure
NEFDeviceTriggerReplace ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
triggerId [3] TriggerID,
aFID [4] AFID,
triggerPayload [5] TriggerPayload OPTIONAL,
validityPeriod [6] INTEGER OPTIONAL,
priorityDT [7] PriorityDT OPTIONAL,
sourcePortId [8] PortNumber OPTIONAL,
destinationPortId [9] PortNumber OPTIONAL
}
-- See clause 7.Y.3.1.3 for details of this structure
NEFDeviceTriggerCancellation ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
triggerId [3] TriggerID
}
-- See clause 7.Y.3.1.4 for details of this structure
NEFDeviceTriggerReportNotify ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
triggerId [3] TriggerID,
deviceTriggerDeliveryResult [4] DeviceTriggerDeliveryResult
}
-- See clause 7.Y.4.1.1 for details of this structure
NEFMSISDNLessMOSMS ::= SEQUENCE
{
sUPI [1] SUPI,
gPSI [2] GPSI,
terminatingSMSParty [3] AFID,
sMS [4] SMSTPDUData OPTIONAL,
sourcePort [5] PortNumber OPTIONAL,
destinationPort [6] PortNumber OPTIONAL
}
-- See clause 7.Y.5.1.1 for details of this structure
NEFExpectedUEBehaviourUpdate ::= SEQUENCE
{
gPSI [1] GPSI,
expectedUEMovingTrajectory [2] SEQUENCE OF UMTLocationArea5G OPTIONAL,
stationaryIndication [3] StationaryIndication OPTIONAL,
communicationDurationTime [4] INTEGER OPTIONAL,
periodicTime [5] INTEGER OPTIONAL,
scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL,
scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL,
batteryIndication [8] BatteryIndication OPTIONAL,
trafficProfile [9] TrafficProfile OPTIONAL,
expectedTimeAndDayOfWeekInTrajectory [10] SEQUENCE OF UMTLocationArea5G OPTIONAL,
aFID [11] AFID,
validityTime [12] Timestamp OPTIONAL
}
-- ==========================
-- Common SCEF/NEF parameters
-- ==========================
RDSSupport ::= BOOLEAN
RDSPortNumber ::= INTEGER (0..15)
RDSAction ::= ENUMERATED
{
reservePort(1),
releasePort(2)
}
SerializationFormat ::= ENUMERATED
{
xml(1),
json(2),
cbor(3)
}
ApplicationID ::= OCTET STRING
NIDDCCPDU ::= OCTET STRING
TriggerID ::= UTF8String
PriorityDT ::= ENUMERATED
{
noPriority(1),
priority(2)
}
TriggerPayload ::= OCTET STRING
DeviceTriggerDeliveryResult ::= ENUMERATED
{
success(1),
unknown(2),
failure(3),
triggered(4),
expired(5),
unconfirmed(6),
replaced(7),
terminate(8)
}
StationaryIndication ::= ENUMERATED
{
stationary(1),
mobile(2)
}
BatteryIndication ::= ENUMERATED
{
batteryRecharge(1),
batteryReplace(2),
batteryNoRecharge(3),
batteryNoReplace(4),
noBattery(5)
}
ScheduledCommunicationTime ::= SEQUENCE
{
days [1] SEQUENCE OF Daytime
}
UMTLocationArea5G ::= SEQUENCE
{
timeOfDay [1] Daytime,
durationSec [2] INTEGER,
location [3] NRLocation
}
Daytime ::= SEQUENCE
{
daysOfWeek [1] Day OPTIONAL,
timeOfDayStart [2] Timestamp OPTIONAL,
timeOfDayEnd [3] Timestamp OPTIONAL
}
Day ::= ENUMERATED
{
monday(1),
tuesday(2),
wednesday(3),
thursday(4),
friday(5),
saturday(6),
sunday(7)
}
TrafficProfile ::= ENUMERATED
{
singleTransUL(1),
singleTransDL(2),
dualTransULFirst(3),
dualTransDLFirst(4),
multiTrans(5)
}
ScheduledCommunicationType ::= ENUMERATED
{
downlinkOnly(1),
uplinkOnly(2),
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
......@@ -648,6 +956,8 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE
-- 5G SMF parameters
-- =================
SMFID ::= UTF8String
SMFFailedProcedureType ::= ENUMERATED
{
pDUSessionEstablishment(1),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment