From 09b33da5361288bfeb0c8b29856ffe6e461781e8 Mon Sep 17 00:00:00 2001 From: Giacomo Bernini Date: Thu, 30 Jul 2020 10:02:17 +0200 Subject: [PATCH] Fixed issues from SOL WG review --- src/SOL005/NSDManagement/NSDManagement.yaml | 2 +- .../SOL005NSLifecycleManagement_def.yaml | 6 ++++++ .../NSPerformanceManagement.yaml | 2 +- .../VNFPackageManagement/VNFPackageManagement.yaml | 3 ++- src/SOL005/components/SOL005_params.yaml | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/SOL005/NSDManagement/NSDManagement.yaml b/src/SOL005/NSDManagement/NSDManagement.yaml index cb715ca..10bde42 100644 --- a/src/SOL005/NSDManagement/NSDManagement.yaml +++ b/src/SOL005/NSDManagement/NSDManagement.yaml @@ -15,7 +15,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.3.1 diff --git a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml index 803eaec..69a3453 100644 --- a/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml +++ b/src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml @@ -1674,6 +1674,12 @@ definitions: description: > Identifier of the VirtualStorageDesc in the VNFD. $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd" + vnfdId: + description: > + Identifier of the VNFD. + Shall be present in case the value differs from the vnfdId attribute of the VnfInstance + (e.g. during a "Change current VNF package" operation or due to its final failure). + $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier" storageResource: description: > Reference to the VirtualStorage resource. diff --git a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml index 50504a1..0d1e66e 100644 --- a/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml +++ b/src/SOL005/NSPerformanceManagement/NSPerformanceManagement.yaml @@ -15,7 +15,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V3.3.1 diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index 592114b..0d25066 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -12,7 +12,7 @@ info: license: name: ETSI Forge copyright notice url: https://forge.etsi.org/etsi-forge-copyright-notice.txt - version: 2.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 + version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1 externalDocs: description: ETSI GS NFV-SOL 005 V2.7.1 @@ -478,6 +478,7 @@ paths: - $ref: ../components/SOL005_params.yaml#/components/parameters/exclude_all_mano_artifacts - $ref: ../components/SOL005_params.yaml#/components/parameters/exclude_all_non_mano_artifacts - $ref: ../components/SOL005_params.yaml#/components/parameters/select_non_mano_artifact_sets + - $ref: ../components/SOL005_params.yaml#/components/parameters/include_external_artifacts responses: "200": $ref: '#/components/responses/IndividualVnfPackageArtifacts.Get' diff --git a/src/SOL005/components/SOL005_params.yaml b/src/SOL005/components/SOL005_params.yaml index 905b581..707c930 100644 --- a/src/SOL005/components/SOL005_params.yaml +++ b/src/SOL005/components/SOL005_params.yaml @@ -176,5 +176,19 @@ components: required: false style: form explode: true + schema: + type: string + + include_external_artifacts: + name: include_external_artifacts + in: query + description: | + Flag (i.e. parameter without value) that instructs the NFVO to include external artifacts in the response + payload body. It shall not be treated as an error if this flag is provided but there is no external artifact + to include in the result. If this parameter is missing, no external artifacts shall be included. + The NFVO shall support this parameter. The OSS/BSS may supply this parameter. + required: false + style: form + explode: true schema: type: string \ No newline at end of file -- GitLab