Commit 3aef64a3 authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0025

parents 2628bd30 5a140cdf

OpenAPI/TS28104_MdaNrm.yaml

+24 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ components: 
        filterValue:

          type: string

        threshold:

          $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdInfo'

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

        analyticsPeriod:

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

        timeOut:
@@ -83,6 +83,29 @@ components: 
            granularityPeriod:

              type: integer



    ThresholdInfo:

      type: object

      properties:

        monitoredMDAOutputIE:          

          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



#-------- Definition of abstract IOCs --------------------------------------------