Skip to content
GitLab
Commit 6313e982 authored by Ayesha Ayub's avatar Ayesha Ayub
Browse files

fix data model references

parent eee3529c
Pipeline #13215 passed with stage
in 0 seconds
Hide whitespace changes
Inline Side-by-side
src/SOL003/VNFLifecycleManagement/definitions/SOL003VNFLifecycleManagement_def.yaml
View file @ 6313e982
......@@ -754,7 +754,7 @@ definitions:
vnfdVersion:
description: >
Identifies the version of the VNFD. The value is copied from the VNFD.
$ref: "../../..//definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
vnfConfigurableProperties:
description: >
Additional VNF-specific attributes that provide the current values of the configurable
......
src/SOL003/VNFPackageManagement/VNFPackageManagement.yaml
View file @ 6313e982
......@@ -1139,7 +1139,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
VnfdInIndividualOnboardedVnfPackage.Get.200:
description: |
......@@ -1213,7 +1213,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
ManifestInIndividualVnfPackage.Get.200:
description: |
......@@ -1331,7 +1331,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
ManifestInIndividualOnboardedVnfPackage.Get.200:
description: |
......@@ -1449,7 +1449,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualVnfPackageContent.Get.200:
description: |
......@@ -1557,7 +1557,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualVnfPackageContent.Get.416:
description: |
......@@ -1653,7 +1653,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualOnboardedVnfPackageContent.Get.416:
description: |
......@@ -1774,7 +1774,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualVnfPackageArtifact.Get.416:
description: |
......@@ -1840,7 +1840,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualOnboardedVnfPackageArtifact.Get.416:
description: |
......@@ -1906,7 +1906,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualVnfPackageArtifacts.Get.416:
description: |
......@@ -1975,7 +1975,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
IndividualOnboardedVnfPackageArtifacts.Get.416:
description: |
......@@ -2464,7 +2464,7 @@ components:
content:
application/json:
schema:
$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
Subscriptions.Get.200:
description: |
......
src/SOL003/VNFPackageManagement/definitions/SOL003VNFPackageManagement_def.yaml
View file @ 6313e982
......@@ -22,7 +22,7 @@ definitions:
description: >
Identifier of the on-boarded VNF package. This identifier is
allocated by the NFVO.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
vnfdId:
description: >
This identifier, which is managed by the VNF provider, identifies
......@@ -30,19 +30,19 @@ definitions:
It's copied from the VNFD of the on-boarded VNF package.
It shall be present after the VNF package content has been
on-boarded and absent otherwise.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
vnfProvider:
description: >
Provider of the VNF package and the VNFD. This information is copied
from the VNFD.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
vnfProductName:
description: >
Name to identify the VNF product. Invariant for the VNF product
lifetime. This information is copied from the VNFD.
It shall be present after the VNF package content has been
on-boarded and absent otherwise.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
vnfSoftwareVersion:
description: >
Software version of the VNF. This is changed when there is any
......@@ -50,13 +50,13 @@ definitions:
This information is copied from the VNFD.
It shall be present after the VNF package content has been
on-boarded and absent otherwise.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
vnfdVersion:
description: >
The version of the VNFD. This information is copied from the VNFD.
It shall be present after the VNF package content has been
on-boarded and absent otherwise.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
compatibleSpecificationVersions:
description: >
Indicates which versions of the ETSI GS NFV-SOL 004 specification the
......@@ -64,14 +64,14 @@ definitions:
Each entry shall be formatted as defined in clause 4.3.2 of ETSI GS NFV-SOL 004.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
checksum:
description: >
Checksum of the on-boarded VNF package.
It shall be present after the VNF package content has been
on-boarded and absent otherwise.
Permitted hash algorithms are defined in ETSI GS NFV-SOL 004.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum"
packageSecurityOption:
description: >
Signals the security option used by the package as defined in clause 5.1 of ETSI GS NFV-SOL 004.
......@@ -84,7 +84,7 @@ definitions:
signingCertificate:
description: >
The singleton signing certificate if it is included as a file in the VNF package.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
softwareImages:
description: >
Information about VNF package artifacts that are software images.
......@@ -128,11 +128,11 @@ definitions:
It shall be present after the VNF package content has been on-boarded and absent otherwise.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
userDefinedData:
description: >
User defined data for the VNF package.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"
onboardingFailureDetails:
description: >
Failure details of current onboarding procedure. See clause 6.3 of ETSI GS NFV-SOL 013
......@@ -140,7 +140,7 @@ definitions:
If "onboardingState" is "ERROR", this attribute shall be present and contain error
information (such as failed onboarding or processing operation, affected artifact etc.),
unless it has been requested to be excluded via an attribute selector.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/ProblemDetails"
_links:
description: >
Links to resources related to this resource.
......@@ -152,15 +152,15 @@ definitions:
self:
description: >
URI of this resource.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
vnfd:
description: >
Link to the "VNFD in an individual VNf package" resource.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
packageContent:
description: >
Link to the "VNF package content" resource.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
PkgmSubscriptionRequest:
description: >
......@@ -180,7 +180,7 @@ definitions:
callbackUri:
description: >
The URI of the endpoint to send the notification to.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri"
authentication:
description: >
Authentication parameters to configure the use of Authorization when
......@@ -188,7 +188,7 @@ definitions:
in clause 8.3.4 of ETSI GS NFV-SOL 013.
This attribute shall only be present if the subscriber requires
authorization of notifications.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/SubscriptionAuthentication"
PkgmSubscription:
description: >
......@@ -203,7 +203,7 @@ definitions:
id:
description: >
Identifier of this "Individual subscription" resource.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
filter:
description: >
Filter settings for this subscription, to define the subset of all
......@@ -214,7 +214,7 @@ definitions:
callbackUri:
description: >
The URI of the endpoint to send the notification to.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri"
_links:
description: >
Links to resources related to this resource.
......@@ -225,7 +225,7 @@ definitions:
self:
description: >
URI of this resource.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Link"
VnfPackageSoftwareImageInfo:
description: >
......@@ -254,28 +254,28 @@ definitions:
id:
description: >
Identifier of the software image.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/IdentifierInVnfd"
name:
description: >
Name of the software image.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
provider:
description: >
Provider of the software image.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
version:
description: >
Version of the software image.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
checksum:
description: >
Checksum of the software image file.
Permitted hash algorithms are defined in ETSI GS NFV-SOL 004.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum"
isEncrypted:
description: >
Reflects whether the image is encrypted (true) or not (false).
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean"
containerFormat:
description: >
Container format indicates whether the software image is in a file
......@@ -330,7 +330,7 @@ definitions:
createdAt:
description: >
Time when this software image was created.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/DateTime"
minDisk:
description: >
The minimal disk for this software image in bytes.
......@@ -346,7 +346,7 @@ definitions:
userMetadata:
description: >
User-defined data.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"
imagePath:
description: >
Path which identifies the image artifact and also
......@@ -375,7 +375,7 @@ definitions:
manifest. Shall be present if the image artifact is external
to the VNF package and shall be absent otherwise.
EXAMPLE: https://example.com/m%40ster.vhd
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri"
VnfPackageArtifactInfo:
description: >
......@@ -413,7 +413,7 @@ definitions:
NFVO to synthesize this path in a manner that avoids any
collision of the synthesized artifact path with the paths
and names of artifacts included in the package.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
artifactURI:
description: >
URI of the artifact as defined in the VNF package manifest.
......@@ -422,22 +422,22 @@ definitions:
EXAMPLE: https://example.com/m%40ster.sh
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Uri"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Uri"
checksum:
description: >
Checksum of the artifact file.
Permitted hash algorithms are defined in ETSI GS NFV-SOL 004.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Checksum"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Checksum"
isEncrypted:
description: >
Reflects whether the artifact is encrypted (true) or not (false).
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Boolean"
nonManoArtifactSetId:
description: >
Non-MANO artifact set identifier of the non-MANO artifact set to
which the artifact belongs, as defined in clause 4.3.7 of ETSI GS NFV-SOL 004.
Shall be provided if the artifact is a non-MANO artifact, and shall be omitted otherwise.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
artifactClassification:
description: >
Marks specific types of artifacts as defined in the VNF package.
......@@ -456,7 +456,7 @@ definitions:
description: >
The metadata of the artifact that are available in the VNF package,
such as Content type, size, creation date, etc.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/KeyValuePairs"
PkgmNotificationsFilter:
description: >
......@@ -509,7 +509,7 @@ definitions:
vnfProvider:
description: >
Name of the VNF provider to match.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
vnfProducts:
description: >
If present, match VNF packages that contain VNF products with
......@@ -523,7 +523,7 @@ definitions:
vnfProductName:
description: >
Name of the VNF product to match.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
versions:
description: >
If present, match VNF packages that contain VNF products
......@@ -538,7 +538,7 @@ definitions:
vnfSoftwareVersion:
description: >
VNF software version to match.
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
vnfdVersions:
description: >
If present, match VNF packages that contain VNF
......@@ -547,14 +547,14 @@ definitions:
one particular provider.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Version"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Version"
vnfdId:
description: >
Match VNF packages with a VNFD identifier listed in the attribute.
See note 2.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
vnfPkgId:
description: >
Match VNF packages with a package identifier listed in the
......@@ -565,7 +565,7 @@ definitions:
See note 2.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/Identifier"
operationalState:
description: >
Match particular operational states of the VNF package.
......@@ -585,7 +585,7 @@ definitions:
Match strings that specify VNFMs compatible with the VNF. See table 10.5.2.2-1.
type: array
items:
$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/String"
$ref: "../../General_Definitions/SOL003_def.yaml#/definitions/String"
PackageOperationalStateType:
description: >
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment