Commit 99ce87a3 authored by ruiyue's avatar ruiyue
Browse files

Update file TS28623_GenericNrm.yaml

parent 37006fdc
Loading
Loading
Loading
Loading
Loading
+18 −415
Original line number Diff line number Diff line
@@ -51,30 +51,6 @@ components:
          type: string
        powerInterface:
          type: string
    ThresholdInfo:
      type: object
      properties:
        performanceMetrics:
          type: array
          items:
            type: string
        thresholdDirection:
          type: string
          enum:
            - UP
            - DOWN
            - UP_AND_DOWN
        thresholdValue:
          oneOf:
            - type: integer
            - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
        hysteresis:
          oneOf:
            - type: integer
              minimum: 0
            - type: number
              format: float
              minimum: 0
    Operation:
      type: object
      properties:
@@ -219,18 +195,7 @@ components:
          properties:
            streamTarget:
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
    Scope:
      type: object
      properties:
        scopeType:
          type: string
          enum:
            - BASE_ONLY
            - BASE_ALL
            - BASE_NTH_LEVEL
            - BASE_SUBTREE
        scopeLevel:
          type: integer

    ProcessMonitor:
      description: >-
        This data type is the "ProcessMonitor" data type without specialisations.
@@ -262,49 +227,6 @@ components:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        timer:
          type: integer
    FileDownloadJobProcessMonitor:
      description: >-
        This data type is the "ProcessMonitor" data type with specialisations
        for usage in the "FileDownloadJob".
      type: object
      properties:
        jobId:
          type: string
        status:
          type: string
          enum:
            - NOT_STARTED
            - RUNNING
            - FINSHED
            - FAILED
            - CANCELLING
            - CANCELLED
        progressPercentage:
          type: integer
          minimum: 0
          maximum: 100
        progressStateInfo:
          type: string
        resultStateInfo:
          oneOf:
            - type: string
              enum:
                - NULL
                - UNKNOWN
                - NO_STORAGE
                - LOW_MEMROY
                - NO_CONNECTION_TO_REMOTE_SERVER
                - FILE_NOT_AVAILABLE
                - DNS_CANNOT_BE_RESOLVED
                - TIMER_EXPIRED
                - OTHER
            - type: string
        startTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        endTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        timer:
          type: integer
    AreaScope:
      oneOf:
      - type: array
@@ -346,37 +268,6 @@ components:
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr'
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr'

    ManagementData:
      oneOf:
      - type: array
        items:
          type: string
          enum:
            - COVERAGE
            - CAPACITY
            - ENERGY_EFFICIENCY
            - MOBILITY
            - ACCESSIBILITY
      - type: array
        items:
          type: string
    NodeFilter:
      type: object
      properties:
        areaOfInterest:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest'
        networkDomain:
          type: string
          enum:
            - CN
            - RAN
        cpUpType:
          type: string
          enum:
            - CP
            - UP
        sst:
          type: integer
    SchedulingTime:
      oneOf:
        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
@@ -531,23 +422,23 @@ components:
        MeContext:
          $ref: '#/components/schemas/MeContext-Multiple'
        PerfMetricJob:
          $ref: '#/components/schemas/PerfMetricJob-Multiple'
          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
        ThresholdMonitor:
          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
        TraceJob:
          $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
        ManagementDataCollection:
          $ref: '#/components/schemas/ManagementDataCollection-Multiple'
          $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementDataCollection-Multiple'
        NtfSubscriptionControl:
          $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
        AlarmList:
          $ref: '#/components/schemas/AlarmList-Single'
          $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/AlarmList-Single'
        FileDownloadJob:
          $ref: '#/components/schemas/FileDownloadJob-Multiple'
          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
        Files:
          $ref: '#/components/schemas/Files-Multiple'
          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
        MnsRegistry:
          $ref: '#/components/schemas/MnsRegistry-Single'
          $ref: 'TS28623_MnSRegistryNrm.yaml#/components/schemas/MnsRegistry-Single'
        Scheduler:
          $ref: '#/components/schemas/Scheduler-Multiple'
        ConditionMonitor:
@@ -563,19 +454,19 @@ components:
        MnsAgent:
          $ref: '#/components/schemas/MnsAgent-Multiple'
        PerfMetricJob:
          $ref: '#/components/schemas/PerfMetricJob-Multiple'
          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
        ThresholdMonitor:
          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
        TraceJob:
          $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple'
        NtfSubscriptionControl:
          $ref: '#/components/schemas/NtfSubscriptionControl-Multiple'
          $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/NtfSubscriptionControl-Multiple'
        AlarmList:
          $ref: '#/components/schemas/AlarmList-Single'
          $ref: 'TS28623_FmControlNrm.yaml#/components/schemas/AlarmList-Single'
        FileDownloadJob:
          $ref: '#/components/schemas/FileDownloadJob-Multiple'
          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/FileDownloadJob-Multiple'
        Files:
          $ref: '#/components/schemas/Files-Multiple'
          $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple'
        Scheduler:
          $ref: '#/components/schemas/Scheduler-Multiple'
        ConditionMonitor:
@@ -626,9 +517,9 @@ components:
      type: object
      properties:
        PerfMetricJob:
          $ref: '#/components/schemas/PerfMetricJob-Multiple'
          $ref: 'TS28623_PmControlNrm.yaml#/components/schemas/PerfMetricJob-Multiple'
        ThresholdMonitor:
          $ref: '#/components/schemas/ThresholdMonitor-Multiple'
          $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdMonitor-Multiple'
        ManagedNFService:
          $ref: '#/components/schemas/ManagedNFService-Multiple'
        TraceJob:
