Commit f6fb58f2 authored by sunse's avatar sunse
Browse files

Merge branch...

Merge branch '28.532_Rel18_CR0310_Add_new_HTTP_error_response_format_(OpenAPI)' into 'Integration_Rel18_SA5_153_YAML'

28.532_Rel18_CR0310_Add_new_HTTP_error_response_format and 28.623_Rel18_CR0317_Change_Filter_data_type_from_XPath

See merge request !1015
parents b041fa91 ccd328ab
Loading
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ paths:
          content:
            application/json:
              schema:
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
      callbacks:
        notifyMOICreation:
          '{request.body#/notificationRecipientAddress}':
@@ -257,7 +257,7 @@ paths:
          content:
            application/json:
              schema:
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseGet'
    patch:
      summary: Patches one or multiple resources
      description: >-
@@ -314,7 +314,9 @@ paths:
          content:
            application/json:
              schema:
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
                oneOf:
                  - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
                  - $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponsePatch'
    delete:
      summary: Deletes one resource
      description: >-
@@ -331,7 +333,7 @@ paths:
          content:
            application/json:
              schema:
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse'
                $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault'
components:
  schemas:
    CmNotificationTypes:
+124 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ components:

    Filter:
      description: >-
        The filter format shall be compliant to XPath 1.0.
        The filter format shall be compliant to Jex (TS 32.161).
      type: string
    SystemDN:
      type: string
@@ -277,3 +277,126 @@ components:
          properties:
            errorInfo:
              type: string

    ErrorResponseGet:
      description: >-
        Default schema for the response message body in case the Get
        is not successful.
      type: object
      properties:
        status:
          type: string
        type:
          type: string
        reason:
          type: string
        title:
          type: string
        badQueryParams:
          type: array
          items:
            type: string
        otherProblems:
          type: array
          items:
            type: object
            properties:
              status:
                type: string
              type:
                type: string
              reason:
                type: string
              title:
                type: string
              badQueryParams:
                type: array
                items:
                  type: string
            required:
              - type
      required:
        - type

    ErrorResponseDefault:
      type: object
      properties:
        status:
          type: string
        type:
          type: string
        reason:
          type: string
        title:
          type: string
        badAttributes:
          type: array
          items:
            type: string
        badObjects:
          type: array
          items:
            type: string
        otherProblems:
          type: array
          items:
            type: object
            properties:
              status:
                type: string
              type:
                type: string
              reason:
                type: string
              title:
                type: string
              badAttributes:
                type: array
                items:
                  type: string
              badObjects:
                type: array
                items:
                  type: string
            required:
              - type
      required:
        - type

    ErrorResponsePatch:
      description: >-
        Default schema for the response message body in case the patch
        is not successful.
      type: object
      properties:
        status:
          type: string
        type:
          type: string
        reason:
          type: string
        title:
          type: string
        badOP:
          type: string
        otherProblems:
          type: array
          items:
            type: object
            properties:
              status:
                type: string
              type:
                type: string
              reason:
                type: string
              title:
                type: string
              badOp:
                type: string
            required:
              - type
              - badOp
      required:
        - type
        - badOp