Commit b4ecfe64 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'Rel18_TS28.623_Add_NRM_fragments_for_scheduler_and_condition_mupdaonitor_(OpenAPI_definition)' into 'Integration_Rel18_SA5_151_YAML'

Rel18 ts28.623 add nrm fragments for scheduler and condition mupdaonitor (open api definition)

See merge request !814
parents d59552ee bef98aaa

OpenAPI/TS28623_ComDefs.yaml

+40 −6
Original line number Diff line number Diff line
@@ -19,6 +19,23 @@ components: 
    DateTime:

      type: string

      format: date-time

    FullTime:

      type: string

      description: format (e.g., full-time) is from RFC 3339

      format: full-time

    DateMonth:

      type: string

      format: date-month

    DateMonthDay:

      type: string

      format: date-mday

    DayInYear:

      type: object

      properties:

        month:

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

        monthDay:

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

    Latitude:

      type: number

      format: float
@@ -65,10 +82,19 @@ components: 
      type: string

      pattern: '^[A-Fa-f0-9]{9}$'

    TimeWindow:

      type: object

      oneOf:  

        - type: object

          properties:

            startTime:

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

            endTime:

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

        - type: object

          properties:

            startTime:

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

        - type: object

          properties:

            endTime:

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

    GeoCoordinate:
@@ -150,6 +176,14 @@ components: 
    Uri:

      type: string



    TimeInterval:

      type: object

      properties:

        intervalStart:

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

        intervalEnd:

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



    AdministrativeState:

      type: string

      enum:

OpenAPI/TS28623_GenericNrm.yaml

+91 −0
Original line number Diff line number Diff line
@@ -397,6 +397,45 @@ components: 
            - UP

        sst:

          type: integer

    SchedulingTime:

      oneOf:

        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'

        - type: object

          properties:

            timeIntervals:

              type: array

              items:

                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval'

        - type: object

          properties:

            timeIntervals:

              type: array

              items:

                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval'

            daysOfWeek:

              type: array

              items:

                type: string

                enum:

                  - MONDAY

                  - TUESDAY

                  - WEDNESDAY

                  - THURSDAY

                  - FRIDAY

                  - SATURDAY

                  - SUNDAY

        - type: object

          properties:

            timeIntervals:

              type: array

              items:

                $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval'

            daysOfMonth:

              type: array

              items:

                type: integer

                minimum: 0

                maximum: 31



#-------- Definition of types used in Trace control NRM fragment------------------
@@ -1784,6 +1823,10 @@ components: 
          $ref: '#/components/schemas/Files-Multiple'

        MnsRegistry:

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

        Scheduler:

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

        ConditionMonitor:

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

    ManagedElement-ncO:

      type: object

      properties:
@@ -1803,6 +1846,10 @@ components: 
          $ref: '#/components/schemas/FileDownloadJob-Multiple'

        Files:

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

        Scheduler:

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

        ConditionMonitor:

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



#-------- Definition of abstract IOCs --------------------------------------------
@@ -1971,6 +2018,8 @@ components: 
          properties:

            attributes:

              type: object

              not:

                required: [ conditionMonitorRef, schedulerRef ]

              properties:

                administrativeState:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'
@@ -1989,10 +2038,15 @@ components: 
                  $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'
@@ -2210,6 +2264,33 @@ components: 
               type: array

               items:

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

    Scheduler-Single:

      allOf:

        - $ref: '#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              type: object

              properties:

                schedulingTimes:

                  type: array

                  items:

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

                  minItems: 1

                schedulerStatus:

                  type: boolean

    ConditionMonitor-Single:

      allOf:

        - $ref: '#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              type: object

              properties:

                condition:

                  type: string

                conditionStatus:

                  type: boolean



#-------- Definition of YAML arrays for name-contained IOCs ----------------------
@@ -2269,6 +2350,14 @@ components: 
      type: array

      items:

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

    Scheduler-Multiple:

      type: array

      items:

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

    ConditionMonitor-Multiple:

      type: array

      items:

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



#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------
@@ -2299,3 +2388,5 @@ components: 
       

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

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

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

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