Commit 14af26e3 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28.104_Rel-19_CR_Implement_readonly_attributes_for_openAPI_SS'... 

Merge branch 'TS28.104_Rel-19_CR_Implement_readonly_attributes_for_openAPI_SS' into 'Integration_Rel19_SA5_157_YAML'

TS28.104_Rel-19_CR0131_Implement_readonly_attributes_for_openAPI_SS

See merge request !1366
parents 2bf16c1d 50d732b9

OpenAPI/TS28104_MdaNrm.yaml

+4 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ components: 
      type: array

      items:

        type: string

        readOnly: true



    MDAOutputs:

      type: array
@@ -78,7 +79,7 @@ components: 
            timeDurations:

              type: array

              items:

                $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow'

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

        - type: object

          properties:

            granularityPeriod:
@@ -140,9 +141,9 @@ components: 
                    supportedMDACapabilities:

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

                    mLModelRefList:

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

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

                    aIMLInferenceFunctionRefList:

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

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

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:

OpenAPI/TS28104_MdaReport.yaml

+4 −11
Original line number Diff line number Diff line
@@ -20,12 +20,13 @@ components: 
      properties:

        mDAType:

          type: string

          readOnly: true

        mDAOutputList:

          type: array

          items:

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

        analyticsWindow:

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

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

        confidenceDegree:

          type: number

          format: float
@@ -35,18 +36,10 @@ components: 
      properties:

        mDAOutputIEName:

          type: string

          readOnly: true

        mDAOutputIEValue: {}





    TimeWindow:

      type: object

      properties:

        mDAOutputStartTime:

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

        mDAOutputEndTime:

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





#-------- Definition of MDA Report --------------------------------------------



    MDAReport:
@@ -63,4 +56,4 @@ components: 
                    mDAOutputs:

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

                    mDARequestRef:

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