Cleanup and streamlining
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/692f6129 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/692f6129 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/692f6129 Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04 Commit: 692f61299722b81158a24bf0e9fcd49df7e37487 Parents: a62f4c2 Author: Tal Liron <tal.li...@gmail.com> Authored: Mon Jun 12 12:48:46 2017 -0500 Committer: Tal Liron <tal.li...@gmail.com> Committed: Mon Jun 12 12:48:46 2017 -0500 ---------------------------------------------------------------------- .../tosca-simple-nfv-1.0/artifacts.yaml | 38 ++-- .../tosca-simple-nfv-1.0/capabilities.yaml | 12 +- .../profiles/tosca-simple-nfv-1.0/data.yaml | 83 ++++---- .../profiles/tosca-simple-nfv-1.0/nodes.yaml | 202 +++++-------------- .../tosca-simple-nfv-1.0/relationships.yaml | 8 +- 5 files changed, 131 insertions(+), 212 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/692f6129/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml index 2e68f57..2427d9f 100644 --- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml +++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml @@ -14,6 +14,7 @@ # limitations under the License. artifact_types: + tosca.artifacts.nfv.SwImage: _extensions: shorthand_name: SwImage @@ -24,53 +25,60 @@ artifact_types: derived_from: tosca.artifacts.Deployment.Image properties: name: - description: Name of this software image + description: >- + Name of this software image. type: string required: true version: - description: Version of this software image + description: >- + Version of this software image. type: string required: true checksum: - description: Checksum of the software image file + description: >- + Checksum of the software image file. type: string container_format: description: >- - The container format describes the container file format in which software image is provided + The container format describes the container file format in which software image is + provided. type: string required: true disk_format: - description: The disk format of a software image is the format of the underlying disk image + description: >- + The disk format of a software image is the format of the underlying disk image. type: string required: true min_disk: - description: The minimal disk size requirement for this software image. + description: >- + The minimal disk size requirement for this software image. type: scalar-unit.size required: true min_ram: - description: The minimal disk size requirement for this software image. + description: >- + The minimal disk size requirement for this software image. type: scalar-unit.size required: false - size: # ARIA NOTE: section [5.4.1.1 Properties] calls this field 'Size'. - description: The size of this software image + size: # ARIA NOTE: section [5.4.1.1 Properties] calls this field 'Size' + description: >- + The size of this software image type: scalar-unit.size required: true sw_image: - description: A reference to the actual software image within VNF Package, or url. + description: >- + A reference to the actual software image within VNF Package, or url. type: string required: true operating_system: - description: Identifies the operating system used in the software image. + description: >- + Identifies the operating system used in the software image. type: string required: false supported _virtualization_enviroment: description: >- Identifies the virtualization environments (e.g. hypervisor) compatible with this software - image + image. type: list entry_schema: type: string required: false - - - http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/692f6129/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml index 5673dfd..7b6363f 100644 --- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml +++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml @@ -50,17 +50,21 @@ capability_types: properties: requested_additional_capabilities: # ARIA NOTE: in section [5.5.3.1 Properties] the name of this property is - # "request_additional_capabilities", and its type is not a map, but tosca.datatypes.nfv.RequestedAdditionalCapability - description: Describes additional capability for a particular VDU. + # "request_additional_capabilities", and its type is not a map, but + # tosca.datatypes.nfv.RequestedAdditionalCapability + description: >- + Describes additional capability for a particular VDU. type: map entry_schema: type: tosca.datatypes.nfv.RequestedAdditionalCapability required: false virtual_memory: - description: Describes virtual memory of the virtualized compute + description: >- + Describes virtual memory of the virtualized compute. type: tosca.datatypes.nfv.VirtualMemory required: true virtual_cpu: - description: Describes virtual CPU(s) of the virtualized compute. + description: >- + Describes virtual CPU(s) of the virtualized compute. type: tosca.datatypes.nfv.VirtualCpu required: true http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/692f6129/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml index 17678bb..889dcf7 100644 --- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml +++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml @@ -16,14 +16,13 @@ data_types: tosca.datatypes.nfv.L2AddressData: + # TBD _extensions: shorthand_name: L2AddressData type_qualified_name: tosca:L2AddressData specification: tosca-simple-nfv-1.0 specification_section: 5.3.1 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896055' - # ARIA NOTE: This type is empty in csd04, and is only specified here since the - # tosca.datatypes.nfv.AddressData references it (and states 'empty in "GS NFV IFA011 V0.7.3"') tosca.datatypes.nfv.L3AddressData: _extensions: @@ -53,13 +52,14 @@ data_types: ip_address_type: description: >- Define address type. The address type should be aligned with the address type supported by - the layer_protocol properties of the parent VnfExtCpd + the layer_protocol properties of the parent VnfExtCpd. type: string required: false constraints: - valid_values: [ ipv4, ipv6 ] number_of_ip_address: - description: Minimum number of IP addresses to be assigned. + description: >- + Minimum number of IP addresses to be assigned. type: integer required: false @@ -86,21 +86,19 @@ data_types: constraints: - valid_values: [ mac_address, ip_address ] l2_address_data: + # Shall be present when the addressType is mac_address. description: >- Provides the information on the MAC addresses to be assigned to the connection point(s) instantiated from the parent Connection Point Descriptor. - type: tosca.datatypes.nfv.L2AddressData # empty in "GS NFV IFA011 V0.7.3" + type: tosca.datatypes.nfv.L2AddressData # Empty in "GS NFV IFA011 V0.7.3" required: false - # ARIA NOTE: states under the "constraints" column in the properties table: - # "Shall be present when the addressType is mac_address." l3_address_data: + # Shall be present when the addressType is ip_address. description: >- Provides the information on the IP addresses to be assigned to the connection point instantiated from the parent Connection Point Descriptor. type: tosca.datatypes.nfv.L3AddressData required: false - # ARIA NOTE: the spec states under the "constraints" column in the properties table: - # "Shall be present when the addressType is ip_address." tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements: _extensions: @@ -117,11 +115,13 @@ data_types: derived_from: tosca.datatypes.Root properties: name: - description: Provides a human readable name for the requirement. + description: >- + Provides a human readable name for the requirement. type: string required: false description: - description: Provides a human readable description for the requirement. + description: >- + Provides a human readable description for the requirement. type: string required: false support_mandatory: @@ -134,8 +134,7 @@ data_types: description: >- Specifies a requirement such as the support of SR-IOV, a particular data plane acceleration library, an API to be exposed by a NIC, etc. - type: string # ARIA NOTE: I arbitrarily wrote "string" here, as csd04 specifies only this - # after requirement's type: "# not specified" + type: string # ARIA NOTE: the spec says "not specified", but TOSCA requires a type required: true tosca.datatypes.nfv.ConnectivityType: @@ -159,7 +158,8 @@ data_types: constraints: - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ] flow_pattern: - description: Identifies the flow pattern of the connectivity (Line, Tree, Mesh). + description: >- + Identifies the flow pattern of the connectivity (Line, Tree, Mesh). type: string required: false @@ -170,11 +170,13 @@ data_types: specification: tosca-simple-nfv-1.0 specification_section: 5.3.6 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896060' - description: RequestAdditionalCapability describes additional capability for a particular VDU. + description: >- + RequestAdditionalCapability describes additional capability for a particular VDU. derived_from: tosca.datatypes.Root properties: request_additional_capability_name: - description: Identifies a requested additional capability for the VDU. + description: >- + Identifies a requested additional capability for the VDU. type: string required: true support_mandatory: @@ -184,11 +186,13 @@ data_types: type: string required: true min_requested_additional_capability_version: - description: Identifies the minimum version of the requested additional capability. + description: >- + Identifies the minimum version of the requested additional capability. type: string required: false preferred_requested_additional_capability_version: - description: Identifies the preferred version of the requested additional capability. + description: >- + Identifies the preferred version of the requested additional capability. type: string required: false target_performance_parameters: @@ -206,12 +210,13 @@ data_types: specification: tosca-simple-nfv-1.0 specification_section: 5.3.7 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896061' - description: VirtualMemory describes virtual memory for a particular VDU. + description: >- + VirtualMemory describes virtual memory for a particular VDU. derived_from: tosca.datatypes.Root properties: virtual_mem_size: description: Amount of virtual memory. - type: scalar-unit.size # Number + type: scalar-unit.size required: true virtual_mem_oversubscription_policy: description: >- @@ -235,27 +240,33 @@ data_types: specification: tosca-simple-nfv-1.0 specification_section: 5.3.8 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896062' - description: VirtualMemory describes virtual memory for a particular VDU + description: >- + VirtualMemory describes virtual memory for a particular VDU. derived_from: tosca.datatypes.Root properties: cpu_architecture: - description: CPU architecture type. Examples are x86, ARM. + description: >- + CPU architecture type. Examples are x86, ARM. type: string required: false num_virtual_cpu: - description: Number of virtual CPUâs + description: >- + Number of virtual CPUs. type: integer required: true virtual_cpu_clock: - description: Minimum virtual CPU clock rate + description: >- + Minimum virtual CPU clock rate. type: scalar-unit.frequency required: false virtual_cpu_oversubscription_policy: - description: CPU core oversubscription policy + description: >- + CPU core oversubscription policy. type: string required: false virtual_cpu_pinning: - description: The virtual CPU pinning configuration for the virtualized compute resource. + description: >- + The virtual CPU pinning configuration for the virtualized compute resource. type: tosca.datatypes.nfv.VirtualCpuPinning required: false @@ -266,19 +277,21 @@ data_types: specification: tosca-simple-nfv-1.0 specification_section: 5.3.9 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896064' - description: VirtualCpuPinning describes CPU pinning configuration for a particular CPU. + description: >- + VirtualCpuPinning describes CPU pinning configuration for a particular CPU. derived_from: tosca.datatypes.Root properties: cpu_pinning_policy: - description: Indicates the policy for CPU pinning. - type: string # CpuPinningPolicy + description: >- + Indicates the policy for CPU pinning. + type: string constraints: - valid_values: [ static, dynamic ] required: false cpu_pinning_map: description: >- If cpuPinningPolicy is defined as "static", the cpuPinningMap provides the map of pinning - virtual CPU cores to physical CPU cores/threads + virtual CPU cores to physical CPU cores/threads. type: map entry_schema: type: string @@ -291,14 +304,14 @@ data_types: specification: tosca-simple-nfv-1.0 specification_section: 5.3.10 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896065' - description: VnfcConfigurableProperties describes additional configurable properties of a VNFC - # ARIA NOTE: the spec documentation states: "VnfcconfigurableProperties describes - # VirtualCpuPinning describes additional configurable properties of a VNFC". - # I took the liberty of changing this to a more comprehensible sentence. + # ARIA NOTE: description is mangled in spec + description: >- + VnfcConfigurableProperties describes additional configurable properties of a VNFC. derived_from: tosca.datatypes.Root properties: additional_vnfc_configurable_properties: - description: Described additional configuration for VNFC + description: >- + Describes additional configuration for VNFC. type: map entry_schema: type: string http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/692f6129/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml index bef9cf2..4faf64e 100644 --- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml +++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml @@ -29,11 +29,13 @@ node_types: derived_from: tosca.nodes.Compute properties: name: - description: Human readable name of the Vdu + description: >- + Human readable name of the VDU. type: string required: true description: - description: Human readable description of the Vdu + description: >- + Human readable description of the VDU. type: string required: true boot_order: @@ -42,13 +44,13 @@ node_types: The Value references a descriptor from which a valid boot device is created e.g. VirtualStorageDescriptor from which a VirtualStorage instance is created. If no boot order is defined the default boot order defined in the VIM or NFVI shall be used. - type: list # explicit index (boot index) not necessary, contrary to IFA011 + type: list # ARIA NOTE: an explicit index (boot index) is unnecessary, contrary to IFA011 entry_schema: type: string required: false nfvi_constraints: description: >- - Describes constraints on the NFVI for the VNFC instance(s) created from this Vdu. + Describes constraints on the NFVI for the VNFC instance(s) created from this VDU. For example, aspects of a secure hosting environment for the VNFC instance that involve additional entities or processes. More software images can be attached to the virtualization container using virtual_storage. @@ -57,15 +59,16 @@ node_types: type: string required: false configurable_properties: - description: Describes the configurable properties of all VNFC instances based on this VDU. + description: >- + Describes the configurable properties of all VNFC instances based on this VDU. type: map entry_schema: type: tosca.datatypes.nfv.VnfcConfigurableProperties required: true attributes: - # ARIA NOTE: The attributes are only described in section [5.9.2.5 Definition], but are not - # mentioned in section [5.9.2.2 Attributes]. They are inherited from tosca.nodes.Compute. - # In addition, I added a 'type' field to every one of them, so their TOSCA syntax will be valid. + # ARIA NOTE: The attributes are only described in section [5.9.2.5 Definition], but are not + # mentioned in section [5.9.2.2 Attributes]. Additionally, it does not seem to make sense to + # deprecate inherited attributes, as it breaks the inheritence contract. private_address: type: string status: deprecated @@ -83,100 +86,37 @@ node_types: type: tosca.datatypes.network.PortInfo status: deprecated capabilities: - # ARIA NOTE: I commented out the virtual_storage capability as tosca.capabilities.nfv.VirtualStorage - # does not exist in csd04. csd04 even states: - # "Editor Note: Need to create tosca.capabilities.nfv.VirtualStorage capability type." virtual_compute: - description: Describes virtual compute resources capabilities. + description: >- + Describes virtual compute resources capabilities. type: tosca.capabilities.nfv.VirtualCompute virtual_binding: - description: Defines ability of VirtualBindable + description: >- + Defines ability of VirtualBindable. type: tosca.capabilities.nfv.VirtualBindable - - # ARIA NOTE: the "monitoring_parameter" capability is already commented out in the spec, and - # is copied here verbatim from section [5.9.2.5 Definition]. - # However, in section [5.9.2.4 Capabilities], the type of this capability is - # tosca.capabilities.nfv.Metric, and it also has a description. - # In addition, the spec might be wrong here regarding the name of this capability, since a - # very similar capability exists in section [5.9.6 tosca.nodes.nfv.VnfVirtualLinkDesc] and is - # named "monitoring_parameters" (as opposed to "monitoring_parameter" in here) - - #monitoring_parameter: - # modeled as ad hoc (named) capabilities in VDU node template - # for example: - #capabilities: - # cpu_load: tosca.capabilities.nfv.Metric - # memory_usage: tosca.capabilities.nfv.Metric - - # ARIA NOTE: The capabilities 'host', 'endpoint', 'os', 'scalable', 'binding' are only - # described in section [5.9.2.5 Definition], but are not mentioned in section - # [5.9.2.4 Capabilities] they are inherited from tosca.nodes.Compute. - - host: #Editor note: FFS. How this capabilities should be used in NFV Profile - type: tosca.capabilities.Container - valid_source_types: [tosca.nodes.SoftwareComponent] - occurrences: [ 0, UNBOUNDED ] - endpoint: - # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one. - # In addition, I commented out the 'occurrences' field since its value is not valid. I'm - # guessing it was just csd04's way of saying that this requirement is deprecated. But I'm not - # sure if this is the best way to do it. - type: tosca.capabilities.Endpoint.Admin - # occurrences: [ 0, 0 ] - os: - # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one. - # In addition I commented out the 'occurrences' field since its value is not valid. I'm - # guessing it was just csd04's way of saying that this requirement is deprecated. But I'm not - # sure if this is the best way to do it. - type: tosca.capabilities.OperatingSystem - # occurrences: [ 0, 0 ] - scalable: #Editor note: FFS. How this capabilities should be used in NFV Profile - type: tosca.capabilities.Scalable - binding: - # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one. - type: tosca.capabilities.network.Bindable - occurrences: [ 0, UNBOUNDED ] - requirements: - # ARIA NOTE: I commented out the virtual_storage requirement as both - # tosca.capabilities.nfv.VirtualStorage and tosca.relationships.nfv.VDU.AttachedTo - # do not exist in csd04. -# - virtual_storage: -# capability: tosca.capabilities.nfv.VirtualStorage -# relationship: tosca.relationships.nfv.VDU.AttachedTo -# node: tosca.nodes.nfv.VDU.VirtualStorage -# occurrences: [ 0, UNBOUNDED ] - - local_storage: #For NFV Profile, this requirement is deprecated. - # ARIA NOTE: I added 'capability', 'node' and 'relationship' fields to to this requirement - # to make it valid TOSCA, even though it is 'deprecated' according to csd04. - # In Addition, I commented out the 'occurrences' field since its value is not valid. I'm - # guessing it was just csd04's way of saying that this requirement is deprecated. But I'm - # not sure if this is the best way to do it. - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - # occurrences: [ 0,0 ] + monitoring_parameter: + # ARIA NOTE: commented out in 5.9.2.5 + description: >- + Monitoring parameter, which can be tracked for a VNFC based on this VDU. Examples include: + memory-consumption, CPU-utilisation, bandwidth-consumption, VNFC downtime, etc. + type: tosca.capabilities.nfv.Metric + #requirements: + # ARIA NOTE: virtual_storage is TBD + + # ARIA NOTE: csd04 attempts to deprecate the inherited local_storage requirement, but this + # is not possible in TOSCA artifacts: - # ARIA NOTE: in csd04 the artifacts are described as a list, but in TOSCA they are defined as a - # map sw_image: description: >- Describes the software image which is directly loaded on the virtualization container realizing this virtual storage. file: # ARIA NOTE: missing value even though it is required in TOSCA type: tosca.artifacts.nfv.SwImage - # ARIA NOTE: this description is exactly the same as the description of the artifact of the - # same name of tosca.nodes.nfv.VDU.VirtualStorage. While the description seems fitting there - # here it seems it should mention something in the lines of "realizing this compute node", - # and not "realizing this virtual storage" tosca.nodes.nfv.VDU.VirtualStorage: _extensions: - shorthand_name: VirtualStorage - # ARIA NOTE: inconsistent with tosca.nodes.nfv.VDU.VirtualStorage's shorthand_name, - # which is VDU.Compute - type_qualified_name: tosca:VirtualStorage - # ARIA NOTE: inconsistent with tosca.nodes.nfv.VDU.VirtualStorage's type_qualified_name, - # which is tosca:VDU.Compute + shorthand_name: VirtualStorage # ARIA NOTE: seems wrong in spec + type_qualified_name: tosca:VirtualStorage # ARIA NOTE: seems wrong in spec specification: tosca-simple-nfv-1.0 specification_section: 5.9.3 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896080' @@ -186,43 +126,27 @@ node_types: [ETSI NFV IFA011]. derived_from: tosca.nodes.Root properties: - # ARIA NOTE: the "id" property is already commented out in the spec, and is copied here - # verbatim from section [5.9.3.5 Definition]. In section [5.9.3.1 Properties], this property - # does not have a type and a required values, but does have a description - #id: - # node name type_of_storage: - description: Type of virtualized storage resource + description: >- + Type of virtualized storage resource. type: string required: true size_of_storage: - description: Size of virtualized storage resource (in GB) - # ARIA NOTE: if the description states that the property assignment should be in GB, why - # does the type is 'scalar-unit.size' and not just integer? In addition, why does section - # [5.9.3.1 Properties] states in the constraints column of this attribute that the value - # should be a number? + description: >- + Size of virtualized storage resource (in GB). type: scalar-unit.size required: true rdma_enabled: - description: Indicate if the storage support RDMA + description: >- + Indicate if the storage support RDMA. type: boolean required: false -# capabilities: -# ARIA NOTE: I commented out the virtual_storage capability as tosca.capabilities.nfv.VirtualStorage -# does not exist in csd04. csd04 even states: -# "Editor Note: Need to create tosca.capabilities.nfv.VirtualStorage capability type." -# Since it is the only capability, I actually needed to comment out the whole 'capabilities' -# section. -# virtual_storage: -# type: tosca.capabilities.nfv.VirtualStorage artifacts: - # ARIA NOTE: in csd04 the artifacts are described as a list, but in TOSCA they are defined as a - # map sw_image: description: >- - Describes the software image which is directly loaded on the virtualization - container realizing this virtual storage. - file: # ARIA NOTE: missing value even though it is required in TOSCA + Describes the software image which is directly loaded on the virtualization container + realizing this virtual storage. + file: '' # ARIA NOTE: missing in spec type: tosca.artifacts.nfv.SwImage tosca.nodes.nfv.Cpd: @@ -238,7 +162,8 @@ node_types: derived_from: tosca.nodes.Root properties: layer_protocol: - description: Identifies which protocol the connection point uses for connectivity purposes + description: >- + Identifies which protocol the connection point uses for connectivity purposes. type: string constraints: - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ] @@ -246,8 +171,8 @@ node_types: role: # Name in ETSI NFV IFA011 v0.7.3 cpRole description: >- Identifies the role of the port in the context of the traffic flow patterns in the VNF or - parent NS. For example a VNF with a tree flow pattern within the VNF will have legal cpRoles - of ROOT and LEAF + parent NS. For example a VNF with a tree flow pattern within the VNF will have legal + cpRoles of ROOT and LEAF. type: string constraints: - valid_values: [ root, leaf ] @@ -281,7 +206,8 @@ node_types: derived_from: tosca.nodes.nfv.Cpd properties: bitrate_requirement: - description: Bitrate requirement on this connection point. + description: >- + Bitrate requirement on this connection point. type: integer required: false virtual_network_interface_requirements: @@ -293,9 +219,7 @@ node_types: type: VirtualNetworkInterfaceRequirements required: false requirements: - # ARIA NOTE: the capability type and the relationship type of this capability were part of the - # NSD profile (section 11 in csd03), and were removed in csd04. It seems that they forgot to - # edit some places who reference it. so I'm commenting out this requirement. + # ARIA NOTE: seems to be a leftover from csd03 # - virtual_link: # description: Describes the requirements for linking to virtual link # capability: tosca.capabilities.nfv.VirtualLinkable @@ -304,11 +228,7 @@ node_types: - virtual_binding: capability: tosca.capabilities.nfv.VirtualBindable relationship: tosca.relationships.nfv.VirtualBindsTo - node: tosca.nodes.nfv.VDU.Compute - # ARIA NOTE: the spec states "node: tosca.nodes.nfv.VDU", but this is probably a mistake - # as tosca.nodes.nfv.VDU was removed, and replaced with tosca.nodes.nfv.VDU.Compute and - # tosca.nodes.nfv.VDU.VirtualStorage. I choose to use tosca.nodes.nfv.VDU.Compute, but it - # can be changed upon discussion. + node: tosca.nodes.nfv.VDU.Compute # ARIA NOTE: seems wrong in spec tosca.nodes.nfv.VnfVirtualLinkDesc: _extensions: @@ -324,43 +244,17 @@ node_types: properties: connectivity_type: description: >- - specifies the protocol exposed by the VL and the flow pattern supported by the VL + specifies the protocol exposed by the VL and the flow pattern supported by the VL. type: tosca.datatypes.nfv.ConnectivityType required: true description: description: >- - provides human-readable information on the purpose of the VL (e.g. control plane traffic) + Provides human-readable information on the purpose of the VL (e.g. control plane traffic). type: string required: false test_access: description: >- Test access facilities available on the VL (e.g. none, passive, monitoring, or active - (intrusive) loopbacks at endpoints + (intrusive) loopbacks at endpoints. type: string required: false - # ARIA NOTE: I commented out the "vl_flavours" property as it references the data type - # tosca.datatypes.nfv.VlFlavour, which does not exist in csd04 (it is only mentioned in section - # 5.9.6.4 as TBD) - #vl_flavours: - # description: Describe a specific flavour of the VL with specific bitrate requirements. - # type: map - # entry_schema: - # type: tosca.datatypes.nfv.VlFlavour - # required: true - # capabilities: - # virtual_linkable: - # ARIA NOTE this capability type was part of the NSD profile (section 11 in csd03), and was - # removed in csd04. It seems that they forgot to edit some places who reference it. so I'm - # commenting out this whole section. - # type: tosca.capabilities.nfv.VirtualLinkable - - # ARIA NOTE: the "monitoring_parameters" capability is already commented out in the spec, and - # is copied here verbatim from section [5.9.6.5 Definition]. - # However, in section [5.9.6.4 Capabilities], the type of this capability is - # tosca.capabilities.nfv.Metric, and it also has a description. - # In addition, the spec might be wrong here regarding the name of this capability, since a - # very similar capability exists in section [5.9.2 tosca.nodes.nfv.VDU.Compute] and is - # named "monitoring_parameter" (as opposed to "monitoring_parameters" in here) - - # monitoring_parameters: - # modeled as ad hoc (named) capabilities in node template http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/692f6129/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml ---------------------------------------------------------------------- diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml index 6cf0f6e..4cf99a2 100644 --- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml +++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/relationships.yaml @@ -27,6 +27,8 @@ relationship_types: derived_from: tosca.relationships.DependsOn valid_target_types: [ tosca.capabilities.nfv.VirtualBindable ] + # ARIA NOTE: csd04 lacks the definition of tosca.relationships.nfv.Monitor (the derived_from and + # valid_target_types), so we are using the definition in csd03 section 8.4.2. tosca.relationships.nfv.Monitor: _extensions: shorthand_name: Monitor @@ -35,9 +37,7 @@ relationship_types: specification_section: 5.7.2 specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896075' description: >- - This relationship type represents an association relationship to the Metric capability of VDU node types. + This relationship type represents an association relationship to the Metric capability of VDU + node types. derived_from: tosca.relationships.ConnectsTo valid_target_types: [ tosca.capabilities.nfv.Metric ] - # ARIA NOTE: csd04 lacks the definition of tosca.relationships.nfv.Monitor (the derived_from and - # valid_target_types). It took the liberty of copying their values from csd03 as I feel they - # just got lost in an extensive cut-and-paste session that took place between csd03 and csd04.