Commit 67ffff60 authored by huangzhen's avatar huangzhen
Browse files

inclusion of corrections/features in CT3#146

parent d36375dc
Loading
Loading
Loading
Loading
Loading
+28 −3
Original line number Diff line number Diff line
@@ -343,6 +343,20 @@ components:
          items:
            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/QosPolicyAssistInfo'
          minItems: 1
        trafficPatterns:
          type: array
          items:
            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/TrafficPattern'
          minItems: 1
          description: The traffic pattern information.
        abnormalTraffic:
          type: array
          items:
            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/AbnormalUpTrafficInfo'
          minItems: 1
          description: >
            The abnormal user plane traffic information. It shall be present when the requested
            event is "ABNORMAL_UP_TRAFFIC".
        suppFeat:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/SupportedFeatures'

@@ -571,6 +585,14 @@ components:
            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/TimestampedLocation'
          minItems: 1
          description: Contains the last known location of target UE(s).
        abnorTrReqs:
          type: array
          items:
            $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/AbnormalUpTrafficReq'
          minItems: 1
          description: >
            Represents the abnormal user plane traffic analytics requirements.
            Shall only be present when the requested event is "ABNORMAL_UP_TRAFFIC".
      not:
        required: [anySlice, snssais]

@@ -935,6 +957,8 @@ components:
          - RELATIVE_PROXIMITY
          - SIGNALLING_STORM
          - QOS_POLICY_ASSIST
          - TRAFFIC_PATTERN
          - ABNORMAL_UP_TRAFFIC
      - type: string
        description: >
          This string provides forward-compatibility with future
@@ -946,14 +970,14 @@ components:
        - LOAD_LEVEL_INFORMATION: Represent the analytics of load level information of corresponding
          network slice.
        - NETWORK_PERFORMANCE: Represent the analytics of network performance information.
        - NF_LOAD: Indicates that the event subscribed is NF Load.
        - NF_LOAD: Indicates that the event is NF Load.
        - SERVICE_EXPERIENCE: Represent the analytics of service experience information of the
          specific applications.
        - UE_MOBILITY: Represent the analytics of UE mobility.
        - UE_COMMUNICATION: Represent the analytics of UE communication.
        - QOS_SUSTAINABILITY: Represent the analytics of QoS sustainability information in the
          certain area.
        - ABNORMAL_BEHAVIOUR: Indicates that the event subscribed is abnormal behaviour information.
        - ABNORMAL_BEHAVIOUR: Indicates that the event is abnormal behaviour information.
        - USER_DATA_CONGESTION: Represent the analytics of the user data congestion in the certain
          area.
        - NSI_LOAD_LEVEL: Represent the analytics of Network Slice and the optionally associated
@@ -971,7 +995,8 @@ components:
        - RELATIVE_PROXIMITY: Represents the analytics of Relative Proximity information.
        - SIGNALLING_STORM: Represents the analytics of Signalling Storm information.
        - QOS_POLICY_ASSIST: Represents the analytics of QoS and Policy Assistance information.

        - TRAFFIC_PATTERN: Indicates that the event subscribed is the traffic pattern information.
        - ABNORMAL_UP_TRAFFIC: Represents the analytics of abnormal user plane traffic information.

    ContextType:
      anyOf:
+173 −6
Original line number Diff line number Diff line
@@ -485,6 +485,11 @@ components:
          $ref: '#/components/schemas/NwdafEvent'
        extraReportReq:
          $ref: '#/components/schemas/EventReportingRequirement'
        fDescs:
          type: array
          items:
            $ref: '#/components/schemas/IpEthFlowDescription'
          minItems: 1
        ladnDnns:
          type: array
          items:
@@ -575,6 +580,11 @@ components:
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketDelBudget'
          minItems: 1
        qosFlowMaintThds:
          type: array
          items:
            $ref: '#/components/schemas/MaintainabilityThreshold'
          minItems: 1
        repetitionPeriod:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        snssaia:
@@ -733,6 +743,12 @@ components:
            $ref: '#/components/schemas/TimestampedLocation'
          minItems: 1
          description: Contains the last known location of target UE(s).
        abnorTrReqs:
          type: array
          items:
            $ref: '#/components/schemas/AbnormalUpTrafficReq'
          minItems: 1
          description: Represents the Abnormal User Plane Traffic analytics requirements.
      required:
        - event
      not:
@@ -928,6 +944,18 @@ components:
            $ref: '#/components/schemas/QosPolicyAssistInfo'
          minItems: 1
          description: The QoS and policy assistance information.
        abnormalTrafficInfos:
          type: array
          items:
            $ref: '#/components/schemas/AbnormalUpTrafficInfo'
          minItems: 1
          description: The abnormal user plane traffic information.
        trafficPatterns:
          type: array
          items:
            $ref: '#/components/schemas/TrafficPattern'
          minItems: 1
          description: The traffic pattern information.
      required:
        - event

@@ -1381,6 +1409,8 @@ components:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate'
        e2eDelayThd:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketDelBudget'
        qosFlowMaintThd:
          $ref: '#/components/schemas/MaintainabilityThreshold'
        snssai:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Snssai'
        confidence:
@@ -1389,6 +1419,7 @@ components:
        - required: [qosFlowRetThd]
        - required: [ranUeThrouThd]
        - required: [e2eDelayThd]
        - required: [qosFlowMaintThd]

    QosRequirement:
      description: Represents the QoS requirements.
@@ -1639,6 +1670,17 @@ components:
          - required: [relTimeUnit]
        - required: [relFlowRatio]

    MaintainabilityThreshold:
      description: Represents a QoS flow maintainability threshold.
      type: object
      properties:
        notFulfilQosFlow:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        notFulfilQosFlowTimeUnit:
          $ref: '#/components/schemas/TimeUnit'
      required:
        - notFulfilQosFlow

    NetworkPerfRequirement:
      description: Represents a network performance requirement.
      type: object
@@ -2887,6 +2929,10 @@ components:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        accuDevThr:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        lossThr:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        anaMetric:
          $ref: 'TS29520_Nnwdaf_MLModelProvision.yaml#/components/schemas/MLModelMetric'
        minNum:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        updatedAnaFlg:
@@ -2905,12 +2951,17 @@ components:
      properties:
        accuracyVal:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        lossVal:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        anaMetric:
          $ref: 'TS29520_Nnwdaf_MLModelProvision.yaml#/components/schemas/MLModelMetric'
        accuSampleNbr:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        anaAccuInd:
          $ref: '#/components/schemas/AnalyticsAccuracyIndication'
      required:
        - accuracyVal
      oneOf:
        - required: [accuracyVal]
        - required: [lossVal]

    MovBehavReq:
      description: Represents the Movement Behaviour analytics requirements.
@@ -3036,7 +3087,7 @@ components:
        exterGroupIds:
          type: array
          items:
            $ref: 'TS29122_CommonData.yaml#/components/schemas/ExternalGroupId'
            $ref: 'TS29571_CommonData.yaml#/components/schemas/ExternalGroupId'
          minItems: 1
      required:
        - tsStart
@@ -3240,7 +3291,7 @@ components:
        srcExterGroupIds:
          type: array
          items:
            $ref: 'TS29122_CommonData.yaml#/components/schemas/ExternalGroupId'
            $ref: 'TS29571_CommonData.yaml#/components/schemas/ExternalGroupId'
          minItems: 1
        srcSupis:
          type: array
@@ -3288,6 +3339,22 @@ components:
          type: integer
        confidence:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        dnns:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
          minItems: 1
          description: >
            Represents the DNN(s) which corresponds to the source UE(s) causing the signalling
            storm.
        snssais:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Snssai'
          minItems: 1
          description: >
            Represents the network slice(s) which corresponds to the source UE(s) causing the
            signalling storm.
      required:
        - sigStormCauses
      oneOf:
@@ -3336,6 +3403,10 @@ components:
          type: string
        timerDur:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        dnn:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn'
        snssai:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Snssai'

    QosPolicyAssistReq:
      description: The QoS and policy assistance analytics requirement information.
@@ -3490,6 +3561,99 @@ components:
        extMaxDataBurstVol:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVol'

    TrafficPattern:
      description: The traffic pattern information.
      type: object
      properties:
        appId:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/ApplicationId'
        fDescs:
          type: array
          items:
            $ref: '#/components/schemas/IpEthFlowDescription'
          minItems: 1
        intGroupIds:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/GroupId'
          minItems: 1
        supis:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Supi'
          minItems: 1
        gpsis:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Gpsi'
          minItems: 1
        ueIpAddrs:
          $ref: '#/components/schemas/AddressList'
        avgWin:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/AverWindow'
        maxDataBurstVol:
          $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/MaxDataBurstVol'
        mbrUl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate'
        mbrDl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate'
        gbrUl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate'
        gbrDl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/BitRate'
        delayUl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketDelBudget'
        delayDl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketDelBudget'
        perUl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketErrRate'
        perDl:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketErrRate'
        periodicity:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        confidence:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'

    AbnormalUpTrafficReq:
      description: The Abnormal User Plane Traffic requirement information.
      type: object
      properties:
        abnorTraPatId:
          type: string
      required:
        - abnorTraPatId

    AbnormalUpTrafficInfo:
      description: The Abnormal User Plane Traffic information.
      type: object
      properties:
        abnorTraPatId:
          type: string
        fDescs:
          type: array
          items:
            $ref: '#/components/schemas/IpEthFlowDescription'
          minItems: 1
        anomalyType:
          type: string
        trafficPara:
          type: string
        severity:
          type: string
        upfId:
          type: string
        ueIpAddrs:
          $ref: '#/components/schemas/AddressList'
        appInfo:
          type: string
        validityPeriod:
          $ref: 'TS29122_CommonData.yaml#/components/schemas/TimeWindow'
        confidence:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
      required:
        - abnorTraPatId