@@ -720,248 +611,6 @@ components:
              properties:
                dnPrefix:
                  type: string
    PerfMetricJob-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              not:
                required: [ conditionMonitorRef, schedulerRef ]
              properties:
                administrativeState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
                operationalState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
                jobId:
                  type: string
                performanceMetrics:
                  type: array
                  items:
                    type: string
                granularityPeriod:
                  type: integer
                  minimum: 1
                objectInstances:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                rootObjectInstances:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                conditionMonitorRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                schedulerRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                reportingCtrl:
                  $ref: '#/components/schemas/ReportingCtrl'
            Files:
              $ref: '#/components/schemas/Files-Multiple'

    ThresholdMonitor-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                administrativeState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
                operationalState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
                thresholdInfoList:
                  type: array
                  items:
                    $ref: '#/components/schemas/ThresholdInfo'
                monitorGranularityPeriod:
                  type: integer
                  minimum: 1
                objectInstances:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                rootObjectInstances:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
    NtfSubscriptionControl-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                notificationRecipientAddress:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
                notificationTypes:
                  type: array
                  items:
                    $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType'
                scope:
                  $ref: '#/components/schemas/Scope'
                notificationFilter:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
            HeartbeatControl:
              $ref: '#/components/schemas/HeartbeatControl-Single'
    HeartbeatControl-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                heartbeatNtfPeriod:
                  type: integer
                  minimum: 0
                triggerHeartbeatNtf:
                  type: boolean

    ManagementDataCollection-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                managementData:
                  $ref: '#/components/schemas/ManagementData'
                targetNodeFilter:
                  $ref: '#/components/schemas/NodeFilter'
                collectionTimeWindow:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
                reportingCtrl:
                  $ref: '#/components/schemas/ReportingCtrl'
                dataScope:
                  type: string
                  enum:
                    - SNSSAI
                    - 5QI
                    - PLMN
    AlarmList-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                administrativeState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
                operationalState:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState'
                numOfAlarmRecords:
                  type: integer
                lastModification:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                alarmRecords:
                  description: >-
                     This resource represents a map of alarm records.
                     The alarmIds are used as keys in the map.
                  type: object
                  additionalProperties:
                    $ref: 'TS28532_FaultMnS.yaml#/components/schemas/AlarmRecord'
    FileDownloadJob-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                fileLocation:
                  type: string
                notificationRecipientAddress:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
                cancelJob:
                  type: string
                  enum:
                    - TRUE
                    - FALSE
                jobMonitor:
                  $ref: '#/components/schemas/FileDownloadJobProcessMonitor'
    Files-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                numberOfFiles:
                  type: integer
                jobRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                jobId:
                  type: string
                File:
                  $ref: '#/components/schemas/File-Multiple'
    File-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                fileLocation:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
                fileCompression:
                  type: string
                fileSize:
                  type: integer
                fileDataType:
                  type: string
                  enum:
                    - PERFORMANCE
                    - TRACE
                    - ANALYTICS
                    - PROPRIETARY
                fileFormat:
                  type: string
                fileReadyTime:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                fileExpirationTime:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
                fileContent:
                  type: string
                jobRef:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                jobId:
                  type: string
    MnsRegistry-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
            MnsInfo:
              $ref: '#/components/schemas/MnsInfo-Multiple'

    MnsInfo-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
        - type: object
          properties:
             mnsLabel:
               type: string
             mnsType:
               type: string
               enum:
                 - ProvMnS
                 - FaultSupervisionMnS
                 - StreamingDataReportingMnS
                 - FileDataReportingMnS
             mnsVersion:
               type: string
             mnsAddress:
               description: Resource URI as defined in the relevant Technical Specification
               $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri'
             mnsScope:
               description: >-
                 List of the managed object instances that can be accessed using the MnS.
                 If a complete SubNetwork can be accessed using the MnS, this attribute may 
                 contain the DN of the SubNetwork instead of the DNs of the individual managed 
                 entities within the SubNetwork.
               type: array
               items:
                 $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
    Scheduler-Single:
      allOf:
        - $ref: '#/components/schemas/Top'
@@ -1079,38 +728,6 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/MeContext-Single'
    PerfMetricJob-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/PerfMetricJob-Single'
    ThresholdMonitor-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/ThresholdMonitor-Single'
    ManagementDataCollection-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/ManagementDataCollection-Single'
    NtfSubscriptionControl-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/NtfSubscriptionControl-Single'
    FileDownloadJob-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/FileDownloadJob-Single'
    Files-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/Files-Single'
    File-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/File-Single'
    MnsInfo-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MnsInfo-Single'
    Scheduler-Multiple:
      type: array
      items:
@@ -1136,22 +753,8 @@ components:
       - $ref: '#/components/schemas/MeContext-Single'

       - $ref: '#/components/schemas/ManagedNFService-Single'

       - $ref: '#/components/schemas/PerfMetricJob-Single'
       - $ref: '#/components/schemas/ThresholdMonitor-Single'
       - $ref: '#/components/schemas/ManagementDataCollection-Single'
       
       - $ref: '#/components/schemas/NtfSubscriptionControl-Single'
       - $ref: '#/components/schemas/HeartbeatControl-Single'

       - $ref: '#/components/schemas/AlarmList-Single'

       - $ref: '#/components/schemas/FileDownloadJob-Single'
       - $ref: '#/components/schemas/Files-Single'
       - $ref: '#/components/schemas/File-Single'

       - $ref: '#/components/schemas/MnsRegistry-Single'
       - $ref: '#/components/schemas/MnsInfo-Single'
       - $ref: '#/components/schemas/Scheduler-Single'
       - $ref: '#/components/schemas/ConditionMonitor-Single'
       - $ref: '#/components/schemas/SupportedNotifications-Single'