Commit f4ffcb1d authored by sunse's avatar sunse
Browse files

CR 0016 for MDAReport refactoring

parent d6c35ca7
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ components:
      items:
        type: string

    MDAOutputs:
    MDAOutputPerMDATypeList:
      type: array
      items:
        $ref: '#/components/schemas/MDAOutputPerMDAType'
@@ -164,7 +164,7 @@ components:
                - type: object
                  properties:
                    requestedMDAOutputs:
                      $ref: '#/components/schemas/MDAOutputs'
                      $ref: '#/components/schemas/MDAOutputPerMDATypeList'
                    reportingMethod:
                      $ref: '#/components/schemas/ReportingMethod'
                    reportingTarget:
@@ -177,7 +177,18 @@ components:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'

    MDAReport-Single:
      $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAReport'
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - type: object
                  properties:
                    mDAReportID:
                      type: string
                    mDAOutputs:
                      $ref: 'TS28104_MdaReport.yaml#/components/schemas/MDAOutputs'


#-------- Definition of JSON arrays for name-contained IOCs ----------------------
+0 −17
Original line number Diff line number Diff line
@@ -47,20 +47,3 @@ components:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
        endTime:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'


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

    MDAReport:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - type: object
                  properties:
                    mDAReportID:
                      type: string
                    mDAOutputs:
                      $ref: '#/components/schemas/MDAOutputs'