Commit 99ccb8f1 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.623_Rel19_CR_correction_to_Jex_for_dataNodeSelector_and_notificationFilter_in_OpenAPI' into 'Integration_Rel19_SA5_157_YAML'

TS28623 Rel19 CR0442 correction to Jex for dataNodeSelector and notificationFilter in OpenAPI

See merge request !1399
parents 4ac8094e cefbf1e5

OpenAPI/TS28623_ComDefs.yaml

+16 −1
Original line number Diff line number Diff line
@@ -364,6 +364,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
@@ -415,7 +430,7 @@ components: 
        timeTick:

          type: integer

        filter:

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

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



    ErrorResponseGet:

      description: >-

OpenAPI/TS28623_SubscriptionControlNrm.yaml

+4 −2
Original line number Diff line number Diff line
@@ -42,7 +42,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:
@@ -63,7 +65,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: