Commit 38cc46cc authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0233

parents 2528874b dddbd6f9

OpenAPI/TS28532_ProvMnS.yaml

+45 −29
Original line number Diff line number Diff line
@@ -277,12 +277,12 @@ paths: 
            schema:

              type: array

              items:

                type: object

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

          application/3gpp-json-patch+json:

            schema:

              type: array

              items:

                type: object

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

      responses:

        '200':

          description: >-
@@ -327,18 +327,6 @@ paths: 
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'

components:

  schemas:

    CorrelatedNotification:

      type: object

      properties:

        source:

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

        notificationIds:

          type: array

          items:

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

      required:

        - source

        - notificationIds

    CmNotificationTypes:

      type: string

      enum:
@@ -353,6 +341,13 @@ components: 
        - MANAGEMENT_OPERATION

        - SON_OPERATION

        - UNKNOWN

    ScopeType:

      type: string

      enum:

        - BASE_ONLY

        - BASE_NTH_LEVEL

        - BASE_SUBTREE

        - BASE_ALL

    Operation:

      type: string

      enum:
@@ -364,21 +359,15 @@ components: 
      enum:

        - before

        - after

    ScopeType:

    PatchOperation:

      type: string

      enum:

        - BASE_ONLY

        - BASE_NTH_LEVEL

        - BASE_SUBTREE

        - BASE_ALL

    Scope:

      type: object

      properties:

        scopeType:

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

        scopeLevel:

          type: integer



        - add

        - replace

        - remove

        - copy

        - move

        - test



    Resource:

      oneOf:
@@ -407,7 +396,25 @@ components: 
            - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm'

            - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm'

            - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm'                           



    Scope:

      type: object

      properties:

        scopeType:

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

        scopeLevel:

          type: integer

    CorrelatedNotification:

      type: object

      properties:

        source:

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

        notificationIds:

          type: array

          items:

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

      required:

        - source

        - notificationIds

    MoiChange:

      type: object

      properties:
@@ -433,7 +440,6 @@ components: 
        - notificationId

        - op

        - path



    NotifyMoiCreation:

      allOf:

        - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader'
@@ -492,3 +498,13 @@ components: 
                $ref: '#/components/schemas/MoiChange'

          required:

            - moiChanges

    PatchItem:

      type: object

      properties:

        op:

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

        from:

          type: string

        path:

          type: string

        value: {}