Commit ce069cd4 authored by Steije van Schelt's avatar Steije van Schelt
Browse files

Improved syntax of NEF ASN.1 (fixed a couple of other imperfections as well).

parent 14b2d50c
Pipeline #3741 failed with stages
in 1 minute and 27 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,
-- NEF services related events
-- PDU to MA PDU session-related events, see clause 6.2.3.2.8
sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification,
-- NEF services related events, see clause X
nEFPDUSessionEstablishment [70] NEFPDUSessionEstablishment,
nEFPDUSessionModification [71] NEFPDUSessionModification,
nEFPDUSessionRelease [72] NEFPDUSessionRelease,
......@@ -272,7 +272,7 @@ IRITargetIdentifier ::= SEQUENCE
CCPayload ::= SEQUENCE
{
cCPayloadOID [1] RELATIVE-OID,
pDU [2] CCPDU
pDU [2] CCPDU
}
CCPDU ::= CHOICE
......@@ -290,20 +290,19 @@ 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,
......@@ -318,24 +317,22 @@ NEFPDUSessionEstablishment ::= SEQUENCE
}
-- 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,
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
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,
......@@ -349,22 +346,20 @@ NEFPDUSessionRelease ::= SEQUENCE
}
-- 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,
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
applicationID [8] ApplicationID,
aFID [9] AFID
}
-- See clause 7.Y.2.1.6 for details of this structure
NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
{
sUPI [1] SUPI,
......@@ -379,7 +374,6 @@ NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE
}
-- See clause 7.Y.3.1.1 for details of this structure
NEFDeviceTrigger ::= SEQUENCE
{
sUPI [1] SUPI,
......@@ -394,7 +388,6 @@ NEFDeviceTrigger ::= SEQUENCE
}
-- See clause 7.Y.3.1.2 for details of this structure
NEFDeviceTriggerReplace ::= SEQUENCE
{
sUPI [1] SUPI,
......@@ -409,7 +402,6 @@ NEFDeviceTriggerReplace ::= SEQUENCE
}
-- See clause 7.Y.3.1.3 for details of this structure
NEFDeviceTriggerCancellation ::= SEQUENCE
{
sUPI [1] SUPI,
......@@ -418,7 +410,6 @@ NEFDeviceTriggerCancellation ::= SEQUENCE
}
-- See clause 7.Y.3.1.4 for details of this structure
NEFDeviceTriggerReportNotify ::= SEQUENCE
{
sUPI [1] SUPI,
......@@ -428,7 +419,6 @@ NEFDeviceTriggerReportNotify ::= SEQUENCE
}
-- See clause 7.Y.4.1.1 for details of this structure
NEFMSISDNLessMOSMS ::= SEQUENCE
{
sUPI [1] SUPI,
......@@ -440,27 +430,25 @@ NEFMSISDNLessMOSMS ::= SEQUENCE
}
-- 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,
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
aFID [11] AFID,
validityTime [12] Timestamp OPTIONAL
}
-- =================
-- ==========================
-- Common SCEF/NEF parameters
-- =================
-- ==========================
RDSSupport ::= BOOLEAN
......@@ -468,15 +456,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
......@@ -487,37 +475,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
......@@ -541,29 +529,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