Commit 0fa5592e authored by canterburym's avatar canterburym
Browse files

Resolving merge conflict

parents 67d8f0ac 81b35bbe
......@@ -118,7 +118,7 @@ XIRIEvent ::= 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,
......@@ -132,6 +132,19 @@ sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessio
nEFdeviceTriggerReportNotify [78] NEFDeviceTriggerReportNotify,
nEFMSISDNLessMOSMS [79] NEFMSISDNLessMOSMS,
nEFExpectedUEBehaviourUpdate [80] NEFExpectedUEBehaviourUpdate
-- SCEF services related events, see clause 7.Y.2
sCEFPDNConnectionEstablishment [81] SCEFPDNConnectionEstablishment,
sCEFPDNConnectionUpdate [82] SCEFPDNConnectionUpdate,
sCEFPDNConnectionRelease [83] SCEFPDNConnectionRelease,
sCEFUnsuccessfulProcedure [84] SCEFUnsuccessfulProcedure,
sCEFStartOfInterceptionWithEstablishedPDNConnection [85] SCEFStartOfInterceptionWithEstablishedPDNConnection,
sCEFdeviceTrigger [86] SCEFDeviceTrigger,
sCEFdeviceTriggerReplace [87] SCEFDeviceTriggerReplace,
sCEFdeviceTriggerCancellation [88] SCEFDeviceTriggerCancellation,
sCEFdeviceTriggerReportNotify [89] SCEFDeviceTriggerReportNotify,
sCEFMSISDNLessMOSMS [90] SCEFMSISDNLessMOSMS,
sCEFCommunicationPatternUpdate [91] SCEFCommunicationPatternUpdate
}
-- ==============
......@@ -257,6 +270,19 @@ IRIEvent ::= CHOICE
nEFdeviceTriggerReportNotify [78] NEFDeviceTriggerReportNotify,
nEFMSISDNLessMOSMS [79] NEFMSISDNLessMOSMS,
nEFExpectedUEBehaviourUpdate [80] NEFExpectedUEBehaviourUpdate
-- SCEF services related events, see clause 7.Y.2
sCEFPDNConnectionEstablishment [81] SCEFPDNConnectionEstablishment,
sCEFPDNConnectionUpdate [82] SCEFPDNConnectionUpdate,
sCEFPDNConnectionRelease [83] SCEFPDNConnectionRelease,
sCEFUnsuccessfulProcedure [84] SCEFUnsuccessfulProcedure,
sCEFStartOfInterceptionWithEstablishedPDNConnection [85] SCEFStartOfInterceptionWithEstablishedPDNConnection,
sCEFdeviceTrigger [86] SCEFDeviceTrigger,
sCEFdeviceTriggerReplace [87] SCEFDeviceTriggerReplace,
sCEFdeviceTriggerCancellation [88] SCEFDeviceTriggerCancellation,
sCEFdeviceTriggerReportNotify [89] SCEFDeviceTriggerReportNotify,
sCEFMSISDNLessMOSMS [90] SCEFMSISDNLessMOSMS,
sCEFCommunicationPatternUpdate [91] SCEFCommunicationPatternUpdate
}
IRITargetIdentifier ::= SEQUENCE
......@@ -579,6 +605,305 @@ AFID ::= UTF8String
NEFID ::= UTF8String
-- ==================
-- SCEF definitions
-- ==================
-- See clause 7.Y.2.1.2 for details of this structure
SCEFPDNConnectionEstablishment ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
iMEI [4] IMEI OPTIONAL,
ePSBearerID [5] EPSBearerID,
sCEFID [6] SCEFID,
aPN [7] APN,
rDSSupport [8] RDSSupport,
sCSASID [9] SCSASID
}
-- See clause 7.Y.2.1.3 for details of this structure
SCEFPDNConnectionUpdate ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
initiator [4] Initiator,
rDSSourcePortNumber [5] RDSPortNumber OPTIONAL,
rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL,
applicationID [7] ApplicationID OPTIONAL,
sCSASID [8] SCSASID OPTIONAL,
rDSAction [9] RDSAction OPTIONAL,
serializationFormat [10] SerializationFormat OPTIONAL
}
-- See clause 7.Y.2.1.4 for details of this structure
SCEFPDNConnectionRelease ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
ePSBearerID [4] EPSBearerID,
timeOfFirstPacket [5] Timestamp OPTIONAL,
timeOfLastPacket [6] Timestamp OPTIONAL,
uplinkVolume [7] INTEGER OPTIONAL,
downlinkVolume [8] INTEGER OPTIONAL,
releaseCause [9] SCEFReleaseCause
}
-- See clause 7.Y.2.1.5 for details of this structure
SCEFUnsuccessfulProcedure ::= SEQUENCE
{
failureCause [1] SCEFFailureCause,
iMSI [2] IMSI OPTIONAL,
mSISDN [3] MSISDN OPTIONAL,
externalIdentifier [4] NAI OPTIONAL,
ePSBearerID [5] EPSBearerID,
aPN [6] APN,
rDSDestinationPortNumber [7] RDSPortNumber OPTIONAL,
applicationID [8] ApplicationID OPTIONAL,
sCSASID [9] SCSASID
}
-- See clause 7.Y.2.1.6 for details of this structure
SCEFStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
iMEI [4] IMEI OPTIONAL,
ePSBearerID [5] EPSBearerID,
sCEFID [6] SCEFID,
aPN [7] APN,
rDSSupport [8] RDSSupport,
sCSASID [9] SCSASID
}
-- See clause 7.Y.3.1.1 for details of this structure
SCEFDeviceTrigger ::= SEQUENCE
{
iMSI [1] IMSI,
mSISDN [2] MSISDN,
externalIdentifier [3] NAI,
triggerId [4] TriggerID,
sCSASID [5] SCSASID OPTIONAL,
triggerPayload [6] TriggerPayload OPTIONAL,
validityPeriod [7] INTEGER OPTIONAL,
priorityDT [8] PriorityDT OPTIONAL,
sourcePortId [9] PortNumber OPTIONAL,
destinationPortId [10] PortNumber OPTIONAL
}
-- See clause 7.Y.3.1.2 for details of this structure
SCEFDeviceTriggerReplace ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
triggerId [4] TriggerID,
sCSASID [5] SCSASID OPTIONAL,
triggerPayload [6] TriggerPayload OPTIONAL,
validityPeriod [7] INTEGER OPTIONAL,
priorityDT [8] PriorityDT OPTIONAL,
sourcePortId [9] PortNumber OPTIONAL,
destinationPortId [10] PortNumber OPTIONAL
}
-- See clause 7.Y.3.1.3 for details of this structure
SCEFDeviceTriggerCancellation ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
triggerId [4] TriggerID
}
-- See clause 7.Y.3.1.4 for details of this structure
SCEFDeviceTriggerReportNotify ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifier [3] NAI OPTIONAL,
triggerId [4] TriggerID,
deviceTriggerDeliveryResult [5] DeviceTriggerDeliveryResult
}
-- See clause 7.Y.4.1.1 for details of this structure
SCEFMSISDNLessMOSMS ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
mSISDN [2] MSISDN OPTIONAL,
externalIdentifie [3] NAI OPTIONAL,
terminatingSMSParty [4] SCSASID,
sMS [5] SMSTPDUData OPTIONAL,
sourcePort [6] PortNumber OPTIONAL,
destinationPort [7] PortNumber OPTIONAL
}
-- See clause 7.Y.5.1.1 for details of this structure
SCEFCommunicationPatternUpdate ::= SEQUENCE
{
mSISDN [1] MSISDN OPTIONAL,
externalIdentifier [2] NAI OPTIONAL,
periodicCommunicationIndicator [3] PeriodicCommunicationIndicator OPTIONAL,
communicationDurationTime [4] INTEGER OPTIONAL,
periodicTime [5] INTEGER OPTIONAL,
scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL,
scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL,
stationaryIndication [8] StationaryIndication OPTIONAL,
batteryIndication [9] BatteryIndication OPTIONAL,
trafficProfile [10] TrafficProfile OPTIONAL,
expectedUEMovingTrajectory [11] SEQUENCE OF UMTLocationArea5G OPTIONAL,
sCSASID [13] SCSASID,
validityTime [14] Timestamp OPTIONAL
}
-- =================
-- SCEF parameters
-- =================
SCEFFailureCause ::= ENUMERATED
{
userUnknown(1),
niddConfigurationNotAvailable(2),
invalidEPSBearer(3),
operationNotAllowed(4),
portNotFree(5),
portNotAssociatedWithSpecifiedApplication(6)
}
SCEFReleaseCause ::= ENUMERATED
{
mMERelease(1),
dNRelease(2),
hSSRelease(3),
localConfigurationPolicy(4),
unknownCause(5)
}
SCSASID ::= UTF8String
SCEFID ::= UTF8String
PeriodicCommunicationIndicator ::= ENUMERATED
{
periodic(1),
nonPeriodic(2)
}
EPSBearerID ::= INTEGER (0..255)
APN ::= UTF8String
-- ==========================
-- 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 AMF definitions
-- ==================
......@@ -3306,4 +3631,4 @@ OGCURN ::= UTF8String
-- TS 29.572 [24], clause 6.1.6.2.15
MethodCode ::= INTEGER (16..31)
END
END
\ No newline at end of file
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