From 72859a77a262fbd54f68416bdfda17e932a64e71 Mon Sep 17 00:00:00 2001 From: Gergely Csatari Date: Tue, 24 Apr 2018 13:22:58 +0200 Subject: [PATCH] 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 --- .../VNFConfiguration/VNFConfiguration.yaml | 11 +- .../VNFFaultManagement.yaml | 11 +- src/SOL002/VNFIndicator/VNFIndicator.yaml | 13 +- .../VNFIndicatorNotification.yaml | 11 +- .../VNFLifecycleManagement.yaml | 170 +-------------- .../VNFLifecycleManagement_def.yaml | 56 +---- .../VNFPerformanceManagement.yaml | 11 +- .../VNFFaultManagement.yaml | 11 +- .../VNFFaultManagementNotification.yaml | 11 +- src/SOL003/VNFIndicator/VNFIndicator.yaml | 12 +- .../VNFIndicatorNotification.yaml | 13 +- .../VNFLifecycleManagement.yaml | 177 ++------------- .../VNFLifecycleManagement_def.yaml | 201 ------------------ .../VNFLifecycleManagementNotification.yaml | 11 +- ...NFLifecycleManagementNotification_def.yaml | 2 +- .../VNFLifecycleOperationGranting.yaml | 11 +- .../VNFLifecycleOperationGranting_def.yaml | 4 +- .../VNFPackageManagement.yaml | 11 +- .../VNFPackageManagementNotification.yaml | 11 +- .../VNFPackageManagementNotification_def.yaml | 1 - .../VNFPerformanceManagement.yaml | 11 +- .../VNFPerformanceManagementNotification.yaml | 11 +- ...edResourcesQuotaAvailableNotification.yaml | 11 +- ...uotaAvailableNotificationNotification.yaml | 11 +- src/SOL003/definitions/SOL003_def.yaml | 48 +++++ ...OL002SOL003VNFLifecycleManagement_def.yaml | 21 +- src/definitions/SOL002SOL003_def.yaml | 46 ---- 27 files changed, 194 insertions(+), 724 deletions(-) diff --git a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml index 0732d9bf..b92967a6 100644 --- a/src/SOL002/VNFConfiguration/VNFConfiguration.yaml +++ b/src/SOL002/VNFConfiguration/VNFConfiguration.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL002 - VNF Configuration interface + title: SOL002 - VNF Configuration interface 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- license: diff --git a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml index 79c12c37..8d7b06ae 100644 --- a/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL002 - VNF Configuration interface + title: SOL002 - VNF Configuration interface 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml index c98c28c9..168c818e 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -3,17 +3,18 @@ swagger: "2.0" info: version: "1.1.1" - title: "DRAFT - SOL002 - VNF Indicator interface" + title: "SOL002 - VNF Indicator interface" 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. VNF related indicators are declared in the VNFD. - + + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis diff --git a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml index 806b8114..8d6814cc 100644 --- a/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL002/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: "DRAFT - SOL002 - VNF Indicator Notification Endpoint interface" + title: "SOL002 - VNF Indicator Notification Endpoint interface" 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- diff --git a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 7750d7aa..a840bbb4 100644 --- a/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL002/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: "DRAFT - SOL002 - VNF Configuration interface" + title: "SOL002 - VNF Configuration interface" 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- license: @@ -396,165 +397,6 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 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 # ############################################################################### diff --git a/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml b/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml index 35e34777..57789274 100644 --- a/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml +++ b/src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml @@ -576,7 +576,7 @@ definitions: notifications this subscription relates to. A particular notification is sent to the subscriber if the filter matches, or if there is no filter. - $ref: "#/definitions/LifecycleChangeNotificationsFilter" + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LifecycleChangeNotificationsFilter" callbackUri: description: > The URI of the endpoint to send the notification to. @@ -607,7 +607,7 @@ definitions: notifications this subscription relates to. A particular notification is sent to the subscriber if the filter matches, or if there is no filter. - $ref: "#/definitions/LifecycleChangeNotificationsFilter" + $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/LifecycleChangeNotificationsFilter" callbackUri: description: > The URI of the endpoint to send the notification to. @@ -642,58 +642,6 @@ definitions: - ROLLING_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: description: > This type represents information about a network address that has been assigned. diff --git a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml index af192e54..c8178563 100644 --- a/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL002/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: "DRAFT - SOL002 - VNF Configuration interface" + title: "SOL002 - VNF Configuration interface" 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=--- diff --git a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml index 7f53c668..6bac2e1a 100644 --- a/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml +++ b/src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Fault Management interface + title: SOL003 - VNF Fault Management interface 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml index c3322b0a..013de242 100644 --- a/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml +++ b/src/SOL003/VNFFaultManagementNotification/VNFFaultManagementNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Fault Management Notification interface + title: SOL003 - VNF Fault Management Notification interface 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFIndicator/VNFIndicator.yaml b/src/SOL003/VNFIndicator/VNFIndicator.yaml index 2087dc67..355eb1a4 100644 --- a/src/SOL003/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL003/VNFIndicator/VNFIndicator.yaml @@ -2,13 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Indicator interface + title: SOL003 - VNF Indicator interface description: > - DRAFT - SOL003 - VNF Indicator interface + SOL003 - VNF Indicator interface + + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml index 2bafe43a..e12cb9f9 100644 --- a/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml +++ b/src/SOL003/VNFIndicatorNotification/VNFIndicatorNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Indicator Notification interface + title: SOL003 - VNF Indicator Notification interface 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml index 57fdbbf2..7c523988 100644 --- a/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml +++ b/src/SOL003/VNFLifecycleManagement/VNFLifecycleManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Lifecycle Management interface + title: SOL003 - VNF Lifecycle Management interface 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 - version of the ETSI Group Specification it refers to and has not been - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 @@ -240,7 +241,7 @@ paths: required: true in: body schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest" + $ref: "../definitions/SOL003_def.yaml#/definitions/VnfInfoModificationRequest" - name: Content-Type description: > The Content-Type header shall be set to @@ -332,21 +333,21 @@ paths: schema: $ref: "definitions/VNFLifecycleManagement_def.yaml#/definitions/InstantiateVnfRequest" responses: - 200: + 202: description: > - OK + Accepted - Information about zero or more VNF instances was queried - successfully. The response body shall contain - representations of zero or more VNF instances. + The request was accepted for processing, but the processing has + not been completed. + The response body shall be empty. + 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. + Location: + description: The resource URI of the created VNF instance type: string - maximum: 1 - minimum: 1 - schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfInstance" + format: url 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -367,148 +368,6 @@ paths: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500" 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 - schema: - $ref: "../../definitions/SOL002SOL003VNFLifecycleManagement_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: VnfInfoModificationRequest - description: Input parameters for VNF info modification - required: true - in: body - schema: - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest" - - 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. - 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 # ############################################################################### diff --git a/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml b/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml index 89893bef..54710f2a 100644 --- a/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml +++ b/src/SOL003/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml @@ -185,96 +185,6 @@ definitions: "InstantiateVnfOpConfig". $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - LccnLinks: - description: > - This type represents the links to resources that a notification can - contain. - type: object - required: - - vnfInstance - - subscription - properties: - vnfInstance: - description: > - Link to the resource representing the VNF instance to which the - notified change applies. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link" - subscription: - description: > - Link to the related subscription. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link" - vnfLcmOpOcc: - description: > - Link to the VNF lifecycle management operation occurrence that this - notification is related to. Shall be present if there is a related - lifecycle operation occurrence. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link" - - LccnSubscription: - description: > - This type represents a subscription related to notifications about VNF - lifecycle changes. - type: object - required: - - id - - callbackUri - - _links - properties: - id: - description: > - Identifier of this subscription resource. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" - filter: - description: > - Filter settings for this subscription, to define the subset of all - notifications this subscription relates to. A particular - notification is sent to the subscriber if the filter matches, or if - there is no filter. - $ref: "#/definitions/LifecycleChangeNotificationsFilter" - callbackUri: - description: > - The URI of the endpoint to send the notification to. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" - _links: - description: > - Links to resources related to this resource. - type: object - required: - - self - properties: - self: - description: > - URI of this resource. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" - - LccnSubscriptionRequest: - description: > - This type represents a subscription request related to notifications - about VNF lifecycle changes. - type: object - required: - - callbackUri - properties: - filter: - description: > - Filter settings for this subscription, to define the subset of all - notifications this subscription relates to. A particular - notification is sent to the subscriber if the filter matches, or if - there is no filter. - $ref: "#/definitions/LifecycleChangeNotificationsFilter" - callbackUri: - description: > - The URI of the endpoint to send the notification to. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Uri" - authentication: - description: > - Authentication parameters to configure the use of Authorization when - sending notifications corresponding to this subscription, as defined - in clause 4.5.3.4. - This attribute shall only be present if the subscriber requires - authorization of notifications. - $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" - LcmOperationStateType: description: > Value | Description @@ -296,58 +206,6 @@ definitions: - ROLLING_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" - OperateVnfRequest: description: > This type represents request parameters for the "Operate VNF" operation. @@ -396,58 +254,6 @@ definitions: declared in the VNFD as part of "OperateVnfOpConfig". $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" - ScaleInfo: - required: - - aspectId - - scaleLevel - type: object - properties: - aspectId: - description: > - Identifier of the scaling aspect. - $ref: "#/definitions/IdentifierInVnfd" - scaleLevel: - description: > - Indicates the scale level. The minimum value shall be 0 and the - maximum value shall be <= maxScaleLevel as described in the VNFD. - type: integer - - ScaleVnfRequest: - type: object - required: - - type - - aspectId - properties: - type: - description: > - Indicates the type of the scale operation requested. - Permitted values: - * SCALE_OUT: adding additional VNFC instances to the VNF to increase - capacity - * SCALE_IN: removing VNFC instances from the VNF in order to release - unused capacity. - type: string - enum: - - SCALE_OUT - - SCALE_IN - aspectId: - description: > - Identifier of the scaling aspect. - $ref: "#/definitions/IdentifierInVnfd" - numberOfSteps: - description: > - Number of scaling steps to be executed as part of this Scale VNF - operation. It shall be a positive number and the default value - shall be 1. - type: integer - default: 1 - additionalParams: - description: > - Additional parameters passed by the NFVO as input to the scaling - process, specific to the VNF being scaled, as declared in the VNFD - as part of "ScaleVnfOpConfig". - $ref: "#/definitions/KeyValuePairs" - ScaleVnfToLevelRequest: description: > This type represents request parameters for the "Scale VNF to Level" @@ -716,10 +522,3 @@ definitions: for this VNF LCM operation occurrence, if declaring as failed is currently allowed. $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link" - - VnfOperationalStateType: - type: string - enum: - - STARTED - - STOPPED - - ERROR diff --git a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml index dde7ce58..607dcff6 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/VNFLifecycleManagementNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Lifecycle Management Notification interface + title: SOL003 - VNF Lifecycle Management Notification interface description: > - DRAFT - SOL003 - VNF Lifecycle Management Notification interface + SOL003 - VNF Lifecycle Management Notification interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml b/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml index 35c48453..ff7f255c 100644 --- a/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml +++ b/src/SOL003/VNFLifecycleManagementNotification/definitions/VNFLifecycleManagementNotification_def.yaml @@ -153,7 +153,7 @@ definitions: the operation has performed any changes to VNF instance information, including VNF configurable properties. Shall be absent otherwise. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VnfInfoModificationRequest" + $ref: "../../definitions/SOL003_def.yaml#/definitions/VnfInfoModificationRequest" changedExtConnectivity: description: > Information about changed external connectivity, if this diff --git a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml index 25e4fac1..24f63f14 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/VNFLifecycleOperationGranting.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Lifecycle Operation Granting interface + title: SOL003 - VNF Lifecycle Operation Granting interface description: > - DRAFT - SOL003 - VNF Lifecycle Operation Granting interface + SOL003 - VNF Lifecycle Operation Granting interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml b/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml index 73ed75d3..035719e3 100644 --- a/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml +++ b/src/SOL003/VNFLifecycleOperationGranting/definitions/VNFLifecycleOperationGranting_def.yaml @@ -90,7 +90,9 @@ definitions: release, it is recommended in the present document that the number of entries in the "vims" attribute in the Grant is not greater than 1. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" + type: array + items: + $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" zones: description: > Identifies resource zones where the resources are approved to be diff --git a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml index 44e156a0..cae74123 100644 --- a/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Package Management interface + title: SOL003 - VNF Package Management interface description: > - DRAFT - SOL003 - VNF Package Management interface + SOL003 - VNF Package Management interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml index 9be5c6a4..7043b294 100644 --- a/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml +++ b/src/SOL003/VNFPackageManagementNotification/VNFPackageManagementNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Package Management Notification interface + title: SOL003 - VNF Package Management Notification interface description: > - DRAFT - SOL003 - VNF Package Management Notification interface + SOL003 - VNF Package Management Notification interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml b/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml index e7a01e06..8a7b061e 100644 --- a/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml +++ b/src/SOL003/VNFPackageManagementNotification/definitions/VNFPackageManagementNotification_def.yaml @@ -9,7 +9,6 @@ definitions: type: string enum: - OP_STATE_CHANGE - - DELETE_PEND_CHANGE - PKG_DELETE PackageOperationalStateType: diff --git a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml index 70bdd993..486450ef 100644 --- a/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml +++ b/src/SOL003/VNFPerformanceManagement/VNFPerformanceManagement.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Performance Management interface + title: SOL003 - VNF Performance Management interface description: > - DRAFT - SOL003 - VNF Performance Management interface + SOL003 - VNF Performance Management interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml index 23f2a00a..17507ac3 100644 --- a/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml +++ b/src/SOL003/VNFPerformanceManagementNotification/VNFPerformanceManagementNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - VNF Performance Management Notification interface + title: SOL003 - VNF Performance Management Notification interface description: > - DRAFT - SOL003 - VNF Performance Management Notification interface + SOL003 - VNF Performance Management Notification interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml index 7d7cfee0..e521c8b1 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotification/VirtualisedResourcesQuotaAvailableNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - Virtualised Resources Quota Available Notification interface + title: SOL003 - Virtualised Resources Quota Available Notification interface description: > - DRAFT - SOL003 - Virtualised Resources Quota Available Notification interface + SOL003 - Virtualised Resources Quota Available Notification interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml b/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml index 2c5a7622..5540f28a 100644 --- a/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml +++ b/src/SOL003/VirtualisedResourcesQuotaAvailableNotificationNotification/VirtualisedResourcesQuotaAvailableNotificationNotification.yaml @@ -2,14 +2,15 @@ swagger: "2.0" info: version: "1.1.1" - title: DRAFT - SOL003 - Virtualised Resources Quota Available Notification Notification interface + title: SOL003 - Virtualised Resources Quota Available Notification Notification interface description: > - DRAFT - SOL003 - Virtualised Resources Quota Available Notification Notification interface + SOL003 - Virtualised Resources Quota Available Notification Notification interface + 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 - approved by the ETSI NFV ISG. In case of discrepancies the published ETSI - Group Specification takes precedence. + version of the ETSI Group Specification it refers to. In case of + discrepancies the published ETSI Group Specification takes precedence. + 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 diff --git a/src/SOL003/definitions/SOL003_def.yaml b/src/SOL003/definitions/SOL003_def.yaml index 50307d9f..5e1cc019 100644 --- a/src/SOL003/definitions/SOL003_def.yaml +++ b/src/SOL003/definitions/SOL003_def.yaml @@ -165,4 +165,52 @@ definitions: description: > Link to the related subscription. $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Link" + + VnfInfoModificationRequest: + description: > + This type represents attribute modifications for an + "Individual VNF instance" resource, i.e. modifications to a resource + representation based on the "VnfInstance" data type. + type: object + properties: + vnfInstanceName: + description: > + New value of the "vnfInstanceName" attribute in "VnfInstance", or + "null" to remove the attribute. + type: string + vnfInstanceDescription: + description: > + New value of the "vnfInstanceDescription" attribute in + "VnfInstance", or "null" to remove the attribute. + type: string + vnfPkgId: + description: > + New value of the "vnfPkgId" attribute in "VnfInstance". + The value "null" is not permitted. + $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier" + vnfConfigurableProperties: + description: > + Modifications of the "vnfConfigurableProperties" attribute in + "VnfInstance". If present, these modifications shall be applied + according to the rules of JSON Merge PATCH (see IETF RFC 7396). + $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + metadata: + description: > + Modifications of the "metadata" attribute in "VnfInstance". If + present, these modifications shall be applied according to the rules + of JSON Merge PATCH (see IETF RFC 7396). + $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + extensions: + description: > + Modifications of the "extensions" attribute in "VnfInstance". If + present, these modifications shall be applied according to the rules + of JSON Merge PATCH (see IETF RFC 7396). + $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs" + vimConnectionInfo: + description: > + New content of certain entries in the "vimConnectionInfo" attribute + array in "VnfInstance", as defined below this table. + type: array + items: + $ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/VimConnectionInfo" \ No newline at end of file diff --git a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml index 83b249b9..797de942 100644 --- a/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml +++ b/src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml @@ -222,9 +222,9 @@ definitions: extLinkPorts: description: > Link ports of this VL. - type: array - items: - $ref: "#/definitions/ExtLinkPortInfo" + type: array + items: + $ref: "#/definitions/ExtLinkPortInfo" IpOverEthernetAddressInfo: description: > @@ -356,7 +356,7 @@ definitions: self: description: > URI of this resource. - $ref: "SOL002SOL003_def.yaml#/definitions/Uri" + $ref: "SOL002SOL003_def.yaml#/definitions/Link" LccnSubscriptionRequest: description: > @@ -433,11 +433,13 @@ definitions: 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 + type: array + items: + type: string + enum: + - VnfLcmOperationOccurrenceNotification + - VnfIdentifierCreationNotification + - VnfIdentifierDeletionNotification operationTypes: description: > Match particular VNF lifecycle operation types for the notification @@ -1213,7 +1215,6 @@ definitions: enum: - STARTED - STOPPED - - ERROR VnfVirtualLinkResourceInfo: description: > diff --git a/src/definitions/SOL002SOL003_def.yaml b/src/definitions/SOL002SOL003_def.yaml index abac310e..743226cb 100644 --- a/src/definitions/SOL002SOL003_def.yaml +++ b/src/definitions/SOL002SOL003_def.yaml @@ -711,52 +711,6 @@ definitions: items: $ref: "#/definitions/VnfExtCpConfig" - VnfInfoModificationRequest: - description: > - This type represents attribute modifications for an - "Individual VNF instance" resource, i.e. modifications to a resource - representation based on the "VnfInstance" data type. - type: object - properties: - vnfInstanceName: - description: > - New value of the "vnfInstanceName" attribute in "VnfInstance", or - "null" to remove the attribute. - type: string - vnfInstanceDescription: - description: > - New value of the "vnfInstanceDescription" attribute in - "VnfInstance", or "null" to remove the attribute. - type: string - vnfPkgId: - description: > - New value of the "vnfPkgId" attribute in "VnfInstance". - The value "null" is not permitted. - $ref: "#/definitions/Identifier" - vnfConfigurableProperties: - description: > - Modifications of the "vnfConfigurableProperties" attribute in - "VnfInstance". If present, these modifications shall be applied - according to the rules of JSON Merge PATCH (see IETF RFC 7396). - $ref: "#/definitions/KeyValuePairs" - metadata: - description: > - Modifications of the "metadata" attribute in "VnfInstance". If - present, these modifications shall be applied according to the rules - of JSON Merge PATCH (see IETF RFC 7396). - $ref: "#/definitions/KeyValuePairs" - extensions: - description: > - Modifications of the "extensions" attribute in "VnfInstance". If - present, these modifications shall be applied according to the rules - of JSON Merge PATCH (see IETF RFC 7396). - $ref: "#/definitions/KeyValuePairs" - vimConnectionInfo: - description: > - New content of certain entries in the "vimConnectionInfo" attribute - array in "VnfInstance", as defined below this table. - $ref: "#/definitions/VimConnectionInfo" - VnfInstanceSubscriptionFilter: description: > This type represents subscription filter criteria to match VNF -- GitLab