Commit b283fc29 authored by canterburym's avatar canterburym
Browse files

From draft_s3i210221-r2

parent bcce803b
Loading
Loading
Loading
Loading
Loading
+45 −41
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ BEGIN
-- Relative OIDs
-- =============

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version5(5)}
tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version0(0)}

xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}
xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -122,15 +122,14 @@ sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessio

    -- NEF services related events, see clause 6.2.X

nEFdeviceTrigger						[YY] NEFDeviceTrigger,
nEFdeviceTriggerReplace					[YY] NEFDeviceTriggerReplace,
nEFdeviceTriggerCancel						[YY] NEFDeviceTriggerCancel,
nEFdeviceTriggerReportNotify					[YY] NEFDeviceTriggerReportNotify,
nEFMSISDNLessMOSMS						[YY] NEFMSISDNLessMOSMS,
nEFExpectedUEBehaviour						[YY] NEFExpectedUEBehaviour
nEFdeviceTrigger						[65] NEFDeviceTrigger,
nEFdeviceTriggerReplace					[66] NEFDeviceTriggerReplace,
nEFdeviceTriggerCancellation						[67] NEFDeviceTriggerCancellation,
nEFdeviceTriggerReportNotify					[68] NEFDeviceTriggerReportNotify,
nEFMSISDNLessMOSMS						[69] NEFMSISDNLessMOSMS,
nEFExpectedUEBehaviour						[70] NEFExpectedUEBehaviour
}


-- ==============
-- X3 xCC payload
-- ==============
@@ -243,12 +242,12 @@ IRIEvent ::= CHOICE
    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification,
    -- NEF services related events, see clause 6.2.X

nEFdeviceTrigger						[YY] NEFDeviceTrigger,
nEFdeviceTriggerReplace					[YY] NEFDeviceTriggerReplace,
nEFdeviceTriggerCancel						[YY] NEFDeviceTriggerCancel,
nEFdeviceTriggerReportNotify					[YY] NEFDeviceTriggerReportNotify,
nEFMSISDNLessMOSMS						[YY] NEFMSISDNLessMOSMS,
nEFExpectedUEBehaviour						[YY] NEFExpectedUEBehaviour 
nEFdeviceTrigger						[65] NEFDeviceTrigger,
nEFdeviceTriggerReplace					[66] NEFDeviceTriggerReplace,
nEFdeviceTriggerCancellation						[67] NEFDeviceTriggerCancellation,
nEFdeviceTriggerReportNotify					[68] NEFDeviceTriggerReportNotify,
nEFMSISDNLessMOSMS						[69] NEFMSISDNLessMOSMS,
nEFExpectedUEBehaviour						[70] NEFExpectedUEBehaviour
}

IRITargetIdentifier ::= SEQUENCE
@@ -287,19 +286,20 @@ LINotificationPayload ::= SEQUENCE
LINotificationMessage ::= CHOICE
{
    lINotification      [1] LINotification 
}-- =================
-- NEF definitions
-- =================
}

-- ========================
-- NEF services definitions
-- ========================
-- See clause 6.2.X.3.1 for details of this structure

