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

Resolving merge conflict

parents 3c4f5d17 e7d98f30
Loading
Loading
Loading
Loading
Loading
+140 −0
Original line number Diff line number Diff line
@@ -207,6 +207,15 @@ XIRIEvent ::= CHOICE

    -- UDM events, see clause 7.2.2.3, continued from tag 110
    uDMStartOfInterceptionWithRegisteredTarget          [901] UDMStartOfInterceptionWithRegisteredTarget
    
    -- 5GMS AF events, see clause 7.X.2
    fiveGMSAFServiceAccessInformation                     [200] FiveGMSAFServiceAccessInformation,
    fiveGMSAFConsumptionReporting                         [201] FiveGMSAFConsumptionReporting,
    fiveGMSAFDynamicPolicyInvocation                      [202] FiveGMSAFDynamicPolicyInvocation,
    fiveGMSAFMetricsReporting                             [203] FiveGMSAFMetricsReporting,
    fiveGMSAFNetworkAssistance                            [204] FiveGMSAFNetworkAssistance,
    fiveGMSAFUnsuccessfulProcedure                        [205] FiveGMSAFUnsuccessfulProcedure,
    fiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE   [206] FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE
}

-- ==============
@@ -406,6 +415,15 @@ IRIEvent ::= CHOICE

    -- UDM events, see clause 7.2.2.4, continued from tag 110
    uDMStartOfInterceptionWithRegisteredTarget          [901] UDMStartOfInterceptionWithRegisteredTarget

    -- 5GMS AF events, see clause 7.X.3
    fiveGMSAFServiceAccessInformation                     [200] FiveGMSAFServiceAccessInformation,
    fiveGMSAFConsumptionReporting                         [201] FiveGMSAFConsumptionReporting,
    fiveGMSAFDynamicPolicyInvocation                      [202] FiveGMSAFDynamicPolicyInvocation,
    fiveGMSAFMetricsReporting                             [203] FiveGMSAFMetricsReporting,
    fiveGMSAFNetworkAssistance                            [204] FiveGMSAFNetworkAssistance,
    fiveGMSAFUnsuccessfulProcedure                        [205] FiveGMSAFUnsuccessfulProcedure,
    fiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE   [206] FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE
}

IRITargetIdentifier ::= SEQUENCE
@@ -4171,8 +4189,130 @@ EESEndpoint ::= SEQUENCE
    uRI              [4] UTF8String OPTIONAL
}

-- =================
-- 5GMS AF definitions
-- =================

-- See clause 7.X.2.2 for details of this structure
FiveGMSAFServiceAccessInformation ::= SEQUENCE
{
    gPSI                                [1] GPSI,
    serviceAccessInformationResource    [2] SBIType
}

-- See clause 7.X.2.3 for details of this structure
FiveGMSAFConsumptionReporting ::= SEQUENCE
{
    gPSI                 [1] GPSI,
    consumptionReport    [2] SBIType
}

-- See clause 7.X.2.4 for details of this structure
FiveGMSAFDynamicPolicyInvocation ::= SEQUENCE
{
    gPSI                        [1] GPSI,
    dynamicPolicyResource       [2] SBIType,
    dPIoperationType            [3] DPIOperationType
}

-- See clause 7.X.2.5 for details of this structure
FiveGMSAFMetricsReporting ::= SEQUENCE
{
    gPSI             [1] GPSI,
    metricsReport    [2] XMLType
}

-- See clause 7.X.2.6 for details of this structure
FiveGMSAFNetworkAssistance ::= SEQUENCE
{
    gPSI                                [1] GPSI,
    networkAssistanceSessionResource    [2] SBIType,
    nAOperationType                     [3] NAOperationType
}

FiveGMSAFUnsuccessfulProcedure ::= SEQUENCE
{
    gPSI                              [1] GPSI,
    fiveGMSAFUnsuccessfulOperation    [2] FiveGMSAFUnsuccessfulOperation,
    fiveGMSAFErrorCode                [3] FiveGMSAFErrorCode
}

-- See clause 7.X.2.7 for details of this structure
FiveGMSAFStartOfInterceptionWithAlreadyConfiguredUE ::= SEQUENCE
{
     gPSI                                [1] GPSI,
     serviceAccessInformationResource    [2] SBIType
}

-- ==============
-- 5GMS AF parameters
-- ==============

DPIOperationType ::= ENUMERATED
{
    createDynamicPolicy(1),
    updateDynamicPolicy(2),
    patchDynamicPolicy(3),
    deleteDynamicPolicy(4)
}

NAOperationType ::= ENUMERATED
{
    createNetworkAssistanceSession(1),
    retrieveNetworkAssistanceSession(2),
    updateNetworkAssistanceSession(3),
    patchNetworkAssistanceSession(4),
    destroyNetworkAssistanceSession(5),
    requestBitRateRecommendation(6),
    requestDeliveryBoost(7)
}

FiveGMSAFUnsuccessfulOperation::= ENUMERATED
{
    retrieveServiceAccessInformation(1),
    submitConsumptionReport(2),
    submitMetricsReport(3),
    createDynamicPolicy(4),
    retrieveDynamicPolicy(5),
    updateDynamicPolicy(6),
    patchDynamicPolicy(7),
    destroyDynamicPolicy(8),
    createNetworkAssistanceSession(9),
    retrieveNetworkAssistanceSession(10),
    updateNetworkAssistanceSession(11),
    patchNetworkAssistanceSession(12),
    destroyNetworkAssistanceSession(13),
    requestBitRateRecommendation(14),
    requestDeliveryBoost(15)
}

FiveGMSAFErrorCode ::=ENUMERATED
{
    badRequest400(1),
    unauthorized401(2),
    notFound404(3),
    unsupportedMediaType415(4)
}

SBIType ::= SEQUENCE
{
    sBIReference         [1] SBIReference,
    sBIValue             [2] SBIValue
}

SBIReference ::= UTF8String

SBIValue ::= UTF8String

XMLType ::= SEQUENCE
{
    xMLNamespace [1] XMLNamespace,
    xMLValue     [2] XMLValue
}

XMLNamespace ::= UTF8String

XMLValue ::= UTF8String
-- ===================
-- 5G LALS definitions
-- ===================