From f6fce2fd7b156b7b6be34cfdaf48636187613b53 Mon Sep 17 00:00:00 2001 From: Samir Medjiah Date: Mon, 6 Jul 2020 17:57:11 +0200 Subject: [PATCH] SOL005: fixing broken references --- .../VNFPackageManagement.yaml | 8 ++++---- .../VNFSnapshotPackageManagement.yaml | 12 ++++++------ ...OL005VNFSnapshotPackageManagement_def.yaml | 6 +++--- src/SOL005/components/SOL005_params.yaml | 4 ++-- src/SOL005/definitions/SOL005_def.yaml | 19 +++++++++++++++++++ 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml index 44d1b2c..592114b 100644 --- a/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml +++ b/src/SOL005/VNFPackageManagement/VNFPackageManagement.yaml @@ -223,7 +223,7 @@ paths: - the signatures of the individual files (if available in the package). parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept - - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signature + - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signatures responses: "200": $ref: '#/components/responses/IndividualVnfPackageVnfd.Get' @@ -332,7 +332,7 @@ paths: The GET method reads the content of the manifest within a VNF package. parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept - - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signature + - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signatures responses: "200": $ref: '#/components/responses/IndividualVnfPackageManifest.Get' @@ -474,7 +474,7 @@ paths: parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept - $ref: ../components/SOL005_params.yaml#/components/parameters/Range - - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signature + - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signatures - $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 @@ -572,7 +572,7 @@ paths: parameters: - $ref: ../components/SOL005_params.yaml#/components/parameters/Accept - $ref: ../components/SOL005_params.yaml#/components/parameters/Range - - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signature + - $ref: ../components/SOL005_params.yaml#/components/parameters/include_signatures responses: "200": $ref: '#/components/responses/IndividualVnfPackageArtifact.Get' diff --git a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml index 40dccf9..2c6c6b3 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/VNFSnapshotPackageManagement.yaml @@ -834,7 +834,7 @@ components: content: application/json: schema: - $ref: ../definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo + $ref: definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo VnfSnapshotPackages.Get.200: description: | @@ -885,7 +885,7 @@ components: schema: type: array items: - $ref: ../definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo + $ref: definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo IndividualVNFSnapshotPackage.Get.200: description: | @@ -918,7 +918,7 @@ components: content: application/json: schema: - $ref: ../definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo + $ref: definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfo IndividualVNFSnapshotPackage.Patch.200: description: | @@ -951,7 +951,7 @@ components: content: application/json: schema: - $ref: ../definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfoModifications + $ref: definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgInfoModifications IndividualVNFSnapshotPackage.Delete.204: description: | @@ -1228,7 +1228,7 @@ components: content: application/json: schema: - $ref: ../definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgExtArtifactsAccessInfo + $ref: definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgExtArtifactsAccessInfo ExternalArtifactsAccess.Put.200: description: | @@ -1263,7 +1263,7 @@ components: content: application/json: schema: - $ref: ../definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgExtArtifactsAccessInfo + $ref: definitions/SOL005VNFSnapshotPackageManagement_def.yaml#/definitions/VnfSnapshotPkgExtArtifactsAccessInfo IndividualArtifact.Get.200: description: | diff --git a/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml b/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml index d333bef..5e2dac7 100644 --- a/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml +++ b/src/SOL005/VNFSnapshotPackageManagement/definitions/SOL005VNFSnapshotPackageManagement_def.yaml @@ -91,7 +91,7 @@ definitions: to be excluded per attribute selector. type: array items: - $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifierlocal" + $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierLocal" isFullSnapshot: description: > Value is TRUE in case of a "full" VNF snapshot package, i.e., containing all snapshotted @@ -406,8 +406,8 @@ definitions: type: string VnfSnapshotPkgExtArtifactsAccessInfo: - description: > - ... + description: > #no definition found + VnfSnapshotPkgExtArtifactsAccessInfo description ! type: string VnfSnapshotPkgExtArtifactsAccessConfig: diff --git a/src/SOL005/components/SOL005_params.yaml b/src/SOL005/components/SOL005_params.yaml index 4f23f80..905b581 100644 --- a/src/SOL005/components/SOL005_params.yaml +++ b/src/SOL005/components/SOL005_params.yaml @@ -130,8 +130,8 @@ components: schema: type: string - include_signature: - name: include_signature + include_signatures: + name: include_signatures description: > If this parameter is provided, the NFVO shall include in the ZIP archive the security information as specified above. diff --git a/src/SOL005/definitions/SOL005_def.yaml b/src/SOL005/definitions/SOL005_def.yaml index e05e97c..38e6078 100644 --- a/src/SOL005/definitions/SOL005_def.yaml +++ b/src/SOL005/definitions/SOL005_def.yaml @@ -58,6 +58,12 @@ definitions: A number as defined in IETF RFC 8259. type: number + UnsignedInt: + description: > + Unsigned integer number + type: integer + minimum: 0 + KeyValuePairs: description: > This type represents a list of key-value pairs. The order of the pairs in the list is not significant. @@ -286,6 +292,19 @@ definitions: Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. type: string + IdentifierLocal: + description: > + An identifier that is unique within a limited local scope other than above listed identifiers, + such as within a complex data structure or within a request-response pair. + Representation: string of variable length. + type: string + + IdentifierInVnf: + description: > + An identifier that is unique for the respective type within a VNF + instance, but may not be globally unique. + type: string + ApiVersionInformation: description: > This type represents API version information. -- GitLab