Commit a120ee8c authored by sunse's avatar sunse
Browse files

TS28.623 Rel18 CR0441 and TS28532 CR0343 correction to Jex for...

parent 250a05f2
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ paths:
            are targeted.
          required: false
          schema:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'
        - name: attributes
          in: query
          description: >-
@@ -251,7 +251,10 @@ paths:
            select data nodes.
          required: false
          schema:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'
            oneOf:
              - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
              - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'

      responses:
        '200':
          description: >-
+16 −1
Original line number Diff line number Diff line
@@ -238,6 +238,21 @@ components:
      description: >-
        The filter format shall be compliant to Jex (TS 32.161).
      type: string
    JexConditions:
      type: string
      description: >-
        The value of the string shall be a Jex expression that is compliant to the 
        Jex conditions profile specified in clause 7.6 of TS 32.161.
    JexNodeSelectionBasic:
      type: string
      description: >-
        The value of the string shall be a Jex expression that is compliant to the 
        Jex basic profile specified in clause 7.4 of TS 32.161.
    JexNodeSelectionAdvanced:
      type: string
      description: >-
        The value of the string shall be a Jex expression that is compliant to the 
        Jex advanced profile specified in clause 7.5 of TS 32.161.
    SystemDN:
      type: string

@@ -289,7 +304,7 @@ components:
        timeTick:
          type: integer
        filter:
          $ref: '#/components/schemas/Filter'
          $ref: '#/components/schemas/JexConditions'

    ErrorResponseGet:
      description: >-
+4 −2
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ components:
        - type: object
          properties:
            dataNodeSelector:
              type: string
              oneOf:
                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic'
                - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced'

#-------- Definition of concrete IOCs --------------------------------------------         
    NtfSubscriptionControl-Single:
@@ -49,7 +51,7 @@ components:
                scope:
                  $ref: '#/components/schemas/Scope'
                notificationFilter:
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter'                
                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions'                
            HeartbeatControl:
              $ref: '#/components/schemas/HeartbeatControl-Single'
    HeartbeatControl-Single: