Commit 778626c9 authored by Samir Medjiah's avatar Samir Medjiah

SOL005: Fixed bug while refactoring common data types

parent 30b52146
Pipeline #917 passed with stage
in 0 seconds
...@@ -441,7 +441,7 @@ definitions: ...@@ -441,7 +441,7 @@ definitions:
flavourId: flavourId:
description: > description: >
Identifier of the VNF deployment flavor applied to this VNF instance. Identifier of the VNF deployment flavor applied to this VNF instance.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
vnfState: vnfState:
description: > description: >
The state of the VNF instance. The state of the VNF instance.
...@@ -560,7 +560,7 @@ definitions: ...@@ -560,7 +560,7 @@ definitions:
aspectId: aspectId:
description: > description: >
Identifier of the scaling aspect. Identifier of the scaling aspect.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
scaleLevel: scaleLevel:
description: > description: >
Indicates the scale level. The minimum value shall be 0 and the Indicates the scale level. The minimum value shall be 0 and the
...@@ -913,7 +913,7 @@ definitions: ...@@ -913,7 +913,7 @@ definitions:
cpdId: cpdId:
description: > description: >
Identifier of the external CPD, VnfExtCpd, in the VNFD. Identifier of the external CPD, VnfExtCpd, in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
cpProtocolInfo: cpProtocolInfo:
description: > description: >
Network protocol information for this CP. Network protocol information for this CP.
...@@ -1154,7 +1154,7 @@ definitions: ...@@ -1154,7 +1154,7 @@ definitions:
the VIM. the VIM.
In case this attribute is present, IP addresses are bound In case this attribute is present, IP addresses are bound
to that subnet. to that subnet.
$ref: "#/definitions/IdentifierInVim" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
type: type:
...@@ -1210,7 +1210,7 @@ definitions: ...@@ -1210,7 +1210,7 @@ definitions:
resource in the VIM. resource in the VIM.
In case this attribute is present, IP addresses In case this attribute is present, IP addresses
are bound to that subnet. are bound to that subnet.
$ref: "#/definitions/IdentifierInVim" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
ExtVirtualLinkInfo: ExtVirtualLinkInfo:
type: object type: object
...@@ -1278,7 +1278,7 @@ definitions: ...@@ -1278,7 +1278,7 @@ definitions:
vnfVirtualLinkDescId: vnfVirtualLinkDescId:
description: > description: >
Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
networkResource: networkResource:
description: > description: >
Reference to the VirtualNetwork resource. Reference to the VirtualNetwork resource.
...@@ -1344,7 +1344,7 @@ definitions: ...@@ -1344,7 +1344,7 @@ definitions:
id: id:
description: > description: >
Identifier of the monitoring parameter defined in the VNFD. Identifier of the monitoring parameter defined in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
name: name:
description: > description: >
Human readable name of the monitoring parameter, as defined in the VNFD. Human readable name of the monitoring parameter, as defined in the VNFD.
...@@ -1381,7 +1381,7 @@ definitions: ...@@ -1381,7 +1381,7 @@ definitions:
vduId: vduId:
description: > description: >
Reference to the applicable VDU in the VNFD. Reference to the applicable VDU in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
computeResource: computeResource:
description: > description: >
Reference to the VirtualCompute resource. Reference to the VirtualCompute resource.
...@@ -1419,7 +1419,7 @@ definitions: ...@@ -1419,7 +1419,7 @@ definitions:
cpdId: cpdId:
description: > description: >
Identifier of the VDU CPD, cpdId, in the VNFD. Identifier of the VDU CPD, cpdId, in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
vnfExtCpId: vnfExtCpId:
description: > description: >
When the VNFC CP is exposed as external CP of the VNF, the When the VNFC CP is exposed as external CP of the VNF, the
...@@ -1463,7 +1463,7 @@ definitions: ...@@ -1463,7 +1463,7 @@ definitions:
vnfVirtualLinkDescId: vnfVirtualLinkDescId:
description: > description: >
Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD. Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
networkResource: networkResource:
description: > description: >
Reference to the VirtualNetwork resource. Reference to the VirtualNetwork resource.
...@@ -1504,7 +1504,7 @@ definitions: ...@@ -1504,7 +1504,7 @@ definitions:
virtualStorageDescId: virtualStorageDescId:
description: > description: >
Identifier of the VirtualStorageDesc in the VNFD. Identifier of the VirtualStorageDesc in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
storageResource: storageResource:
description: > description: >
Reference to the VirtualStorage resource. Reference to the VirtualStorage resource.
...@@ -2175,14 +2175,14 @@ definitions: ...@@ -2175,14 +2175,14 @@ definitions:
vnfFlavourId: vnfFlavourId:
description: > description: >
Identifier of the VNF deployment flavor to be instantiated. Identifier of the VNF deployment flavor to be instantiated.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
vnfInstantiationLevelId: vnfInstantiationLevelId:
description: > description: >
Identifier of the instantiation level of the deployment Identifier of the instantiation level of the deployment
flavor to be instantiated. If not present, the default flavor to be instantiated. If not present, the default
instantiation level as declared in the VNFD is instantiation level as declared in the VNFD is
instantiated. instantiated.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
vnfInstanceName: vnfInstanceName:
description: > description: >
Human-readable name of the VNF instance to be created. Human-readable name of the VNF instance to be created.
...@@ -2231,14 +2231,14 @@ definitions: ...@@ -2231,14 +2231,14 @@ definitions:
newFlavourId: newFlavourId:
description: > description: >
Identifier of the VNF deployment flavor to be instantiated. Identifier of the VNF deployment flavor to be instantiated.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
instantiationLevelId: instantiationLevelId:
description: > description: >
Identifier of the instantiation level of the deployment Identifier of the instantiation level of the deployment
flavor to be instantiated. If not present, the default flavor to be instantiated. If not present, the default
instantiation level as declared in the VNFD is instantiation level as declared in the VNFD is
instantiated. instantiated.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
extVirtualLinks: extVirtualLinks:
description: > description: >
Information about external VLs to connect the VNF to. Information about external VLs to connect the VNF to.
...@@ -2746,7 +2746,7 @@ definitions: ...@@ -2746,7 +2746,7 @@ definitions:
virtualLinkDescId: virtualLinkDescId:
description: > description: >
Identifier of the related VLD in the VNFD. Identifier of the related VLD in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
changeType: changeType:
description: > description: >
Signals the type of change. Permitted values: Signals the type of change. Permitted values:
...@@ -2798,7 +2798,7 @@ definitions: ...@@ -2798,7 +2798,7 @@ definitions:
virtualStorageDescId: virtualStorageDescId:
description: > description: >
Identifier of the related VirtualStorage descriptor in the VNFD. Identifier of the related VirtualStorage descriptor in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
changeType: changeType:
description: > description: >
Signals the type of change. Permitted values: Signals the type of change. Permitted values:
...@@ -3543,7 +3543,7 @@ definitions: ...@@ -3543,7 +3543,7 @@ definitions:
description: > description: >
Identifier of the target instantiation level of the current Identifier of the target instantiation level of the current
deployment flavor to which the VNF is requested to be scaled. deployment flavor to which the VNF is requested to be scaled.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
vnfScaleInfo: vnfScaleInfo:
description: > description: >
For each scaling aspect of the current deployment For each scaling aspect of the current deployment
...@@ -3571,7 +3571,7 @@ definitions: ...@@ -3571,7 +3571,7 @@ definitions:
description: > description: >
Identifier of (reference to) the aspect of the VNF that is Identifier of (reference to) the aspect of the VNF that is
requested to be scaled, as declared in the VNFD. requested to be scaled, as declared in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
numberOfSteps: numberOfSteps:
description: > description: >
Number of scaling steps. It shall be a positive number. Number of scaling steps. It shall be a positive number.
...@@ -3979,7 +3979,7 @@ definitions: ...@@ -3979,7 +3979,7 @@ definitions:
In case this attribute is present, IP addresses from that In case this attribute is present, IP addresses from that
subnet will be assigned; otherwise, IP addresses not bound to subnet will be assigned; otherwise, IP addresses not bound to
a subnet will be assigned. a subnet will be assigned.
$ref: "#/definitions/IdentifierInVim" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
ExtVirtualLinkData: ExtVirtualLinkData:
description: > description: >
...@@ -4012,7 +4012,7 @@ definitions: ...@@ -4012,7 +4012,7 @@ definitions:
description: > description: >
The identifier of the resource in the scope of the VIM or The identifier of the resource in the scope of the VIM or
the resource provider. the resource provider.
$ref: "#/definitions/IdentifierInVim" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
extCps: extCps:
description: > description: >
External CPs of the VNF to be connected to this external VL. External CPs of the VNF to be connected to this external VL.
...@@ -4044,7 +4044,7 @@ definitions: ...@@ -4044,7 +4044,7 @@ definitions:
vmfVirtualLinkDescId: vmfVirtualLinkDescId:
description: > description: >
The identifier of the VLD in the VNFD for this VL. The identifier of the VLD in the VNFD for this VL.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
vimId: vimId:
description: > description: >
Identifier of the VIM that manage this resource. This Identifier of the VIM that manage this resource. This
...@@ -4063,7 +4063,7 @@ definitions: ...@@ -4063,7 +4063,7 @@ definitions:
description: > description: >
The identifier of the resource in the scope of the VIM or The identifier of the resource in the scope of the VIM or
the resource provider. the resource provider.
$ref: "#/definitions/IdentifierInVim" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVim"
VnfExtCpData: VnfExtCpData:
description: > description: >
...@@ -4076,7 +4076,7 @@ definitions: ...@@ -4076,7 +4076,7 @@ definitions:
cpdId: cpdId:
description: > description: >
The identifier of the CPD in the VNFD. The identifier of the CPD in the VNFD.
$ref: "#/definitions/IdentifierInVnfd" $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
cpConfig: cpConfig:
description: > description: >
List of instance data that need to be configured on the CP instances List of instance data that need to be configured on the CP instances
...@@ -4190,10 +4190,7 @@ definitions: ...@@ -4190,10 +4190,7 @@ definitions:
It is expected to be unique within the VIM instance. Representation: string of variable length. It is expected to be unique within the VIM instance. Representation: string of variable length.
type: string type: string
IdentifierInVnfd:
description: >
Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
type: string
IdentifierInVnf: IdentifierInVnf:
description: > description: >
......
...@@ -234,6 +234,17 @@ definitions: ...@@ -234,6 +234,17 @@ definitions:
complements the ResourceHandle. complements the ResourceHandle.
type: string type: string
IdentifierInVim:
description: >
An identifier maintained by the VIM or other resource provider.
It is expected to be unique within the VIM instance. Representation: string of variable length.
type: string
IdentifierInVnfd:
description: >
Identifier of the VNF Virtual Link Descriptor (VLD) in the VNFD.
type: string
ApiVersionInformation: ApiVersionInformation:
description: > description: >
This type represents API version information. This type represents API version information.
......
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