Commit c4224117 authored by ruiyue's avatar ruiyue
Browse files

Merge branch...

Merge branch 'Rel20_CR_TS_28.623_Correct_several_issues_for_the_IOCs_related_to_MADCOL' into 'Integration_Rel20_SA5_163_YAML'

Rel20_CR0576_TS_28.623_Correct_several_issues_for_the_IOCs_related_to_MADCOL

See merge request !1916
parents bc4f70e0 6dfc0c89
Loading
Loading
Loading
Loading
Loading
+24 −10
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ components:
      oneOf:
      - type: array
        items:
          $ref: '#/components/schemas/mgtDataCategory'
        uniqueItems: true  
      - type: array
        items:
          $ref: '#/components/schemas/mgtDataName'
        uniqueItems: true  
    mgtDataCategory:
      type: string
      enum:
        - COVERAGE
@@ -34,8 +41,7 @@ components:
        - ENERGY_EFFICIENCY
        - MOBILITY
        - ACCESSIBILITY
      - type: array
        items:
    mgtDataName:
      type: string
    NodeFilter:
      type: object
@@ -74,7 +80,10 @@ components:
                managementData:
                  $ref: '#/components/schemas/ManagementData'
                targetNodeFilter:
                  type: array
                  items:
                    $ref: '#/components/schemas/NodeFilter'
                  uniqueItems: true  
                collectionTimeWindow:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow'
                reportingCtrl:
@@ -93,7 +102,12 @@ components:
                  type: boolean
                jobId:
                  type: string

          required:
            - managementData
            - targetNodeFilter
            - collectionTimeWindow
            - reportingCtrl
            - jobId
#-------- Definition of YAML arrays for name-contained IOCs ----------------------
    ManagementDataCollection-Multiple:
      type: array