Commit 54706bb4 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'TS28.623_Rel19_correction_to_duplicate_Scope_definition_and_misalignment' into 'Integration_Rel19_SA5_156_YAML'

TS28.623 Rel19 CR0389 correction to duplicate Scope definition and misalignment

See merge request !1263
parents 5ad45bb4 b9ab0171

OpenAPI/TS28623_GenericNrm.yaml

+0 −17
Original line number Diff line number Diff line
@@ -101,23 +101,6 @@ components: 
          properties:

            streamTarget:

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

    Scope:

      oneOf:

        - type: object

          properties:

            scopeType:

              type: string

              enum:

                - BASE_ONLY

                - BASE_ALL

                - BASE_NTH_LEVEL

                - BASE_SUBTREE

            scopeLevel:

              type: integer

        - type: object

          properties:

            dataNodeSelector:

              type: string

    ProcessMonitor:

      description: >-

        This data type is the "ProcessMonitor" data type without specialisations.

OpenAPI/TS28623_SubscriptionControlNrm.yaml

+16 −11
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ components: 


#-------- Definition of types-----------------------------------------------------

    Scope:

      type: object

      oneOf:

        - type: object

          properties:

            scopeType:

              type: string
@@ -38,6 +39,10 @@ components: 
                - BASE_SUBTREE

            scopeLevel:

              type: integer

        - type: object

          properties:

            dataNodeSelector:

              type: string



#-------- Definition of concrete IOCs --------------------------------------------         

    NtfSubscriptionControl-Single: