Commit 08b71bd0 authored by Michele Carignani's avatar Michele Carignani
Browse files

Merge branch 'bug-85' into 'master' 

Correction of bug 85

See merge request !1
parents e89cb560 217719f0

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

+16 −5
Original line number Diff line number Diff line
@@ -268,6 +268,17 @@ paths: 
        The POST method enables the consumer to escalate the perceived severity 

        of an alarm that is represented by an ndividual alarm resource. 

      parameters:

        - name: alarmId

          description: >

            Identifier of the alarm.

            This identifier can be retrieved from the "id" attribute of the

            "alarm" attribute in the AlarmNotification or

            AlarmClearedNotification. It can also be retrieved from the "id"

            attribute of the applicable array element in the payload body of the

            response to a GET request to the "Alarms" resource.

          in: path

          type: string

          required: true

        - name: PerceivedSeverityRequest

          description: The proposed "escalated perceived severity" value

          in: body

src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml

+8 −8
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ paths: 
            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"

        401:
@@ -427,7 +427,7 @@ paths: 
            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -476,7 +476,7 @@ paths: 
            $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/ScaleVnfToLevelRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -524,7 +524,7 @@ paths: 
            $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/ChangeVnfFlavourRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -571,7 +571,7 @@ paths: 
            $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/TerminateVnfRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -618,7 +618,7 @@ paths: 
            $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/HealVnfRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -665,7 +665,7 @@ paths: 
            $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/OperateVnfRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -714,7 +714,7 @@ paths: 
            $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/ChangeExtVnfConnectivityRequest"

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:

src/SOL002/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml

+0 −29
Original line number Diff line number Diff line
@@ -2,35 +2,6 @@ 
# https://forge.etsi.org/etsi-forge-copyright-notice.txt



responses:

  202-with-Location:

    description: > 

      Accepted



      The request was accepted for processing, but the processing has not

      been completed. On success, the HTTP response shall include a

      "Location" HTTP header that contains the URI of the newly-created

      "VNF LCM operation occurrence" resource corresponding to the

      operation.

    headers:

      Content-Type:

        description: The MIME type of the body of the response.

        type: string

        maximum: 1

        minimum: 1

      Location:

        description: The resource URI of the created VNF instance

        type: string

        format: url

      WWW-Authenticate:

        description: >

          Challenge if the corresponding HTTP request has not provided

          authorization, or error details if the corresponding HTTP

          request has provided an invalid authorization token.

        type: string

        maximum: 1

        minimum: 0

    schema:

      $ref: "../definitions/VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"

  409-another-lcm-operation-ongoing:

    description: >

      Conflict

src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml

+7 −7
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -612,7 +612,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -684,7 +684,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -755,7 +755,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -826,7 +826,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -897,7 +897,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:
@@ -970,7 +970,7 @@ paths: 
          type: string

      responses:

        202:

          $ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/202-with-Location"

        400:

          $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"

        401:

src/SOL003/VNFLifecycleManagement/responses/VNFLifecycleManagement_resp.yaml

+0 −29
Original line number Diff line number Diff line
@@ -2,35 +2,6 @@ 
# https://forge.etsi.org/etsi-forge-copyright-notice.txt



responses:

  202-with-Location:

    description: > 

      Accepted



      The request was accepted for processing, but the processing has not

      been completed. On success, the HTTP response shall include a

      "Location" HTTP header that contains the URI of the newly-created

      "VNF LCM operation occurrence" resource corresponding to the

      operation.

    headers:

      Content-Type:

        description: The MIME type of the body of the response.

        type: string

        maximum: 1

        minimum: 1

      Location:

        description: The resource URI of the created VNF instance

        type: string

        format: url

      WWW-Authenticate:

        description: >

          Challenge if the corresponding HTTP request has not provided

          authorization, or error details if the corresponding HTTP

          request has provided an invalid authorization token.

        type: string

        maximum: 1

        minimum: 0

    schema:

      $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance"

  202-with-Location-empty:

    description: > 

      Accepted