Commit ae1c13c0 authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0148

parents 0dcc72e8 9d6720d9

OpenAPI/genericNrm.yaml

+69 −3
Original line number Diff line number Diff line 
openapi: 3.0.1

info:

  title: Generic NRM

  version: 17.0.0

  version: 17.1.0

  description: >-

    OAS 3.0.1 definition of the Generic NRM

    © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    © 2022, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC).

    All rights reserved.

externalDocs:

  description: 3GPP TS 28.623; Generic NRM
@@ -1358,6 +1358,8 @@ components: 
          $ref: '#/components/schemas/AlarmList-Single'

        FileDownloadJob:

          $ref: '#/components/schemas/FileDownloadJob-Multiple'

        Files:

          $ref: '#/components/schemas/Files-Multiple'

        MnsRegistry:

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

    ManagedElement-ncO:
@@ -1377,6 +1379,8 @@ components: 
          $ref: '#/components/schemas/AlarmList-Single'

        FileDownloadJob:

          $ref: '#/components/schemas/FileDownloadJob-Multiple'

        Files:

          $ref: '#/components/schemas/Files-Multiple'



#-------- Definition of abstract IOCs --------------------------------------------
@@ -1642,6 +1646,8 @@ components: 
                  $ref: 'comDefs.yaml#/components/schemas/DnList'

                reportingCtrl:

                  $ref: '#/components/schemas/ReportingCtrl'

            Files:

              $ref: '#/components/schemas/Files-Multiple'

    ThresholdMonitor-Single:

      allOf:

        - $ref: '#/components/schemas/Top'
@@ -1709,7 +1715,8 @@ components: 
          properties:

            attributes:

              $ref: '#/components/schemas/TraceJob-Attr'



            Files:

              $ref: '#/components/schemas/Files-Multiple'

    AlarmList-Single:

      allOf:

        - $ref: '#/components/schemas/Top'
@@ -1752,6 +1759,55 @@ components: 
                    - 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: '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: 'comDefs.yaml#/components/schemas/Uri'

                fileCompression:

                  type: string

                fileSize:

                  type: integer

                fileDataType:

                  type: string

                  enum:

                    - PERFORMANCE

                    - TRACE

                    - ANALYTICS

                    - PROPRIETARY

                fileFormat:

                  type: string

                fileReadyTime:

                  $ref: 'comDefs.yaml#/components/schemas/DateTime'

                fileExpirationTime:

                  $ref: 'comDefs.yaml#/components/schemas/DateTime'

                fileContent:

                  type: string

                jobRef:

                  $ref: 'comDefs.yaml#/components/schemas/Dn'

                jobId:

                  type: string

    MnsInfo-Single:

      type: object

      properties:
@@ -1817,6 +1873,14 @@ components: 
      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:
@@ -1845,6 +1909,8 @@ components: 
       - $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'