Commit 5581c94f authored by Steije van Schelt's avatar Steije van Schelt
Browse files

Improved SCEF related ASN.1 syntax

parent 35488e28
Pipeline #3742 failed with stages
in 1 minute and 21 seconds
......@@ -117,10 +117,10 @@ 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,
-- SCEF services related events
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
-- SCEF services related events, see clause X
sCEFPDNConnectionEstablishment [81] SCEFPDNConnectionEstablishment,
sCEFPDNConnectionUpdate [82] SCEFPDNConnectionUpdate,
sCEFPDNConnectionRelease [83] SCEFPDNConnectionRelease,
......@@ -244,8 +244,8 @@ IRIEvent ::= CHOICE
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
-- SCEF services related events
-- SCEF services related events, see clause X
sCEFPDNConnectionEstablishment [81] SCEFPDNConnectionEstablishment,
sCEFPDNConnectionUpdate [82] SCEFPDNConnectionUpdate,
sCEFPDNConnectionRelease [83] SCEFPDNConnectionRelease,
......@@ -290,7 +290,7 @@ CCPDU ::= CHOICE
LINotificationPayload ::= SEQUENCE
{
lINotificationPayloadOID [1] RELATIVE-OID,
notification [2] LINotificationMessage
notification [2] LINotificationMessage
}
LINotificationMessage ::= CHOICE
......@@ -298,13 +298,11 @@ LINotificationMessage ::= CHOICE
lINotification [1] LINotification
}
-- ==================
-- ================
-- SCEF definitions
-- ==================
-- ================
-- See clause 7.Y.2.1.2 for details of this structure
SCEFPDNConnectionEstablishment ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
......@@ -319,24 +317,21 @@ SCEFPDNConnectionEstablishment ::= SEQUENCE
}
-- 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
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,
......@@ -351,22 +346,20 @@ SCEFPDNConnectionRelease ::= SEQUENCE
}
-- 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
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,
......@@ -381,7 +374,6 @@ SCEFStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE
}
-- See clause 7.Y.3.1.1 for details of this structure
SCEFDeviceTrigger ::= SEQUENCE
{
iMSI [1] IMSI,
......@@ -394,11 +386,9 @@ SCEFDeviceTrigger ::= SEQUENCE
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,
......@@ -414,7 +404,6 @@ SCEFDeviceTriggerReplace ::= SEQUENCE
}
-- See clause 7.Y.3.1.3 for details of this structure
SCEFDeviceTriggerCancellation ::= SEQUENCE
{
iMSI [1] IMSI OPTIONAL,
......@@ -424,18 +413,16 @@ SCEFDeviceTriggerCancellation ::= SEQUENCE
}
-- 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
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,
......@@ -449,27 +436,26 @@ SCEFMSISDNLessMOSMS ::= SEQUENCE
}
-- 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
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 [12] SCSASID,
validityTime [13] Timestamp OPTIONAL
}
-- =================
-- ===============
-- SCEF parameters
-- =================
-- ===============
SCEFFailureCause ::= ENUMERATED
{
......@@ -504,10 +490,9 @@ EPSBearerID ::= INTEGER (0..255)
APN ::= UTF8String
-- =================
-- ==========================
-- Common SCEF/NEF parameters
-- =================
-- ==========================
RDSSupport ::= BOOLEAN
......@@ -515,15 +500,15 @@ RDSPortNumber ::= INTEGER (0..15)
RDSAction ::= ENUMERATED
{
reservePort (1),
releasePort (2)
reservePort(1),
releasePort(2)
}
SerializationFormat ::= ENUMERATED
{
xml (1),
json (2),
cbor (3)
xml(1),
json(2),
cbor(3)
}
ApplicationID ::= OCTET STRING
......@@ -534,37 +519,37 @@ TriggerID ::= UTF8String
PriorityDT ::= ENUMERATED
{
noPriority (1),
priority (2)
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)
success(1),
unknown(2),
failure(3),
triggered(4),
expired(5),
unconfirmed(6),
replaced(7),
terminate(8)
}
StationaryIndication ::= ENUMERATED
{
stationary (1),
mobile (2)
stationary(1),
mobile(2)
}
BatteryIndication ::= ENUMERATED
{
batteryRecharge (1),
batteryReplace (2),
batteryNoRecharge (3),
batteryNoReplace (4),
noBattery (5)
batteryRecharge(1),
batteryReplace(2),
batteryNoRecharge(3),
batteryNoReplace(4),
noBattery(5)
}
ScheduledCommunicationTime ::= SEQUENCE
......@@ -588,29 +573,29 @@ Daytime ::= SEQUENCE
Day ::= ENUMERATED
{
monday (1),
tuesday (2),
wednesday (3),
thursday (4),
friday (5),
saturday (6),
sunday (7)
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)
singleTransUL(1),
singleTransDL(2),
dualTransULFirst(3),
dualTransDLFirst(4),
multiTrans(5)
}
ScheduledCommunicationType ::= ENUMERATED
{
downlinkOnly (1),
uplinkOnly (2),
bidirectional (3)
downlinkOnly(1),
uplinkOnly(2),
bidirectional(3)
}
-- ==================
......
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