Commit 72859a77 authored by Gergely Csatari's avatar Gergely Csatari
Browse files

Different bugfixes to the SOL003 and SOL002 definitions



  - "LccnSubscription.filter.notificationTypes": type should be array
  - LifecycleChangeNotificationsFilter should be referred in all occurences
    from the same shource
  - "VnfInfoModificationRequest.vimConnectionInfo": type should be array
  - "LccnSubscription._links.self": type should be 'Link'
  - VimConnectionInfo should be an array in Grant
  - Remove ERROR state
  - Indentaion of type is wrong in ExtVirtualLinkInfo.extLinkPorts
  - Fix of Bug 48 - SOL003 - LCM : Error in Instantiate Response
  - Fix of Bug 49 - SOL003 - LCM : missing location in Instantiate Response
  - Fix of Bug 55 - SOL003,VnfPackageChangeNotification Request: not expected value in range
  - Fix of Bug 58 - The OpenAPI file assume that other methods than POST are supported on the
                    /vnf_instances/{vnfInstanceId}/instantiate ressource. This is not
                    consistent with the base GS.
  - Fix of Bug 60 - SOL003 OpenAPIs Should Not Be Marked As "Draft"

Change-Id: I9a77ca8a4a9da340a3e4bfd409d32c8ae903c1f4
Signed-off-by: Gergely Csatari's avatarGergely Csatari <gergely.csatari@nokia.com>
parent 695435e0
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL002 - VNF Configuration interface title: SOL002 - VNF Configuration interface
description: > description: >
DRAFT VNF Configuration interface of ETSI NFV SOL002 VNF Configuration interface of ETSI NFV SOL002
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
license: license:
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL002 - VNF Configuration interface title: SOL002 - VNF Configuration interface
description: > description: >
DRAFT VNF Configuration interface of ETSI NFV SOL002 VNF Configuration interface of ETSI NFV SOL002
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
......
...@@ -3,17 +3,18 @@ swagger: "2.0" ...@@ -3,17 +3,18 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: "DRAFT - SOL002 - VNF Indicator interface" title: "SOL002 - VNF Indicator interface"
description: > description: >
DRAFT VNF Indicator interface of ETSI NFV SOL002. VNF Indicator interface of ETSI NFV SOL002.
This API allows the EM/VNF to provide information on value changes of VNF related indicators. This API allows the EM/VNF to provide information on value changes of VNF related indicators.
VNF related indicators are declared in the VNFD. VNF related indicators are declared in the VNFD.
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: "DRAFT - SOL002 - VNF Indicator Notification Endpoint interface" title: "SOL002 - VNF Indicator Notification Endpoint interface"
description: > description: >
DRAFT VNF Indicator Notification Endpoint interface of ETSI NFV SOL002 VNF Indicator Notification Endpoint interface of ETSI NFV SOL002
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: "DRAFT - SOL002 - VNF Configuration interface" title: "SOL002 - VNF Configuration interface"
description: > description: >
DRAFT VNF Configuration interface of ETSI NFV SOL002 VNF Configuration interface of ETSI NFV SOL002
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
license: license:
...@@ -396,165 +397,6 @@ paths: ...@@ -396,165 +397,6 @@ paths:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
503: 503:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503" $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
get:
description: >
Information about an individual VNF instance was queried successfully.
parameters:
- name: vnfInstanceId
description: >
Identifier of the VNF instance. This identifier can be retrieved from
the resource referenced by the "Location" HTTP header in the response
to a POST request creating a new VNF instance resource. It can also
be retrieved from the "id" attribute in the payload body of that
response.
in: path
type: string
required: true
responses:
200:
description: >
OK
Information about zero or more VNF instances was queried
successfully. The response body shall contain
representations of zero or more VNF instances.
headers:
Content-Type:
description: The MIME type of the body of the response.
type: string
maximum: 1
minimum: 1
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"
400:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
401:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
403:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
404:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
405:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
406:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
409:
$ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
416:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/416"
500:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
503:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
patch:
#SOL003 location: 5.4.3.3.4
description: >
This method modifies an individual VNF instance resource. Changes to
the VNF configurable properties are applied to the configuration in
the VNF instance, and are reflected in the representation of this
resource. Other changes are applied to the VNF instance information
managed by the VNFM, and are reflected in the representation of this
resource
parameters:
- name: vnfInfoModifications
description: Input parameters for VNF info modification
required: true
in: body
schema:
$ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInfoModifications"
- name: vnfInstanceId
description: >
Identifier of the VNF instance. This identifier can be retrieved from
the resource referenced by the "Location" HTTP header in the response
to a POST request creating a new VNF instance resource. It can also
be retrieved from the "id" attribute in the payload body of that
response.
in: path
type: string
required: true
responses:
202:
$ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/202-with-Location"
400:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"
401:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
403:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
404:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
405:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
406:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
409:
$ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
412:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
500:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
503:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
delete:
#SOL003 location: 5.4.3.3.5
description: >
This method deletes an individual VNF instance resource.
parameters:
- name: vnfInstanceId
description: >
Identifier of the VNF instance. This identifier can be retrieved from
the resource referenced by the "Location" HTTP header in the response
to a POST request creating a new VNF instance resource. It can also
be retrieved from the "id" attribute in the payload body of that
response.
in: path
type: string
required: true
responses:
204:
description: >
No Content
The VNF instance resource and the associated VNF identifier were
deleted successfully.
The response body shall be empty.
headers:
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
400:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-selector"
401:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/401"
403:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/403"
404:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
405:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/404"
406:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/406"
409:
$ref: "responses/VNFLifecycleManagement_resp.yaml#/responses/409-inconsistent-state"
412:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/412"
500:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
503:
$ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
############################################################################### ###############################################################################
# Scale VNF task # # Scale VNF task #
############################################################################### ###############################################################################
......
...@@ -576,7 +576,7 @@ definitions: ...@@ -576,7 +576,7 @@ definitions:
notifications this subscription relates to. A particular notifications this subscription relates to. A particular
notification is sent to the subscriber if the filter matches, or if notification is sent to the subscriber if the filter matches, or if
there is no filter. there is no filter.
$ref: "#/definitions/LifecycleChangeNotificationsFilter" $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LifecycleChangeNotificationsFilter"
callbackUri: callbackUri:
description: > description: >
The URI of the endpoint to send the notification to. The URI of the endpoint to send the notification to.
...@@ -607,7 +607,7 @@ definitions: ...@@ -607,7 +607,7 @@ definitions:
notifications this subscription relates to. A particular notifications this subscription relates to. A particular
notification is sent to the subscriber if the filter matches, or if notification is sent to the subscriber if the filter matches, or if
there is no filter. there is no filter.
$ref: "#/definitions/LifecycleChangeNotificationsFilter" $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LifecycleChangeNotificationsFilter"
callbackUri: callbackUri:
description: > description: >
The URI of the endpoint to send the notification to. The URI of the endpoint to send the notification to.
...@@ -642,58 +642,6 @@ definitions: ...@@ -642,58 +642,6 @@ definitions:
- ROLLING_BACK - ROLLING_BACK
- ROLLED_BACK - ROLLED_BACK
LifecycleChangeNotificationsFilter:
description: >
This type represents a subscription filter related to notifications
about VNF lifecycle changes.
At a particular nesting level in the filter structure, the following
applies: All attributes shall match in order for the filter to match
(logical "and" between different filter attributes). If an attribute is
an array, the attribute shall match if at least one of the values in
the array matches (logical "or" between the values of one filter
attribute).
type: object
properties:
vnfInstanceSubscriptionFilter:
description: >
Filter criteria to select VNF instances about which to notify.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInstanceSubscriptionFilter"
notificationTypes:
description: >
Match particular notification types.
Permitted values:
* VnfLcmOperationOccurrenceNotification
* VnfIdentifierCreationNotification
* VnfIdentifierDeletionNotification
The permitted values of the "notificationTypes" attribute are
spelled exactly as the names of the notification types to
facilitate automated code generation systems.
type: string
enum:
- VnfLcmOperationOccurrenceNotification
- VnfIdentifierCreationNotification
- VnfIdentifierDeletionNotification
operationTypes:
description: >
Match particular VNF lifecycle operation types for the notification
of type VnfLcmOperationOccurrenceNotification.
May be present if the "notificationTypes" attribute contains the
value "VnfLcmOperationOccurrenceNotification", and shall be absent
otherwise.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/LcmOperationType"
operationStates:
description: >
Match particular LCM operation state values as reported in
notifications of type VnfLcmOperationOccurrenceNotification.
May be present if the "notificationTypes" attribute contains the
value "VnfLcmOperationOccurrenceNotification", and shall be absent
otherwise.
type: array
items:
$ref: "#/definitions/LcmOperationStateType"
NetworkAddressInfo: NetworkAddressInfo:
description: > description: >
This type represents information about a network address that has been assigned. This type represents information about a network address that has been assigned.
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: "DRAFT - SOL002 - VNF Configuration interface" title: "SOL002 - VNF Configuration interface"
description: > description: >
DRAFT VNF Configuration interface of ETSI NFV SOL002 VNF Configuration interface of ETSI NFV SOL002
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=---
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL003 - VNF Fault Management interface title: SOL003 - VNF Fault Management interface
description: > description: >
DRAFT - SOL003 - VNF Fault Management interface SOL003 - VNF Fault Management interface
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
filtering mechanism is defined. This mechanism is currently not filtering mechanism is defined. This mechanism is currently not
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL003 - VNF Fault Management Notification interface title: SOL003 - VNF Fault Management Notification interface
description: > description: >
DRAFT - SOL003 - VNF Fault Management Notification interface SOL003 - VNF Fault Management Notification interface
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
filtering mechanism is defined. This mechanism is currently not filtering mechanism is defined. This mechanism is currently not
......
...@@ -2,13 +2,15 @@ swagger: "2.0" ...@@ -2,13 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL003 - VNF Indicator interface title: SOL003 - VNF Indicator interface
description: > description: >
DRAFT - SOL003 - VNF Indicator interface SOL003 - VNF Indicator interface
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
filtering mechanism is defined. This mechanism is currently not filtering mechanism is defined. This mechanism is currently not
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL003 - VNF Indicator Notification interface title: SOL003 - VNF Indicator Notification interface
description: > description: >
DRAFT - SOL003 - VNF Indicator Notification interface SOL003 - VNF Indicator Notification interface
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
filtering mechanism is defined. This mechanism is currently not filtering mechanism is defined. This mechanism is currently not
......
...@@ -2,14 +2,15 @@ swagger: "2.0" ...@@ -2,14 +2,15 @@ swagger: "2.0"
info: info:
version: "1.1.1" version: "1.1.1"
title: DRAFT - SOL003 - VNF Lifecycle Management interface title: SOL003 - VNF Lifecycle Management interface
description: > description: >
DRAFT - SOL003 - VNF Lifecycle Management interface definition SOL003 - VNF Lifecycle Management interface definition
IMPORTANT: Please note that this file might be not aligned to the current IMPORTANT: Please note that this file might be not aligned to the current
version of the ETSI Group Specification it refers to and has not been version of the ETSI Group Specification it refers to. In case of
approved by the ETSI NFV ISG. In case of discrepancies the published ETSI discrepancies the published ETSI Group Specification takes precedence.
Group Specification takes precedence.
In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based In clause 4.3.2 of ETSI GS NFV-SOL 003 v2.4.1, an attribute-based
filtering mechanism is defined. This mechanism is currently not filtering mechanism is defined. This mechanism is currently not
...@@ -240,7 +241,7 @@ paths: ...@@ -240,7 +241,7 @@ paths:
required: true required: true
in: body in: body
schema: schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest" $ref: "../definitions/SOL003_def.yaml#/definitions/VnfInfoModificationRequest"
- name: Content-Type - name: Content-Type
description: > description: >
The Content-Type header shall be set to The Content-Type header shall be set to
...@@ -332,21 +333,21 @@ paths: ...@@ -332,21 +333,21 @@ paths:
schema: schema:
$ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/InstantiateVnfRequest" $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/InstantiateVnfRequest"
responses: