Commit 64d56ef3 authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'Rel19_CR_TS_28.561_Fix_stage_3_for_SimulationDataDescriptor'... 

Merge branch 'Rel19_CR_TS_28.561_Fix_stage_3_for_SimulationDataDescriptor' into 'Integration_Rel19_SA5_164_YAML'

Rel-19 CR0007 TS 28.561 Fix stage 2 and stage 3 for SimulationDataDescriptor

See merge request !1968
parents 8b35ffa5 ec580cc7

OpenAPI/TS28561_NdtNrm.yaml

+39 −4
Original line number Diff line number Diff line
@@ -108,15 +108,13 @@ components: 
      properties:

        nDTInputDescriptionId:

          type: string

        simulationData:

        simulationDataDescriptor:

          type: array

          uniqueItems: true

          items:

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

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

        networkEventInfo:

          type: string

        condition:

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

    NDTOutputDescription:  

      type: object

      properties:
@@ -168,6 +166,43 @@ components: 
          uniqueItems: true

          items:

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

    SimulationDataDescriptor:  

      type: object

      properties:

        simulationData:

          type: array

          uniqueItems: true

          items:

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

        condition:

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

    SimulationData:  

      type: object

      properties:

        performanceData:

          type: array

          uniqueItems: true

          items:

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

        mDTData:

          type: array

          uniqueItems: true

          items:

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

        configurationData:

          type: array

          uniqueItems: true

          items:

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

    PerformanceData:  

      type: object

      properties:

        performanceDataName:

          type: string

        performanceDataValue:

          type: integer

        performanceDataScalingFactor:

          type: integer



  #------Definition of JSON arrays for name-contained IOCs ---------------#