NEFDeviceTrigger ::= SEQUENCE
{
    sUPI                  	[1] SUPI,
    gPSI                   	[2] GPSI,
    triggerId	           	[3] UTF8String,
    triggerId	           	[3] NEFTriggerID,
    aFID	           	[4] AFID OPTIONAL,
    triggerPayload	      	[5] UTF8String OPTIONAL,
    triggerPayload	      	[5] NEFTriggerPayload OPTIONAL,
    validityPeriod  		[6] INTEGER OPTIONAL,
    priority			[7] INTEGER OPTIONAL,
    sourcePortId		[8] PortNumber OPTIONAL,
@@ -313,9 +313,9 @@ NEFDeviceTriggerReplace ::= SEQUENCE
{
    sUPI                  	[1] SUPI,
    gPSI                   	[2] GPSI,
    triggerId	           	[1] UTF8String,
    triggerId	           	[1] NEFTriggerID,
    aFID	           	[2] AFID OPTIONAL,
    triggerPayload	      	[3] UTF8String OPTIONAL,
    triggerPayload	      	[3] NEFTriggerPayload OPTIONAL,
    validityPeriod  		[4] INTEGER OPTIONAL,
    priority			[5] INTEGER OPTIONAL,
    sourcePortId		[6] PortNumber OPTIONAL,
@@ -328,7 +328,7 @@ NEFDeviceTriggerCancellation ::= SEQUENCE
{
    sUPI                  	[1] SUPI,
    gPSI                   	[2] GPSI,
    triggerId	           	[1] UTF8String
    triggerId	           	[1] NEFTriggerID
}

-- See clause 6.2.X.3.4 for details of this structure
@@ -337,8 +337,8 @@ NEFDeviceTriggerReportNotify ::= SEQUENCE
{
    sUPI                  		[1] SUPI,
    gPSI                   		[2] GPSI,
    triggerId              		[1] UTF8String,
    deviceTriggerDeliveryResult 	[2] DeviceTriggerDeliveryResult
    triggerId              		[1] NEFTriggerID,
    deviceTriggerDeliveryResult 	[2] NEFDeviceTriggerDeliveryResult
}

-- See clause 6.2.X.4.1 for details of this structure
@@ -359,25 +359,29 @@ NEFMSISDNLessMOSMS ::= SEQUENCE
NEFExpectedUEBehaviour ::= SEQUENCE
{
    gPSI                   		[1] GPSI,
    expectedUEMovingTrajectory 	[2] SEQUENCE OF LocationArea,
    stationaryIndication		[3] StationaryIndication OPTIONAL,
    expectedUEMovingTrajectory 	[2] SEQUENCE OF NEFLocationArea OPTIONAL,
    stationaryIndication		[3] NEFStationaryIndication OPTIONAL,
    communicationDurationTime		[4] INTEGER OPTIONAL,
    periodicTime			[5] INTEGER OPTIONAL,
    scheduledCommunicationTime	[6] ScheduledCommunicationTime OPTIONAL,
    batteryIndication 			[7] BatteryIndication OPTIONAL,
    trafficProfile			[8] TrafficProfile OPTIONAL,	
    scheduledCommunicationType	[9] ScheduledCommunicationType OPTIONAL,		
    scheduledCommunicationTime	[6] NEFScheduledCommunicationTime OPTIONAL,
    batteryIndication 			[7] NEFBatteryIndication OPTIONAL,
    trafficProfile			[8] NEFTrafficProfile OPTIONAL,
    scheduledCommunicationType	[9] NEFScheduledCommunicationType OPTIONAL,
    aFID				[10] AFID,
    validityTime			[11] Timestamp OPTIONAL
}


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

AFID ::= UTF8String

NEFTriggerID ::= UTF8String
NEFTriggerPayload ::= UTF8String

DeviceTriggerDeliveryResult ::= ENUMERATED
NEFDeviceTriggerDeliveryResult ::= ENUMERATED
{
    success (1),
    unknown (2),
@@ -390,13 +394,13 @@ DeviceTriggerDeliveryResult ::= ENUMERATED
}


StationaryIndication ::= ENUMERATED
NEFStationaryIndication ::= ENUMERATED
{
    stationary (1),
    mobile (2) 
}

BatteryIndication ::= ENUMERATED
NEFBatteryIndication ::= ENUMERATED
{
    batteryRecharge (1),
    batteryReplace (2),
@@ -405,7 +409,7 @@ BatteryIndication ::= ENUMERATED
    noBattery (5)
}

ScheduledCommunicationTime ::= SEQUENCE
NEFScheduledCommunicationTime ::= SEQUENCE
{
    days [1] SEQUENCE OF Daytime
}
@@ -429,7 +433,7 @@ Day ::= ENUMERATED
    sunday (7)
}

TrafficProfile ::= ENUMERATED
NEFTrafficProfile ::= ENUMERATED
{
    singleTransUL (1),
    singleTransDL (2),
@@ -438,7 +442,7 @@ TrafficProfile ::= ENUMERATED
    multiTrans (5)
}

ScheduledCommunicationType ::= ENUMERATED
NEFScheduledCommunicationType ::= ENUMERATED
{
    downlinkOnly (1),
    uplinkOnly (2),
@@ -3051,7 +3055,7 @@ OGCURN ::= UTF8String
-- TS 29.572 [24], clause 6.1.6.2.15
MethodCode ::= INTEGER (16..31)

LocationArea ::= CHOICE
NEFLocationArea ::= CHOICE
{
geographicArea [1] GeographicArea,
civicAddress	[2] CivicAddress,