Commit ea3150d0 authored by vreck's avatar vreck
Browse files

Update etsi_nfv_sol001_common_types.yaml, etsi_nfv_sol001_vnfd_types.yaml,...

Update etsi_nfv_sol001_common_types.yaml, etsi_nfv_sol001_vnfd_types.yaml, etsi_nfv_sol001_nsd_types.yaml, etsi_nfv_sol001_pnfd_types.yaml files
parent c1657dc0
tosca_definitions_version: tosca_simple_yaml_1_3
description: ETSI NFV SOL 001 common types definitions version 3.3.1
description: ETSI NFV SOL 001 common types definitions version 3.5.1
metadata:
template_name: etsi_nfv_sol001_common_types
template_author: ETSI_NFV
template_version: 3.3.1
template_version: 3.5.1
data_types:
tosca.datatypes.nfv.L2AddressData:
......
This diff is collapsed.
tosca_definitions_version: tosca_simple_yaml_1_3
description: ETSI NFV SOL 001 pnfd types definitions version 3.3.1
description: ETSI NFV SOL 001 pnfd types definitions version 3.5.1
metadata:
template_name: etsi_nfv_sol001_pnfd_types
template_author: ETSI_NFV
template_version: 3.3.1
template_version: 3.5.1
imports:
- https://forge.etsi.org/rep/nfv/SOL001/raw/v3.3.1/etsi_nfv_sol001_common_types.yaml
- https://forge.etsi.org/rep/nfv/SOL001/raw/v3.5.1/etsi_nfv_sol001_common_types.yaml
data_types:
tosca.datatypes.nfv.LocationInfo:
......@@ -74,8 +74,6 @@ data_types:
description: Altitude value as per RFC 6225
required: true
node_types:
tosca.nodes.nfv.PNF:
derived_from: tosca.nodes.Root
......@@ -109,20 +107,20 @@ node_types:
required: false
description: Provides information about the geographical location (e.g. geographic coordinates or address of the building, etc.) of the PNF
requirements:
- virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
occurrences: [ 0, 1 ]
- virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
occurrences: [ 0, 1 ]
# Additional requirements shall be defined in the PNF specific node type (deriving from tosca.nodes.nfv.PNF) corresponding to NS virtual links that need to connect to PnfExtCps
tosca.nodes.nfv.PnfExtCp:
derived_from: tosca.nodes.nfv.Cp
description: node definition of PnfExtCp.
requirements:
- external_virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
occurrences: [0, 1]
- external_virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
occurrences: [0, 1]
policy_types:
tosca.policies.nfv.PnfSecurityGroupRule:
......
tosca_definitions_version: tosca_simple_yaml_1_3
description: ETSI NFV SOL 001 vnfd types definitions version 3.3.1
description: ETSI NFV SOL 001 vnfd types definitions version 3.5.1
metadata:
template_name: etsi_nfv_sol001_vnfd_types
template_author: ETSI_NFV
template_version: 3.3.1
template_version: 3.5.1
imports:
- https://forge.etsi.org/rep/nfv/SOL001/raw/v3.3.1/etsi_nfv_sol001_common_types.yaml
- https://forge.etsi.org/rep/nfv/SOL001/raw/v3.5.1/etsi_nfv_sol001_common_types.yaml
# editor's note: During the development of the SOL001ed351 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file
data_types:
tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
derived_from: tosca.datatypes.Root
......@@ -953,6 +953,39 @@ data_types:
# This data type definition is reserved for future use in the present document.
# properties:
tosca.datatypes.nfv.VnfLcmOpCoord:
derived_from: tosca.datatypes.Root
description: describes a set of information used for a coordination action in a VNF lifecycle management operation for a given VNF.
properties:
description:
type: string
description: Human readable description of the coordination action.
required: false
endpoint_type:
type: string
description: Specifies the type of the endpoint exposing the LCM operation coordination such as other operations supporting or management systems (e.g. an EM) or the VNF instance. If the VNF produces the LCM coordination interface, this property may be omitted or may have the value "vnf". If this attribute is omitted, the type of endpoint that provides the interface is determined at deployment time. If the VNF does not produce the LCM coordination interface but coordination via this interface is needed, it is expected that a management entity such as the EM exposes the coordination interface, and consequently, this attribute shall be present and shall have the value “mgmt”.
required: false
constraints:
- valid_values: [ mgmt, vnf ]
coordination_stage:
type: string
description: Indicates whether the coordination action is invoked before or after all other changes performed by the VNF LCM operation. coordination_stage property shall be omitted if the coordination action is intended to be invoked at an intermediate stage of the LCM operation, i.e. neither at the start nor at the end. In this case, the time at which to invoke the coordination during the execution of the LCM operation is determined by means outside the scope of the present document such as VNFM-internal logic or LCM script.
required: false
constraints:
- valid_values: [ start, end ]
# input_parameters:
# type: tosca.datatypes.nfv.InputOpCoordParams
# description: Input parameters to be provided in the LCM coordination request.
# required: false
# output_parameters:
# type: tosca.datatypes.nfv.OutputOpCoordParams
# description: Output parameters provided in the LCM coordination response.
# required: false
tosca.datatypes.nfv.OutputOpCoordParams:
derived_from: tosca.datatypes.Root
description: is an empty base type for deriving data types for describing additional Output operation coordination parameters for a given coordination action
artifact_types:
tosca.artifacts.nfv.SwImage:
derived_from: tosca.artifacts.Deployment.Image
......@@ -1020,8 +1053,7 @@ artifact_types:
file_ext: [ yaml ]
capability_types:
capability_types:
tosca.capabilities.nfv.VirtualBindable:
derived_from: tosca.capabilities.Node
description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.VirtualBindsTo relationship type which is used to model the VduHasCpd association
......@@ -1067,7 +1099,10 @@ capability_types:
derived_from: tosca.capabilities.Root
description: Describes the attachment capabilities related to Vdu.Storage
tosca.capabilities.nfv.TrunkBindable:
derived_from: tosca.capabilities.Node
description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.TrunkBindsTo relationship type which is used to model the trunkPortTopology.
relationship_types:
tosca.relationships.nfv.VirtualBindsTo:
derived_from: tosca.relationships.DependsOn
......@@ -1079,6 +1114,10 @@ relationship_types:
description: Represents an association relationship between the Vdu.Compute and one of the node types, Vdu.VirtualBlockStorage, Vdu.VirtualObjectStorage or Vdu.VirtualFileStorage
valid_target_types: [ tosca.capabilities.nfv.VirtualStorage ]
tosca.relationships.nfv.TrunkBindsTo:
derived_from: tosca.relationships.DependsOn
description: Represents the association relationship between a VduCp node used as a trunk port and other VduSubCp nodes used as subports of the same trunk.
valid_target_types: [ tosca.capabilities.nfv.TrunkBindable ]
interface_types:
tosca.interfaces.nfv.Vnflcm:
......@@ -1186,11 +1225,13 @@ interface_types:
type:
type: string
description: Indicates the type of the scale operation requested.
required: false
constraints:
- valid_values: [ scale_out, scale_in ]
aspect:
type: string
description: Identifier of the scaling aspect.
required: false
number_of_steps:
type: integer
description: Number of scaling steps to be executed.
......@@ -1276,7 +1317,7 @@ interface_types:
tosca.interfaces.nfv.ChangeCurrentVnfPackage:
derived_from: tosca.interfaces.Root
description: This interface is an empty base interface type for deriving VNF specific interface types that include VNF Change Current VNF Package specific operation.
operations:
# operations:
# operation_name: name of a VNF-specific operation serving the Change current VNF Package request.
# description: Invoked by tosca.policies.nfv.VnfPackageChange
# inputs:
......@@ -1355,7 +1396,7 @@ node_types:
description: Describes the configuration parameters for the VNF LCM operations
required: false
monitoring_parameters:
type: list
type: map # key: id
entry_schema:
type: tosca.datatypes.nfv.VnfMonitoringParameter
description: Describes monitoring parameters applicable to the VNF.
......@@ -1436,7 +1477,7 @@ node_types:
entry_schema:
type: string
monitoring_parameters:
type: list
type: map # key: id
description: Describes monitoring parameters applicable to a VNFC instantiated from this VDU
required: false
entry_schema:
......@@ -1478,18 +1519,18 @@ node_types:
description: This node type describes the specifications of requirements related to virtual block storage resources
properties:
virtual_block_storage_data:
type: tosca.datatypes.nfv.VirtualBlockStorageData
description: Describes the block storage characteristics.
required: true
type: tosca.datatypes.nfv.VirtualBlockStorageData
description: Describes the block storage characteristics.
required: true
sw_image_data:
type: tosca.datatypes.nfv.SwImageData
description: Defines information related to a SwImage artifact used by this Vdu.Compute node.
required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
status: deprecated
type: tosca.datatypes.nfv.SwImageData
description: Defines information related to a SwImage artifact used by this Vdu.Compute node.
required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
status: deprecated
capabilities:
virtual_storage:
type: tosca.capabilities.nfv.VirtualStorage
description: Defines the capabilities of virtual_storage.
type: tosca.capabilities.nfv.VirtualStorage
description: Defines the capabilities of virtual_storage.
tosca.nodes.nfv.Vdu.VirtualObjectStorage:
derived_from: tosca.nodes.Root
......@@ -1505,18 +1546,18 @@ node_types:
description: Defines the capabilities of virtual_storage.
tosca.nodes.nfv.Vdu.VirtualFileStorage:
derived_from: tosca.nodes.Root
description: This node type describes the specifications of requirements related to virtual file storage resources
properties:
virtual_file_storage_data:
type: tosca.datatypes.nfv.VirtualFileStorageData
description: Describes the file storage characteristics.
required: true
capabilities:
virtual_storage:
type: tosca.capabilities.nfv.VirtualStorage
#description: Defines the capabilities of virtual_storage.
requirements:
derived_from: tosca.nodes.Root
description: This node type describes the specifications of requirements related to virtual file storage resources
properties:
virtual_file_storage_data:
type: tosca.datatypes.nfv.VirtualFileStorageData
description: Describes the file storage characteristics.
required: true
capabilities:
virtual_storage:
type: tosca.capabilities.nfv.VirtualStorage
#description: Defines the capabilities of virtual_storage.
requirements:
- virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
......@@ -1551,16 +1592,20 @@ node_types:
required: false
constraints:
- valid_values: [ normal, macvtap, direct, baremetal, virtio-forwarder, direct-physical, smart-nic ]
capabilities:
trunk_binding: # This capability is available only the trunk_mode property value of this VduCp is “true” and there is at least one VduSubCp defined as subport of the same trunk.
type: tosca.capabilities.nfv.TrunkBindable
occurrences: [ 0, UNBOUNDED ]
requirements:
- virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
occurrences: [0, 1]
occurrences: [1, 1]
- virtual_binding:
capability: tosca.capabilities.nfv.VirtualBindable
relationship: tosca.relationships.nfv.VirtualBindsTo
node: tosca.nodes.nfv.Vdu.Compute
occurrences: [1, 1]
occurrences: [0, 1]
tosca.nodes.nfv.VnfVirtualLink:
derived_from: tosca.nodes.Root
......@@ -1587,7 +1632,7 @@ node_types:
description: Defines additional data for the VL
required: true
monitoring_parameters:
type: list
type: map #key: id
entry_schema:
type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter
description: Describes monitoring parameters applicable to the VL
......@@ -1600,6 +1645,11 @@ node_types:
derived_from: tosca.nodes.nfv.Cp
description: Describes a connection point to allocate one or a set of virtual IP addresses
properties:
dedicated_ip_address:
type: boolean
description: Indicates whether the VIP address shall be different from the addresses allocated to all associated VduCp instances or shall be the same as one of them.
required: true
default: true
vip_function:
type: string
description: "Indicates the function the virtual IP address is used for: high availability or load balancing. When used for high availability, only one of the internal VDU CP instances or VNF external CP instances that share the virtual IP is bound to the VIP address at a time. When used for load balancing purposes all CP instances that share the virtual IP are bound to it."
......@@ -1609,6 +1659,7 @@ node_types:
requirements:
- target:
capability: tosca.capabilities.Node
node: tosca.nodes.nfv.VduCp
relationship: tosca.relationships.DependsOn
occurrences: [ 1, UNBOUNDED ]
- virtual_link:
......@@ -1616,6 +1667,29 @@ node_types:
relationship: tosca.relationships.nfv.VipVirtualLinksTo
occurrences: [1, 1]
tosca.nodes.nfv.VduSubCp:
derived_from: tosca.nodes.nfv.VduCp
description: describes network connectivity between a VNFC instance based on this VDU and an internal VL through a trunk port
properties:
segmentation_type:
type: string
description: Specifies the encapsulation type for the traffics coming in and out of the trunk subport.
required: false
constraints:
- valid_values: [ vlan, inherit ]
segmentation_id:
type: integer
description: Specifies the segmentation ID for the subport, which is used to differentiate the traffics on different networks coming in and out of the trunk port.
required: false
constraints:
- greater_or_equal: 0
requirements:
- trunk_binding:
capability: tosca.capabilities.nfv.TrunkBindable
relationship: tosca.relationships.nfv.TrunkBindsTo
node: tosca.nodes.nfv.VduCp
occurrences: [1, 1]
group_types:
tosca.groups.nfv.PlacementGroup:
derived_from: tosca.groups.Root
......@@ -1638,7 +1712,7 @@ policy_types:
description: Describes the various levels of resources that can be used to instantiate the VNF using this flavour.
required: true
entry_schema:
type: tosca.datatypes.nfv.InstantiationLevel
type: tosca.datatypes.nfv.InstantiationLevel
constraints:
- min_length: 1
default_level:
......@@ -1776,7 +1850,7 @@ policy_types:
description: Identifies an interface produced by the VNF.
required: true
constraints:
- valid_values: [ vnf_indicator, vnf_configuration ]
- valid_values: [ vnf_indicator, vnf_configuration, vnf_lcm_coordination ]
details:
type: tosca.datatypes.nfv.InterfaceDetails
description: Provide additional data to access the interface endpoint
......@@ -1827,6 +1901,56 @@ policy_types:
type: string
description: Identifies the deployment flavour in the destination VNF package for which this change applies. The flavour ID is defined in the destination VNF package.
required: true
actions:
type: list
description: List of applicable supported LCM coordination action names (action_name) specified in this VNFD as a TOSCA policy of a type derived from tosca.policies.nfv.LcmCoordinationAction.
required: false
entry_schema:
type: string
referenced_coordination_actions:
type: list
description: List of names of coordination actions not specified within this VNFD as a TOSCA policy of a type derived from tosca.policies.nfv.LcmCoordinationAction.
required: false
entry_schema:
type: string
tosca.policies.nfv.LcmCoordinationAction:
derived_from: tosca.policies.Root
description: The LcmCoordinationAction type is a policy type representing the LCM coordination actions supported by a VNF and/or expected to be supported by its EM for a particular VNF LCM operation. This policy concerns the whole VNF (deployment flavour) represented by the topology_template and thus has no explicit target list.
properties:
action_name:
type: string
description: Coordination action name.
required: true
# action: #represents a place holder for specifying actions of a VNF-specific type derived from tosca.datatypes.nfv.VnfLcmOpCoord
# type: tosca.datatypes.nfv.VnfLcmOpCoord
# description: Describes a set of information needed for coordination action in the VNF LCM operation.
# required: true
tosca.policies.nfv.LcmCoordinationsForLcmOperation:
derived_from: tosca.policies.Root
description: The LcmCoordinationsForLcmOperation type is a policy type representing supported LCM coordination actions associated to a VNF LCM operation. This policy concerns the whole VNF (deployment flavour) represented by the topology_template and thus has no explicit target list.
properties:
vnf_lcm_operation:
type: string
description: The VNF LCM operation the LCM coordination actions are associated with.
required: true
constraints:
- valid_values: [instantiate, scale, scale_to_level, change_flavour, terminate, heal, operate, change_ext_conn, modify_info, create_snapshot, revert_to_snapshot ]
actions:
type: list
description: List of applicable supported LCM coordination action names (action_name) specified in this VNFD as a TOSCA policy of a type derived from tosca.policies.nfv.LcmCoordinationAction.
required: false
entry_schema:
type: string
referenced_coordination_actions:
type: list
description: List of names of coordination actions not specified within this VNFD as a TOSCA policy of a type derived from tosca.policies.nfv.LcmCoordinationAction.
See note 1, note 2.
required: false
entry_schema:
type: string
......
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