#
# ENUMERATIONS DATA TYPES
#
@@ -3539,6 +3703,8 @@ components:
          - RELATIVE_PROXIMITY
          - SIGNALLING_STORM
          - QOS_POLICY_ASSIST
          - ABNORMAL_UP_TRAFFIC
          - TRAFFIC_PATTERN
      - type: string
        description: >
          This string provides forward-compatibility with future
@@ -3582,6 +3748,9 @@ components:
        - SIGNALLING_STORM: Indicates that the event subscribed is the Signalling Storm information.
        - QOS_POLICY_ASSIST: Indicates that the event subscribed is the QoS and Policy
          Assistance information.
        - ABNORMAL_UP_TRAFFIC: Indicates that the event subscribed is the abnormal traffic
          information.
        - TRAFFIC_PATTERN: Indicates that the event subscribed is the traffic pattern information.

    Accuracy:
      anyOf:
@@ -4533,8 +4702,6 @@ components:
          - SIGNALLING_STORM_CAUSED_BY_UE: The signalling storm is caused by UEs.
          - SIGNALLING_STORM_CAUSED_BY_NF: The signalling storm is caused by NF.



    QosPolOrderCriterion:
      anyOf:
      - type: string
+4 −0
Original line number Diff line number Diff line
@@ -374,6 +374,8 @@ components:
          $ref: 'TS29520_Nnwdaf_MLModelProvision.yaml#/components/schemas/MLModelMetric'
        accuThreshold:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        lossThreshold:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        eventReportReq:
          $ref: 'TS29523_Npcf_EventExposure.yaml#/components/schemas/ReportingInformation'
        immReport:
@@ -448,6 +450,8 @@ components:
          $ref: 'TS29520_Nnwdaf_MLModelProvision.yaml#/components/schemas/MLModelMetric'
        mlModelAcc:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        mlModelLoss:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        monitorInterval:
          $ref: 'TS29122_CommonData.yaml#/components/schemas/TimeWindow'
      required:
+17 −4
Original line number Diff line number Diff line
@@ -486,6 +486,8 @@ components:
          $ref: 'TS29122_CommonData.yaml#/components/schemas/TimeWindow'
        mlAccuracyThreshold:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        mlLossThreshold:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        modelMetric:
          $ref: '#/components/schemas/MLModelMetric'

@@ -521,6 +523,8 @@ components:
          $ref: '#/components/schemas/MLModelMetric'
        accMLModel:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        lossMLModel:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        modelUpdateInd:
          type: boolean
          description: >
@@ -589,6 +593,8 @@ components:
          $ref: '#/components/schemas/VflTrainingStatus'
        expCompTime:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/DurationSec'
        vflCorrId:
          type: string

#
# ENUMERATIONS DATA TYPES
@@ -615,6 +621,10 @@ components:
      - type: string
        enum:
          - ACCURACY
          - MSE
          - RMSE
          - MAE
          - MAPE
      - type: string
        description: >
          This string provides forward-compatibility with future extensions to the enumeration but
@@ -622,7 +632,11 @@ components:
      description: |
        Represents the metric of the ML model.  
        Possible values are:
        - ACCURACY: ML Model Accuracy metric.
        - ACCURACY: Indicates that Analytics/ML Model metric is accuracy.
        - MSE: Indicates that Analytics/ML Model metric is mean squared error.
        - RMSE: Indicates that Analytics/ML Model metric is root mean squared error.
        - MAE: Indicates that Analytics/ML Model metric is mean absolute error.
        - MAPE: Indicates that Analytics/ML Model metric is mean absolute percentage error.

    VflTrainingStatus:
      anyOf:
@@ -637,9 +651,8 @@ components:
      description: |
        Represents VFL training status.  
        Possible values are:
        - ONGOING: Indicates that the NWDAF cannot be a VFL server and VFL training is ongoing.
        - TERMINATED: Indicates that the NWDAF cannot be a VFL server and VFL training is
          terminated.
        - ONGOING: Indicates that VFL training is ongoing.
        - TERMINATED: Indicates that VFL training is terminated.

    PositioningCase:
      anyOf:
+4 −0
Original line number Diff line number Diff line
@@ -564,6 +564,10 @@ components:
      properties:
        mlModelAcc:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Uinteger'
        mlModelLoss:
          $ref: 'TS29571_CommonData.yaml#/components/schemas/Float'
        modelMetric:
          $ref: 'TS29520_Nnwdaf_MLModelProvision.yaml#/components/schemas/MLModelMetric'
        trainInDataInfo:
          $ref: '#/components/schemas/TrainDataInfo'

Loading