Commit a7d220e2 authored by Muhammad Hamza's avatar Muhammad Hamza
Browse files

fix conflict in VNF performance Mgmt API of SOL003

parent a8d1e23c
Loading
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -1062,21 +1062,12 @@ components:

        Shall be returned upon the following error: The content type of the message content is supported and
        the message content of a request contains syntactically correct data but the data cannot be processed.
<<<<<<< Updated upstream
        The general cause for this error and its handling is specified in clause 6.4 of ETSI GS NFV-SOL 013 [8], 
        including rules for the presence of the response body.
        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has
        tested the Notification endpoint as described in clause 6.4.9.3.2 and the test has failed.
        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more information 
        about the error
=======
        The general cause for this error and its handling is specified in clause 6.4 of ETSI
        GS NFV-SOL 013, including rules for the presence of the response body.
        Specifically in case of this resource, the response code 422 shall also be returned if the VNFM has tested the 
        Notification endpoint as described in clause 6.4.9.3.2 and the test has failed.
        In this case, the "detail" attribute in the "ProblemDetails" structure shall convey more
        information about the error
>>>>>>> Stashed changes
      headers:
        Content-Type:
          description: |