Commit d02cabd0 authored by piscione's avatar piscione
Browse files

from SOL005_46 to SOL005_49

parent 555f794a
......@@ -8,7 +8,8 @@ definitions:
This type represents attribute modifications for an individual NS
descriptor resource based on the NsdInfo data type. The attributes of
NsdInfo that can be modified are included in the NsdInfoModifications
data type.NOTE: At least one of the attributes - nsdOperationalState and
data type.
NOTE: At least one of the attributes - nsdOperationalState and
userDefinedData - shall be present.
oneOf:
- required:
......@@ -23,7 +24,6 @@ definitions:
Modifications of the userDefinedData attribute in NsdInfo
data type. See note. If present, these modifications shall be applied
according to the rules of JSON Merge Patch (see IETF RFC 7396).
NOTE- At least one of the attributes - nsdOperationalState and userDefinedData - shall be present.
type: array
items:
$ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
......@@ -46,6 +46,13 @@ definitions:
description: >
Identifier of the on boarded individual NS descriptor
resource. This identifier is allocated by the NFVO.
NOTE 1: At least one of the attributes - vnfPkgId and nestedNsdInfoId shall be present,
after the NSD is on-boarded.
NOTE 2: If the value of the nsdOnboardingState attribute is not equal to "ONBOARDED",
the value of the nsdOperationalState attribute shall be equal to "DISABLED".
NOTE 3: If the value of the nsdOnboardingState attribute is not equal to "ONBOARDED",
the value of the nsdUsageState attribute shall be equal to "NOT_IN_USE".
NOTE 4: State changes of an NSD are illustrated in clause B.2.
$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
nsdId:
description: >
......@@ -82,6 +89,7 @@ definitions:
description: >
Identifies the VNF package for the VNFD referenced
by the on-boarded NS descriptor resource.
See note 1.
type: array
items:
$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
......@@ -98,6 +106,7 @@ definitions:
Identifies the NsdInfo element for the nested NSD
referenced by the on-boarded NS descriptor
resource.
See note 1.
type: array
items:
$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
......@@ -129,6 +138,7 @@ definitions:
nsdOnboardingState:
description: >
On boarding state of the individual NS descriptor resource.
See note 4.
$ref: "#/definitions/NsdOnboardingStateType"
onboardingFailureDetails:
description: >
......@@ -143,11 +153,12 @@ definitions:
description: >
Operational state of the individual NS descriptor
resource. This attribute can be modified with the
PATCH method.
PATCH method. See note 2 and 4.
$ref: "#/definitions/NsdOperationalStateType"
nsdUsageState:
description: >
Usage state of the individual NS descriptor resource.
See note 3 and note 4.
$ref: "#/definitions/NsdUsageStateType"
userDefinedData:
description: >
......@@ -367,11 +378,15 @@ definitions:
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).
NOTE 1: The attributes "nsdId" and "nsdInfoId" are alternatives to reference to a particular NSD in a filter.
They should not be used both in the same filter instance, but one alternative should be chosen.
NOTE 1: The permitted values of the "notificationTypes" attribute are spelled exactly
as the names of the notification types to facilitate automated code generation systems.
NOTE 2: The attributes "nsdId" and "nsdInfoId" are alternatives to reference to a
particular NSD in a filter. They should not be used both in the same filter instance,
but one alternative should be chosen.
NOTE 2: The attributes "pnfdId" and "pnfdInfoId" are alternatives to reference to a particular PNFD in a filter.
They should not be used both in the same filter instance, but one alternative should be chosen.
NOTE 3: The attributes "pnfdId" and "pnfdInfoId" are alternatives to reference to a particular
PNFD in a filter. They should not be used both in the same filter instance, but one alternative should be chosen.
anyOf:
- oneOf:
- required:
......@@ -386,12 +401,18 @@ definitions:
properties:
notificationTypes:
description: >
Match particular notification types. Permitted values: NsdOnBoardingNotification,
NsdOnboardingFailureNotification, NsdChangeNotification, NsdDeletionNotification
PnfdOnBoardingNotification, PnfdOnBoardingFailureNotification, PnfdDeletionNotification.
The permitted values of the "notificationTypes" ] attribute are spelled
exactly as the names of the notification types to facilitate automated
code generation systems.
Match particular notification types.
Permitted values:
- NsdOnBoardingNotification
- NsdOnboardingFailureNotification
- NsdChangeNotification
- NsdDeletionNotification
- PnfdOnBoardingNotification
- PnfdOnBoardingFailureNotification
- PnfdDeletionNotification
See note 1.
type: array
items:
type: string
......@@ -405,13 +426,13 @@ definitions:
- PnfdDeletionNotification
nsdInfoId:
description: >
Match the NsdInfo identifier which is allocated by the NFVO.
Match the NsdInfo identifier which is allocated by the NFVO. See note 2.
type: array
items:
$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
nsdId:
description: >
Match the NSD identifier, which is allocated by the NSD designer.
Match the NSD identifier, which is allocated by the NSD designer. See note 2.
type: array
items:
$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
......@@ -451,7 +472,7 @@ definitions:
pnfdInfoIds:
description: >
Match the PnfdInfo identifier for the PNFD
referenced by the on-boarded NSD.
referenced by the on-boarded NSD. See note 3.
type: array
items:
$ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
......
......@@ -193,6 +193,7 @@ definitions:
If present, match NS instances that were created
based on a NSD identified by one of the nsdId
values listed in this attribute.
See note 1.
type: array
items:
$ref: "#/definitions/Identifier"
......@@ -202,6 +203,7 @@ definitions:
instances that were created based on a VNFD
identified by one of the vnfdId values listed in
this attribute.
See note 1.
type: array
items:
$ref: "#/definitions/Identifier"
......@@ -211,6 +213,7 @@ definitions:
PNFs that are represented by a PNFD identified
by one of the pnfdId values listed in this
attribute.
See note 1.
type: array
items:
$ref: "#/definitions/Identifier"
......@@ -218,6 +221,7 @@ definitions:
description: >
If present, match NS instances with an instance
identifier listed in this attribute.
See note 2.
type: array
items:
$ref: "#/definitions/Identifier"
......@@ -225,6 +229,7 @@ definitions:
description: >
If present, match NS instances with a NS
Instance Name listed in this attribute.
See note 2.
type: array
items:
$ref: "#/definitions/String"
......@@ -234,6 +239,9 @@ definitions:
This type represents the information that allows addressing a virtualised resource
that is used by a VNF instance or by an NS instance. Information about the resource
is available from the VIM.
NOTE: The value set of the "vimLevelResourceType" attribute is within the scope of the VIM,
the WIM or the resource provider and can be used as information that complements the ResourceHandle.
type: object
required:
- resourceId
......@@ -262,6 +270,7 @@ definitions:
The value set of the "vimLevelResourceType" attribute is within the scope
of the VIM, the WIM or the resource provider and can be used as information that
complements the ResourceHandle.
See note.
type: string
IdentifierInNs:
......
Markdown is supported
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