You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by av...@apache.org on 2017/06/07 20:01:59 UTC
[01/13] incubator-ariatosca git commit: ARIA-213 sporadic tests
failures over locked database issue [Forced Update!]
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-275-update-NFV-profile-to-csd04 5e8044d4b -> 9240e20ec (forced update)
ARIA-213 sporadic tests failures over locked database issue
Increased the timeout for acquiring database lock (for sqlite based db).
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/cd830731
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/cd830731
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/cd830731
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: cd830731bff21e836b5e661623b269aa40f92f52
Parents: 180e0a1
Author: max-orlov <ma...@gigaspaces.com>
Authored: Tue Jun 6 17:05:21 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Wed Jun 7 17:21:01 2017 +0300
----------------------------------------------------------------------
aria/storage/sql_mapi.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/cd830731/aria/storage/sql_mapi.py
----------------------------------------------------------------------
diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py
index 4d7e233..bb6223a 100644
--- a/aria/storage/sql_mapi.py
+++ b/aria/storage/sql_mapi.py
@@ -405,7 +405,8 @@ def init_storage(base_dir, filename='db.sqlite'):
path=os.path.join(base_dir, filename))
- engine = create_engine(uri)
+ engine = create_engine(uri, connect_args=dict(timeout=15))
+
session_factory = orm.sessionmaker(bind=engine)
session = orm.scoped_session(session_factory=session_factory)
[07/13] incubator-ariatosca git commit: Fixed WD04,
Rev02 (2016-9-6) and WD04, Rev03 (2016-11-7)
Posted by av...@apache.org.
Fixed WD04, Rev02 (2016-9-6) and WD04, Rev03 (2016-11-7)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/bb8c4af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/bb8c4af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/bb8c4af4
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: bb8c4af454a505b33b1942adc2e6af09b7bfca4e
Parents: 422a95b
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Mon Jun 5 16:21:19 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../profiles/tosca-simple-nfv-1.0/data.yaml | 289 +++++++++++++++++++
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 240 +++++++++++----
2 files changed, 473 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bb8c4af4/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 89e3565..f6a07ef 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
@@ -15,6 +15,295 @@
data_types:
+ tosca.datatypes.nfv.L2AddressData:
+ _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:
+ shorthand_name: L3AddressData
+ type_qualified_name: tosca:L3AddressData
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.3.2
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896056'
+ description: >-
+ The L3AddressData type is a complex TOSCA data type used to describe L3AddressData information
+ element as defined in [ETSI GS NFV-IFA 011], it provides the information on the IP addresses
+ to be assigned to the connection point instantiated from the parent Connection Point
+ Descriptor.
+ derived_from: tosca.datatypes.Root
+ properties:
+ ip_address_assignment:
+ description: >-
+ Specify if the address assignment is the responsibility of management and orchestration
+ function or not. If it is set to True, it is the management and orchestration function
+ responsibility.
+ type: boolean
+ required: true
+ floating_ip_activated:
+ description: Specify if the floating IP scheme is activated on the Connection Point or not.
+ type: boolean
+ required: true
+ 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
+ type: string
+ required: false
+ constraints:
+ - valid_values: [ ipv4, ipv6 ]
+ number_of_ip_address:
+ description: Minimum number of IP addresses to be assigned.
+ type: integer
+ required: false
+
+ tosca.datatypes.nfv.AddressData:
+ _extensions:
+ shorthand_name: AddressData
+ type_qualified_name: tosca:AddressData
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.3.3
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896057'
+ description: >-
+ The AddressData type is a complex TOSCA data type used to describe AddressData information
+ element as defined in [ETSI GS NFV-IFA 011], it provides information on the addresses to be
+ assigned to the connection point(s) instantiated from a Connection Point Descriptor.
+ derived_from: tosca.datatypes.Root
+ properties:
+ address_type:
+ description: >-
+ Describes the type of the address to be assigned to the connection point instantiated from
+ the parent Connection Point Descriptor. The content type shall be aligned with the address
+ type supported by the layerProtocol property of the parent Connection Point Descriptor.
+ type: string
+ required: true
+ constraints:
+ - valid_values: [ mac_address, ip_address ]
+ l2_address_data:
+ 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"
+ 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:
+ 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: states under the "constraints" column in the properties table:
+ # "Shall be present when the addressType is ip_address."
+
+ tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
+ _extensions:
+ shorthand_name: VirtualNetworkInterfaceRequirements
+ type_qualified_name: tosca:VirtualNetworkInterfaceRequirements
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.3.4
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896058'
+ description: >-
+ The VirtualNetworkInterfaceRequirements type is a complex TOSCA data type used to describe
+ VirtualNetworkInterfaceRequirements information element as defined in [ETSI GS NFV-IFA 011],
+ it provides the information to specify requirements on a virtual network interface realising the
+ CPs instantiated from this CPD.
+ derived_from: tosca.datatypes.Root
+ properties:
+ name:
+ description: Provides a human readable name for the requirement.
+ type: string
+ required: false
+ description:
+ description: Provides a human readable description for the requirement.
+ type: string
+ required: false
+ support_mandatory:
+ description: >-
+ Indicates whether fulfilling the constraint is mandatory (TRUE) for successful operation
+ or desirable (FALSE).
+ type: boolean
+ required: false
+ requirement:
+ 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"
+ required: true
+
+ tosca.datatypes.nfv.ConnectivityType:
+ _extensions:
+ shorthand_name: ConnectivityType
+ type_qualified_name: tosca:ConnectivityType
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.3.5
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896059'
+ description: >-
+ The TOSCA ConnectivityType type is a complex TOSCA data type used to describe ConnectivityType
+ information element as defined in [ETSI GS NFV-IFA 011].
+ derived_from: tosca.datatypes.Root
+ properties:
+ layer_protocol:
+ description: >-
+ Identifies the protocol this VL gives access to (ethernet, mpls, odu2, ipv4, ipv6,
+ pseudo_wire).
+ type: string
+ required: true
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
+ flow_pattern:
+ description: Identifies the flow pattern of the connectivity (Line, Tree, Mesh).
+ type: string
+ required: false
+
+ tosca.datatypes.nfv.RequestedAdditionalCapability:
+ _extensions:
+ shorthand_name: RequestedAdditionalCapability
+ type_qualified_name: tosca:RequestedAdditionalCapability
+ 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.
+ derived_from: tosca.datatype.Root
+ properties:
+ request_additional_capability_name:
+ description: Identifies a requested additional capability for the VDU.
+ type: string
+ required: true
+ support_mandatory:
+ description: >-
+ Indicates whether the requested additional capability is mandatory for successful
+ operation.
+ type: string
+ required: true
+ min_requested_additional_capability_version:
+ 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.
+ type: string
+ required: false
+ target_performance_parameters:
+ description: >-
+ Identifies specific attributes, dependent on the requested additional capability type.
+ type: map
+ entry_schema:
+ type: string
+ required: true
+
+ tosca.datatypes.nfv.VirtualMemory:
+ _extensions:
+ shorthand_name: VirtualMemory
+ type_qualified_name: tosca:VirtualMemory
+ 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.
+ derived_from: tosca.datatypes.Root
+ properties:
+ virtual_mem_size:
+ description: Amount of virtual memory.
+ type: scalar-unit.size # Number
+ required: true
+ virtual_mem_oversubscription_policy:
+ description: >-
+ The memory core oversubscription policy in terms of virtual memory to physical memory on
+ the platform. The cardinality can be 0 during the allocation request, if no particular
+ value is requested.
+ type: string
+ required: false
+ numa_enabled:
+ description: >-
+ It specifies the memory allocation to be cognisant of the relevant process/core
+ allocation. The cardinality can be 0 during the allocation request, if no particular value
+ is requested.
+ type: boolean
+ required: false
+
+ tosca.datatypes.nfv.VirtualCpu:
+ _extensions:
+ shorthand_name: VirtualCpu
+ type_qualified_name: tosca:VirtualCpu
+ 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
+ derived_from: tosca.datatypes.Root
+ properties:
+ cpu_architecture:
+ description: CPU architecture type. Examples are x86, ARM.
+ type: string
+ required: false
+ num_virtual_cpu:
+ description: Number of virtual CPU’s
+ type: integer
+ required: true
+ virtual_cpu_clock:
+ description: Minimum virtual CPU clock rate
+ type: scalar-unit.frequency
+ required: false
+ virtual_cpu_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.
+ type: tosca.datatypes.nfv.VirtualCpuPinning
+ required: false
+
+ tosca.datatypes.nfv.VirtualCpuPinning:
+ _extensions:
+ shorthand_name: VirtualCpuPinning
+ type_qualified_name: tosca:VirtualCpuPinning
+ 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.
+ derived_from: tosca.datatypes.Root
+ properties:
+ cpu_pinning_policy:
+ description: Indicates the policy for CPU pinning.
+ type: string # CpuPinningPolicy
+ 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
+ type: map
+ entry_schema:
+ type: string
+ required: false
+
+ tosca.datatypes.nfv.VnfcConfigurableProperties:
+ _extensions:
+ shorthand_name: VnfcconfigurableProperties
+ type_qualified_name: tosca:VnfcconfigurableProperties
+ 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.
+ derived_from: tosca.datatypes.Root
+ properties:
+ additional_vnfc_configurable_properties:
+ description: Described additional configuration for VNFC
+ type: map
+ entry_schema:
+ type: string
+ required: false
+
tosca.datatypes.compute.Container.Architecture.CPUAllocation:
_extensions:
shorthand_name: Container.Architecture.CPUAllocation # seems to be a mistake in the spec; the norm is to add a "Container.Architecture." prefix
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bb8c4af4/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 d2c11dc..e8ab50f 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
@@ -45,6 +45,134 @@ node_types:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
+ tosca.nodes.nfv.Cpd:
+ _extensions:
+ shorthand_name: Cpd
+ type_qualified_name: tosca:Cpd
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.9.4
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896081'
+ derived_from: tosca.nodes.Root
+ description: >-
+ The TOSCA nfv.Cpd node represents network connectivity to a compute resource or a VL as defined
+ by [ETSI GS NFV-IFA 011]. This is an abstract type used as parent for the various Cpd types.
+ derived_from: tosca.nodes.Root
+ properties:
+ layer_protocol:
+ description: Identifies which protocol the connection point uses for connectivity purposes
+ type: string
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
+ required: false
+ 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
+ type: string
+ constraints:
+ - valid_values: [ root, leaf ]
+ required: false
+ description:
+ description: >-
+ Provides human-readable information on the purpose of the connection point
+ (e.g. connection point for control plane traffic).
+ type: string
+ required: false
+ address_data:
+ description: >-
+ Provides information on the addresses to be assigned to the connection point(s) instantiated
+ from this Connection Point Descriptor.
+ type: list
+ entry_schema:
+ type: tosca.datatype.nfv.AddressData
+ required: false
+
+ tosca.nodes.nfv.VduCpd:
+ _extensions:
+ shorthand_name: VduCpd
+ type_qualified_name: tosca:VduCpd
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.9.5
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896082'
+ description: >-
+ The TOSCA nfv.VduCpd node type represents a type of TOSCA Cpd node and describes network
+ connectivity between a VNFC instance (based on this VDU) and an internal VL as defined by
+ [ETSI GS NFV-IFA 011].
+ derived_from: tosca.nodes.nfv.Cpd
+ properties:
+ bitrate_requirement:
+ description: Bitrate requirement on this connection point.
+ type: integer
+ required: false
+ virtual_network_interface_requirements:
+ description: >-
+ Specifies requirements on a virtual network interface realising the CPs instantiated from
+ this CPD.
+ type: list
+ entry_schema:
+ type: VirtualNetworkInterfaceRequirements
+ required: false
+ requirements:
+ - virtual_link:
+ description: Describes the requirements for linking to virtual link
+ capability: tosca.capabilities.nfv.VirtualLinkable
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+ node: tosca.nodes.nfv.VnfVirtualLinkDesc
+ - virtual_binding:
+ description: Describe the requirement for binding with VDU
+ capability: tosca.capabilities.nfv.VirtualBindable
+ relationship: tosca.relationships.nfv.VirtualBindsTo
+ node: tosca.nodes.nfv.VDU
+
+ VnfVirtualLinkDesc:
+ _extensions:
+ shorthand_name: VnfVirtualLinkDesc
+ type_qualified_name: tosca:VnfVirtualLinkDesc
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.9.6
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896083'
+ description: >-
+ The TOSCA nfv.VnfVirtualLinkDesc node type represents a logical internal virtual link as
+ defined by [ETSI GS NFV-IFA 011].
+ derived_from: tosca.nodes.Root
+ properties:
+ connectivity_type:
+ description: >-
+ 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)
+ 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
+ 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:
+ 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.
+
+ # monitoring_parameters:
+ # modeled as ad hoc (named) capabilities in node template
+
# tosca.nodes.nfv.VDU:
# _extensions:
# shorthand_name: VDU
@@ -63,43 +191,43 @@ node_types:
# monitoring_parameter:
# type: tosca.capabilities.nfv.Metric
- tosca.nodes.nfv.CP:
- _extensions:
- shorthand_name: CP
- type_qualified_name: tosca:CP
- specification: tosca-simple-nfv-1.0
- specification_section: 8.5.3
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290245'
- description: >-
- The NFV CP node represents a logical connection point entity as defined by [ETSI GS NFV-MAN 001 v1.1.1]. A connection point
- may be, for example, a virtual port, a virtual NIC address, a physical port, a physical NIC address or the endpoint of an IP
- VPN enabling network connectivity. It is assumed that each type of connection point will be modeled using subtypes of the CP
- type.
- derived_from: tosca.nodes.network.Port
- properties:
- type:
- description: >-
- This may be, for example, a virtual port, a virtual NIC address, a SR-IOV port, a physical port, a physical NIC address
- or the endpoint of an IP VPN enabling network connectivity.
- type: string
- anti_spoofing_protection:
- description: >-
- Indicates of whether anti-spoofing rule need to be enabled for this vNIC. This is applicable only when CP type is virtual
- NIC (vPort).
- type: boolean
- required: false
- attributes:
- address:
- description: >-
- The actual virtual NIC address that is been assigned when instantiating the connection point.
- type: string
- requirements:
- - virtual_link:
- capability: tosca.capabilities.nfv.VirtualLinkable
- relationship: tosca.relationships.nfv.VirtualLinksTo
- - virtual_binding:
- capability: tosca.capabilities.nfv.VirtualBindable
- relationship: tosca.relationships.nfv.VirtualBindsTo
+# tosca.nodes.nfv.CP:
+# _extensions:
+# shorthand_name: CP
+# type_qualified_name: tosca:CP
+# specification: tosca-simple-nfv-1.0
+# specification_section: 8.5.3
+# specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290245'
+# description: >-
+# The NFV CP node represents a logical connection point entity as defined by [ETSI GS NFV-MAN 001 v1.1.1]. A connection point
+# may be, for example, a virtual port, a virtual NIC address, a physical port, a physical NIC address or the endpoint of an IP
+# VPN enabling network connectivity. It is assumed that each type of connection point will be modeled using subtypes of the CP
+# type.
+# derived_from: tosca.nodes.network.Port
+# properties:
+# type:
+# description: >-
+# This may be, for example, a virtual port, a virtual NIC address, a SR-IOV port, a physical port, a physical NIC address
+# or the endpoint of an IP VPN enabling network connectivity.
+# type: string
+# anti_spoofing_protection:
+# description: >-
+# Indicates of whether anti-spoofing rule need to be enabled for this vNIC. This is applicable only when CP type is virtual
+# NIC (vPort).
+# type: boolean
+# required: false
+# attributes:
+# address:
+# description: >-
+# The actual virtual NIC address that is been assigned when instantiating the connection point.
+# type: string
+# requirements:
+# - virtual_link:
+# capability: tosca.capabilities.nfv.VirtualLinkable
+# relationship: tosca.relationships.nfv.VirtualLinksTo
+# - virtual_binding:
+# capability: tosca.capabilities.nfv.VirtualBindable
+# relationship: tosca.relationships.nfv.VirtualBindsTo
tosca.nodes.nfv.FP:
_extensions:
@@ -125,25 +253,25 @@ node_types:
# Virtual link
#
- tosca.nodes.nfv.VL:
- _extensions:
- shorthand_name: VL
- type_qualified_name: tosca:VL
- specification: tosca-simple-nfv-1.0
- specification_section: 9.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290251'
- description: >-
- The NFV VL node type represents a logical virtual link entity as defined by [ETSI GS NFV-MAN 001 v1.1.1]. It is the default
- type from which all other virtual link types derive.
- derived_from: tosca.nodes.network.Network
- properties:
- vendor:
- description: >-
- Vendor generating this VLD.
- type: string
- capabilities:
- virtual_linkable:
- type: tosca.capabilities.nfv.VirtualLinkable
+# tosca.nodes.nfv.VL:
+# _extensions:
+# shorthand_name: VL
+# type_qualified_name: tosca:VL
+# specification: tosca-simple-nfv-1.0
+# specification_section: 9.1
+# specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290251'
+# description: >-
+# The NFV VL node type represents a logical virtual link entity as defined by [ETSI GS NFV-MAN 001 v1.1.1]. It is the default
+# type from which all other virtual link types derive.
+# derived_from: tosca.nodes.network.Network
+# properties:
+# vendor:
+# description: >-
+# Vendor generating this VLD.
+# type: string
+# capabilities:
+# virtual_linkable:
+# type: tosca.capabilities.nfv.VirtualLinkable
tosca.nodes.nfv.VL.ELine:
_extensions:
[03/13] incubator-ariatosca git commit: Add
tosca.capabilites.nfv.VirtualCompute
Posted by av...@apache.org.
Add tosca.capabilites.nfv.VirtualCompute
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/0acb187a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/0acb187a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/0acb187a
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 0acb187ad2352d7bb3d85d3d41377a0553073459
Parents: 68c1b7a
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 00:39:54 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../tosca-simple-nfv-1.0/capabilities.yaml | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/0acb187a/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 375ba13..6f50f61 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
@@ -62,3 +62,29 @@ capability_types:
A node type that includes the VirtualLinkable capability indicates that it can be pointed by
tosca.relationships.nfv.VirtualLinksTo relationship type.
derived_from: tosca.capabilities.Node
+
+ tosca.capabilites.nfv.VirtualCompute:
+ _extensions:
+ shorthand_name: VirtualCompute
+ type_qualified_name: tosca:VirtualCompute
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.5.3
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896071'
+ derived_from: tosca.capabilities.Root
+ 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.
+ type: map
+ entry_schema:
+ type: tosca.datatypes.nfv.RequestedAdditionalCapability
+ required: false
+ virtual_memory:
+ 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.
+ type: tosca.datatypes.nfv.VirtualCpu
+ required: true
[10/13] incubator-ariatosca git commit: Add
tosca.nodes.nfv.VDU.Compute and tosca.nodes.nfv.VDU.VirtualStorage
Posted by av...@apache.org.
Add tosca.nodes.nfv.VDU.Compute and tosca.nodes.nfv.VDU.VirtualStorage
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/68c1b7ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/68c1b7ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/68c1b7ac
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 68c1b7acdf313cb2005279de67655074974fa598
Parents: f424164
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 00:30:13 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../profiles/tosca-simple-nfv-1.0/data.yaml | 2 +-
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 180 ++++++++++++++++++-
2 files changed, 176 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/68c1b7ac/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 cf35cba..cec230c 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
@@ -99,7 +99,7 @@ data_types:
instantiated from the parent Connection Point Descriptor.
type: tosca.datatypes.nfv.L3AddressData
required: false
- # ARIA NOTE: states under the "constraints" column in the properties table:
+ # 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:
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/68c1b7ac/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 d0ccadd..b123aab 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
@@ -15,6 +15,176 @@
node_types:
+ tosca.nodes.nfv.VDU.Compute:
+ _extensions:
+ shorthand_name: VDU.Compute
+ type_qualified_name: tosca:VDU.Compute
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.9.2
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896079'
+ description: >-
+ The TOSCA nfv.VDU.Compute node type represents the virtual compute part of a VDU entity which
+ it mainly describes the deployment and operational behavior of a VNF component (VNFC), as
+ defined by [ETSI NFV IFA011].
+ derived_from: tosca.nodes.Compute
+ properties:
+ name:
+ description: Human readable name of the Vdu
+ type: string
+ required: true
+ description:
+ description: Human readable description of the Vdu
+ type: string
+ required: true
+ boot_order:
+ description: >-
+ The key indicates the boot index (lowest index defines highest boot priority).
+ 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: type: # explicit index (boot index) not necessary, 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.
+ 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.
+ type: list
+ entry_schema:
+ type: string
+ required: false
+ configurable_properties:
+ 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.
+ private_address:
+ status: deprecated
+ public_address:
+ status: deprecated
+ networks:
+ status: deprecated
+ ports:
+ status: deprecated
+ capabilites:
+ virtual_compute:
+ description: Describes virtual compute resources capabilities.
+ type: tosca.capabilities.nfv.VirtualCompute
+ virtual_binding:
+ 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
+
+ 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
+ occurrences: [ 0,0 ]
+ os: # ARIA NOTE: lacks type in contrast with the TOSCA spec
+ 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
+ occurrences: [0,UNBOUNDED]
+ # ARIA NOTE: The aforementioned two capabilities ('host' and 'scalable') 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.
+ requirements:
+ - virtual_storage:
+ capability: tosca.capabilities.nfv.VirtualStorage
+ # ARIA NOTE: the above capability type does not exist in csd04...
+ relationship: tosca.relationships.nfv.VDU.AttachedTo
+ # ARIA NOTE: the above relationship type does not exist in csd04...
+ node: tosca.nodes.nfv.VDU.VirtualStorage
+ occurences: [ 0, UNBOUNDED ]
+ - local_storage: #For NFV Profile, this requirement is deprecated.
+ occurrences: [0,0]
+ # ARIA NOTE: what to do with this capability?
+ artifacts:
+ - 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
+ 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'
+ description: >-
+ The NFV VirtualStorage node type represents a virtual storage entity which it describes the
+ deployment and operational behavior of a virtual storage resources, as defined by
+ [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
+ 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?
+ type: scalar-unit.size
+ required: true
+ rdma_enabled:
+ description: Indicate if the storage support RDMA
+ type: boolean
+ required: false
+ capabilities:
+ virtual_storage:
+ type: tosca.capabilities.nfv.VirtualStorage
+ # ARIA NOTE: the above capability type does not exist in csd04. csd04 even states:
+ # "Editor Note: Need to create tosca.capabilities.nfv.VirtualStorage capability type."
+ artifacts:
+ - 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
+
tosca.nodes.nfv.Cpd:
_extensions:
shorthand_name: Cpd
@@ -99,7 +269,7 @@ node_types:
# tosca.nodes.nfv.VDU.VirtualStorage. I choose to use tosca.nodes.nfv.VDU.Compute, but it
# can be changed upon discussion.
- VnfVirtualLinkDesc:
+ tosca.nodes.nfv.VnfVirtualLinkDesc:
_extensions:
shorthand_name: VnfVirtualLinkDesc
type_qualified_name: tosca:VnfVirtualLinkDesc
@@ -139,10 +309,14 @@ node_types:
capabilities:
virtual_linkable:
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
@@ -167,10 +341,6 @@ node_types:
- forwarder:
capability: tosca.capabilities.nfv.Forwarder
- #
- # Virtual link
- #
-
tosca.nodes.nfv.VL.ELine:
_extensions:
shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec
[11/13] incubator-ariatosca git commit: Removed the virtual link (VL)
node types, as they do not appear in csd04
Posted by av...@apache.org.
Removed the virtual link (VL) node types, as they do not appear in csd04
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/c80c5f6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/c80c5f6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/c80c5f6e
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: c80c5f6ee9447097d644b342362738ab5df277b0
Parents: f9bffe4
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 00:50:47 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 109 ++++++-------------
1 file changed, 35 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/c80c5f6e/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 5bd002d..2e1b634 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
@@ -192,41 +192,41 @@ node_types:
specification: tosca-simple-nfv-1.0
specification_section: 5.9.4
specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896081'
- derived_from: tosca.nodes.Root
- description: >-
- The TOSCA nfv.Cpd node represents network connectivity to a compute resource or a VL as defined
- by [ETSI GS NFV-IFA 011]. This is an abstract type used as parent for the various Cpd types.
- derived_from: tosca.nodes.Root
- properties:
- layer_protocol:
- description: Identifies which protocol the connection point uses for connectivity purposes
- type: string
- constraints:
- - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
- required: false
- 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
- type: string
- constraints:
- - valid_values: [ root, leaf ]
- required: false
- description:
- description: >-
- Provides human-readable information on the purpose of the connection point
- (e.g. connection point for control plane traffic).
- type: string
- required: false
- address_data:
- description: >-
- Provides information on the addresses to be assigned to the connection point(s) instantiated
- from this Connection Point Descriptor.
- type: list
- entry_schema:
- type: tosca.datatype.nfv.AddressData
- required: false
+ derived_from: tosca.nodes.Root
+ description: >-
+ The TOSCA nfv.Cpd node represents network connectivity to a compute resource or a VL as defined
+ by [ETSI GS NFV-IFA 011]. This is an abstract type used as parent for the various Cpd types.
+
+ properties:
+ layer_protocol:
+ description: Identifies which protocol the connection point uses for connectivity purposes
+ type: string
+ constraints:
+ - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]
+ required: false
+ 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
+ type: string
+ constraints:
+ - valid_values: [ root, leaf ]
+ required: false
+ description:
+ description: >-
+ Provides human-readable information on the purpose of the connection point
+ (e.g. connection point for control plane traffic).
+ type: string
+ required: false
+ address_data:
+ description: >-
+ Provides information on the addresses to be assigned to the connection point(s) instantiated
+ from this Connection Point Descriptor.
+ type: list
+ entry_schema:
+ type: tosca.datatype.nfv.AddressData
+ required: false
tosca.nodes.nfv.VduCpd:
_extensions:
@@ -320,42 +320,3 @@ node_types:
# monitoring_parameters:
# modeled as ad hoc (named) capabilities in node template
-
- tosca.nodes.nfv.VL.ELine:
- _extensions:
- shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec
- type_qualified_name: tosca:VL.ELine
- specification: tosca-simple-nfv-1.0
- specification_section: 9.2
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290256'
- description: >-
- The NFV VL.ELine node represents an E-Line virtual link entity.
- derived_from: tosca.nodes.nfv.VL
- capabilities:
- virtual_linkable:
- type: tosca.capabilities.nfv.VirtualLinkable
- occurrences: [ 2, 2 ] # ARIA NOTE: section 3.2.3.1 states that the upper bound must be
- # higher than the lower bound, but section 3.6.2.1 uses a range with
- # equal bounds
-
- tosca.nodes.nfv.VL.ELAN:
- _extensions:
- shorthand_name: VL.ELAN # ARIA NOTE: omitted in the spec
- type_qualified_name: tosca:VL.ELAN
- specification: tosca-simple-nfv-1.0
- specification_section: 9.3
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290257'
- description: >-
- The NFV VL.ELan node represents an E-LAN virtual link entity.
- derived_from: tosca.nodes.network.Network
-
- tosca.nodes.nfv.VL.ETree:
- _extensions:
- shorthand_name: VL.ETree # ARIA NOTE: omitted in the spec
- type_qualified_name: tosca:VL.ETree
- specification: tosca-simple-nfv-1.0
- specification_section: 9.4
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290258'
- description: >-
- The NFV VL.ETree node represents an E-Tree virtual link entity.
- derived_from: tosca.nodes.nfv.VL
[05/13] incubator-ariatosca git commit: Remove tosca.nodes.nfv.FP,
as it does not appear in csd04
Posted by av...@apache.org.
Remove tosca.nodes.nfv.FP, as it does not appear in csd04
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f9bffe46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f9bffe46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f9bffe46
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: f9bffe46e413b4824a5746ab8a02bacbb16e81c3
Parents: 0acb187
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 00:45:31 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f9bffe46/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 b123aab..5bd002d 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
@@ -321,26 +321,6 @@ node_types:
# monitoring_parameters:
# modeled as ad hoc (named) capabilities in node template
- tosca.nodes.nfv.FP:
- _extensions:
- shorthand_name: FP # ARIA NOTE: the spec must be mistaken here, says "VL"
- type_qualified_name: tosca:FP
- specification: tosca-simple-nfv-1.0
- specification_section: 10.5.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714722'
- description: >-
- The NFV FP node type represents a logical network forwarding path entity as defined by [ETSI GS NFV-MAN 001 v1.1.1].
- derived_from: tosca.nodes.Root
- properties:
- policy:
- description: >-
- A policy or rule to apply to the NFP
- type: string
- required: false
- requirements:
- - forwarder:
- capability: tosca.capabilities.nfv.Forwarder
-
tosca.nodes.nfv.VL.ELine:
_extensions:
shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec
[04/13] incubator-ariatosca git commit: Remove two capability types
Posted by av...@apache.org.
Remove two capability types
- tosca.capabilities.nfv.Forwarder
- tosca.capabilities.nfv.VirtualLinkable
They are not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
The second capability was a part of the NSD model.
The first capability was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/923787f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/923787f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/923787f7
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 923787f7be27742febbf1dbab183fac85c79f61c
Parents: 325ae1e
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 01:26:08 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../tosca-simple-nfv-1.0/capabilities.yaml | 32 +++-----------------
1 file changed, 4 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/923787f7/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 6f50f61..db6a62b 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
@@ -20,8 +20,8 @@ capability_types:
shorthand_name: VirtualBindable
type_qualified_name: tosca:VirtualBindable
specification: tosca-simple-nfv-1.0
- specification_section: 8.2.2
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290220'
+ specification_section: 5.5.1
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896069'
description: >-
A node type that includes the VirtualBindable capability indicates that it can be pointed by
tosca.relationships.nfv.VirtualBindsTo relationship type.
@@ -32,37 +32,13 @@ capability_types:
shorthand_name: Metric
type_qualified_name: tosca:Metric
specification: tosca-simple-nfv-1.0
- specification_section: 8.2.3
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc418607874'
+ specification_section: 5.5.2
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896070'
description: >-
A node type that includes the Metric capability indicates that it can be monitored using an nfv.relationships.Monitor
relationship type.
derived_from: tosca.capabilities.Endpoint
- tosca.capabilities.nfv.Forwarder:
- _extensions:
- shorthand_name: Forwarder
- type_qualified_name: tosca:Forwarder
- specification: tosca-simple-nfv-1.0
- specification_section: 10.3.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714718'
- description: >-
- A node type that includes the Forwarder capability indicates that it can be pointed by tosca.relationships.nfv.FowardsTo
- relationship type.
- derived_from: tosca.capabilities.Root
-
- tosca.capabilities.nfv.VirtualLinkable:
- _extensions:
- shorthand_name: VirtualLinkable
- type_qualified_name: tosca:VirtualLinkable
- specification: tosca-simple-nfv-1.0
- specification_section: 11.3.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714735'
- description: >-
- A node type that includes the VirtualLinkable capability indicates that it can be pointed by
- tosca.relationships.nfv.VirtualLinksTo relationship type.
- derived_from: tosca.capabilities.Node
-
tosca.capabilites.nfv.VirtualCompute:
_extensions:
shorthand_name: VirtualCompute
[13/13] incubator-ariatosca git commit: remove two relationship types
Posted by av...@apache.org.
remove two relationship types
- tosca.relationships.nfv.ForwardsTo
- tosca.relationships.nfv.VirtualLinksTo
They are not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
The second relationship was a part of the NSD model.
The first relationship was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/325ae1e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/325ae1e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/325ae1e0
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 325ae1e0ab41767a6e78492aebb59ea7207e2e56
Parents: c80c5f6
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 01:05:13 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../tosca-simple-nfv-1.0/relationships.yaml | 35 ++++----------------
1 file changed, 7 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/325ae1e0/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 b745735..6cf0f6e 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
@@ -20,8 +20,8 @@ relationship_types:
shorthand_name: VirtualBindsTo
type_qualified_name: tosca:VirtualBindsTo
specification: tosca-simple-nfv-1.0
- specification_section: 8.4.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290234'
+ specification_section: 5.7.1
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896074'
description: >-
This relationship type represents an association relationship between VDU and CP node types.
derived_from: tosca.relationships.DependsOn
@@ -32,33 +32,12 @@ relationship_types:
shorthand_name: Monitor
type_qualified_name: tosca:Monitor
specification: tosca-simple-nfv-1.0
- specification_section: 8.4.2
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc418607880'
+ 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.
derived_from: tosca.relationships.ConnectsTo
valid_target_types: [ tosca.capabilities.nfv.Metric ]
-
- tosca.relationships.nfv.ForwardsTo:
- _extensions:
- shorthand_name: ForwardsTo
- type_qualified_name: tosca:ForwardsTo
- specification: tosca-simple-nfv-1.0
- specification_section: 10.4.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714720'
- description: >-
- This relationship type represents a traffic flow between two connection point node types.
- derived_from: tosca.relationships.Root
- valid_target_types: [ tosca.capabilities.nfv.Forwarder ]
-
- tosca.relationships.nfv.VirtualLinksTo:
- _extensions:
- shorthand_name: VirtualLinksTo
- type_qualified_name: tosca:VirtualLinksTo
- specification: tosca-simple-nfv-1.0
- specification_section: 11.4.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714737'
- description: >-
- This relationship type represents an association relationship between VNFs and VL node types.
- derived_from: tosca.relationships.DependsOn
- valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
+ # 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.
[09/13] incubator-ariatosca git commit: Address more non-consistent
issues of csd04
Posted by av...@apache.org.
Address more non-consistent issues of csd04
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/9240e20e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/9240e20e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/9240e20e
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 9240e20ec7442c1d47f94fd6c40ddddfb5260f7b
Parents: 49cb98d
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 22:32:02 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../tosca-simple-nfv-1.0/artifacts.yaml | 76 +++++++
.../tosca-simple-nfv-1.0/capabilities.yaml | 2 +-
.../profiles/tosca-simple-nfv-1.0/data.yaml | 2 +-
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 206 +++++++++++--------
.../tosca-simple-nfv-1.0.yaml | 1 +
5 files changed, 204 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9240e20e/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
new file mode 100644
index 0000000..2e68f57
--- /dev/null
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/artifacts.yaml
@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+artifact_types:
+ tosca.artifacts.nfv.SwImage:
+ _extensions:
+ shorthand_name: SwImage
+ type_qualified_name: tosca:SwImage
+ specification: tosca-simple-nfv-1.0
+ specification_section: 5.4.1
+ specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896067'
+ derived_from: tosca.artifacts.Deployment.Image
+ properties:
+ name:
+ description: Name of this software image
+ type: string
+ required: true
+ version:
+ description: Version of this software image
+ type: string
+ required: true
+ checksum:
+ 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
+ type: string
+ required: true
+ disk_format:
+ 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.
+ type: scalar-unit.size
+ required: true
+ min_ram:
+ 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
+ type: scalar-unit.size
+ required: true
+ sw_image:
+ 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.
+ type: string
+ required: false
+ supported _virtualization_enviroment:
+ description: >-
+ Identifies the virtualization environments (e.g. hypervisor) compatible with this software
+ image
+ type: list
+ entry_schema:
+ type: string
+ required: false
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9240e20e/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 db6a62b..5673dfd 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
@@ -39,7 +39,7 @@ capability_types:
relationship type.
derived_from: tosca.capabilities.Endpoint
- tosca.capabilites.nfv.VirtualCompute:
+ tosca.capabilities.nfv.VirtualCompute:
_extensions:
shorthand_name: VirtualCompute
type_qualified_name: tosca:VirtualCompute
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9240e20e/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 cec230c..17678bb 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
@@ -171,7 +171,7 @@ data_types:
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.
- derived_from: tosca.datatype.Root
+ derived_from: tosca.datatypes.Root
properties:
request_additional_capability_name:
description: Identifies a requested additional capability for the VDU.
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9240e20e/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 6d68190..bef9cf2 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
@@ -43,8 +43,8 @@ node_types:
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
- entry_schema:
- type: string
+ entry_schema:
+ type: string
required: false
nfvi_constraints:
description: >-
@@ -62,18 +62,30 @@ node_types:
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.
+ 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.
private_address:
+ type: string
status: deprecated
public_address:
+ type: string
status: deprecated
networks:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.NetworkInfo
status: deprecated
ports:
+ type: map
+ entry_schema:
+ type: tosca.datatypes.network.PortInfo
status: deprecated
- capabilites:
+ 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.
type: tosca.capabilities.nfv.VirtualCompute
@@ -96,43 +108,66 @@ node_types:
# 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
- occurrences: [ 0,0 ]
- os: # ARIA NOTE: lacks type in contrast with the TOSCA spec
- occurrences: [ 0,0 ]
+ 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
- occurrences: [0,UNBOUNDED]
- # ARIA NOTE: The aforementioned two capabilities ('host' and 'scalable') 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.
+ binding:
+ # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one.
+ type: tosca.capabilities.network.Bindable
+ occurrences: [ 0, UNBOUNDED ]
requirements:
- - virtual_storage:
- capability: tosca.capabilities.nfv.VirtualStorage
- # ARIA NOTE: the above capability type does not exist in csd04...
- relationship: tosca.relationships.nfv.VDU.AttachedTo
- # ARIA NOTE: the above relationship type does not exist in csd04...
- node: tosca.nodes.nfv.VDU.VirtualStorage
- occurences: [ 0, UNBOUNDED ]
+ # 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.
- occurrences: [0,0]
- # ARIA NOTE: what to do with this capability?
+ # 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 ]
artifacts:
- - 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"
+ # 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:
@@ -150,40 +185,45 @@ node_types:
deployment and operational behavior of a virtual storage resources, as defined by
[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
- 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?
- type: scalar-unit.size
- required: true
- rdma_enabled:
- description: Indicate if the storage support RDMA
- type: boolean
- required: false
- capabilities:
- virtual_storage:
- type: tosca.capabilities.nfv.VirtualStorage
- # ARIA NOTE: the above capability type does not exist in csd04. csd04 even states:
- # "Editor Note: Need to create tosca.capabilities.nfv.VirtualStorage capability type."
- artifacts:
- - 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
+ 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
+ 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?
+ type: scalar-unit.size
+ required: true
+ rdma_enabled:
+ 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
+ type: tosca.artifacts.nfv.SwImage
tosca.nodes.nfv.Cpd:
_extensions:
@@ -192,11 +232,10 @@ node_types:
specification: tosca-simple-nfv-1.0
specification_section: 5.9.4
specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd04/tosca-nfv-v1.0-csd04.html#_Toc482896081'
- derived_from: tosca.nodes.Root
description: >-
The TOSCA nfv.Cpd node represents network connectivity to a compute resource or a VL as defined
by [ETSI GS NFV-IFA 011]. This is an abstract type used as parent for the various Cpd types.
-
+ derived_from: tosca.nodes.Root
properties:
layer_protocol:
description: Identifies which protocol the connection point uses for connectivity purposes
@@ -225,7 +264,7 @@ node_types:
from this Connection Point Descriptor.
type: list
entry_schema:
- type: tosca.datatype.nfv.AddressData
+ type: tosca.datatypes.nfv.AddressData
required: false
tosca.nodes.nfv.VduCpd:
@@ -254,13 +293,15 @@ node_types:
type: VirtualNetworkInterfaceRequirements
required: false
requirements:
- - virtual_link:
- description: Describes the requirements for linking to virtual link
- capability: tosca.capabilities.nfv.VirtualLinkable
- relationship: tosca.relationships.nfv.VirtualLinksTo
- node: tosca.nodes.nfv.VnfVirtualLinkDesc
+ # 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.
+ # - virtual_link:
+ # description: Describes the requirements for linking to virtual link
+ # capability: tosca.capabilities.nfv.VirtualLinkable
+ # relationship: tosca.relationships.nfv.VirtualLinksTo
+ # node: tosca.nodes.nfv.VnfVirtualLinkDesc
- virtual_binding:
- description: Describe the requirement for binding with VDU
capability: tosca.capabilities.nfv.VirtualBindable
relationship: tosca.relationships.nfv.VirtualBindsTo
node: tosca.nodes.nfv.VDU.Compute
@@ -306,9 +347,12 @@ node_types:
# entry_schema:
# type: tosca.datatypes.nfv.VlFlavour
# required: true
- capabilities:
- virtual_linkable:
- type: tosca.capabilities.nfv.VirtualLinkable
+ # 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].
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/9240e20e/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
index e881b7e..764c739 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
@@ -14,6 +14,7 @@
# limitations under the License.
imports:
+ - artifacts.yaml
- capabilities.yaml
- data.yaml
- nodes.yaml
[12/13] incubator-ariatosca git commit: Remove tosca.groups.nfv.VNFFG
Posted by av...@apache.org.
Remove tosca.groups.nfv.VNFFG
It is not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
tosca.groups.nfv.VNFFG was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/49cb98de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/49cb98de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/49cb98de
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 49cb98de3bc2f1179fb6d287fc443867373f4dfa
Parents: 923787f
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Tue Jun 6 01:30:48 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../profiles/tosca-simple-nfv-1.0/groups.yaml | 56 --------------------
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 2 +-
.../tosca-simple-nfv-1.0.yaml | 1 -
3 files changed, 1 insertion(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/49cb98de/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml
deleted file mode 100644
index 5eb87c8..0000000
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/groups.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-group_types:
-
- tosca.groups.nfv.VNFFG:
- _extensions:
- shorthand_name: VNFFG # ARIA NOTE: the spec must be mistaken here, says "VL"
- type_qualified_name: tosca:VNFFG
- specification: tosca-simple-nfv-1.0
- specification_section: 10.6.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714727'
- description: >-
- The NFV VNFFG group type represents a logical VNF forwarding graph entity as defined by [ETSI GS NFV-MAN 001 v1.1.1].
- derived_from: tosca.groups.Root
- properties:
- vendor:
- description: >-
- Specify the vendor generating this VNFFG.
- type: string
- version:
- description: >-
- Specify the identifier (e.g. name), version, and description of service this VNFFG is describing.
- type: string
- number_of_endpoints:
- description: >-
- Count of the external endpoints included in this VNFFG, to form an index.
- type: integer
- dependent_virtual_link:
- description: >-
- Reference to a list of VLD used in this Forwarding Graph.
- type: list
- entry_schema: string
- connection_point:
- description: >-
- Reference to Connection Points forming the VNFFG.
- type: list
- entry_schema: string
- constituent_vnfs:
- description: >-
- Reference to a list of VNFD used in this VNF Forwarding Graph.
- type: list
- entry_schema: string
- members: [ tosca.nodes.nfv.FP ]
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/49cb98de/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 2e1b634..6d68190 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
@@ -42,7 +42,7 @@ 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: type: # explicit index (boot index) not necessary, contrary to IFA011
+ type: list # explicit index (boot index) not necessary, contrary to IFA011
entry_schema:
type: string
required: false
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/49cb98de/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
index 911ff3b..e881b7e 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/tosca-simple-nfv-1.0.yaml
@@ -16,6 +16,5 @@
imports:
- capabilities.yaml
- data.yaml
- - groups.yaml
- nodes.yaml
- relationships.yaml
[02/13] incubator-ariatosca git commit: ARIA-199 Add "services
outputs" CLI command
Posted by av...@apache.org.
ARIA-199 Add "services outputs" CLI command
* Also add an output to hello world example
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/5afa2f7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/5afa2f7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/5afa2f7f
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 5afa2f7fe11977593009b6da25733fa8dd61a1e9
Parents: cd83073
Author: Tal Liron <ta...@gmail.com>
Authored: Fri Jun 2 14:20:28 2017 -0500
Committer: Tal Liron <ta...@gmail.com>
Committed: Wed Jun 7 14:42:35 2017 -0500
----------------------------------------------------------------------
aria/cli/commands/services.py | 23 ++++++++---------
aria/modeling/models.py | 4 +--
examples/hello-world/helloworld.yaml | 16 ++++++++----
tests/cli/test_services.py | 26 ++++++++++++++++++--
tests/end2end/test_hello_world.py | 1 +
tests/mock/models.py | 21 ++++++++++------
.../node-cellar/node-cellar.yaml | 12 +++++++++
7 files changed, 76 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/aria/cli/commands/services.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/services.py b/aria/cli/commands/services.py
index 476387c..ae5895a 100644
--- a/aria/cli/commands/services.py
+++ b/aria/cli/commands/services.py
@@ -192,17 +192,16 @@ def outputs(service_name, model_storage, logger):
"""
logger.info('Showing outputs for service {0}...'.format(service_name))
service = model_storage.service.get_by_name(service_name)
- #TODO fix this section..
- outputs_def = service.outputs
- response = model_storage.service.outputs.get(service_name)
- outputs_ = StringIO()
- for output_name, output in response.outputs.iteritems():
- outputs_.write(' - "{0}":{1}'.format(output_name, os.linesep))
- description = outputs_def[output_name].get('description', '')
- outputs_.write(' Description: {0}{1}'.format(description,
- os.linesep))
- outputs_.write(' Value: {0}{1}'.format(output, os.linesep))
- logger.info(outputs_.getvalue())
+
+ if service.outputs:
+ outputs_string = StringIO()
+ for output_name, output in service.outputs.iteritems():
+ outputs_string.write(' - "{0}":{1}'.format(output_name, os.linesep))
+ outputs_string.write(' Description: {0}{1}'.format(output.description, os.linesep))
+ outputs_string.write(' Value: {0}{1}'.format(output.value, os.linesep))
+ logger.info(outputs_string.getvalue())
+ else:
+ logger.info('\tNo outputs')
@services.command(name='inputs',
@@ -218,10 +217,12 @@ def inputs(service_name, model_storage, logger):
"""
logger.info('Showing inputs for service {0}...'.format(service_name))
service = model_storage.service.get_by_name(service_name)
+
if service.inputs:
inputs_string = StringIO()
for input_name, input_ in service.inputs.iteritems():
inputs_string.write(' - "{0}":{1}'.format(input_name, os.linesep))
+ inputs_string.write(' Description: {0}{1}'.format(input_.description, os.linesep))
inputs_string.write(' Value: {0}{1}'.format(input_.value, os.linesep))
logger.info(inputs_string.getvalue())
else:
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/aria/modeling/models.py
----------------------------------------------------------------------
diff --git a/aria/modeling/models.py b/aria/modeling/models.py
index 4102090..f30b86f 100644
--- a/aria/modeling/models.py
+++ b/aria/modeling/models.py
@@ -268,7 +268,7 @@ class Argument(aria_declarative_base, orchestration.ArgumentBase):
# See also __all__ at the top of this file
-models_to_register = [
+models_to_register = (
# Service template models
ServiceTemplate,
NodeTemplate,
@@ -317,4 +317,4 @@ models_to_register = [
Task,
Log,
Argument
-]
+)
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/examples/hello-world/helloworld.yaml
----------------------------------------------------------------------
diff --git a/examples/hello-world/helloworld.yaml b/examples/hello-world/helloworld.yaml
index be78401..d3369b7 100644
--- a/examples/hello-world/helloworld.yaml
+++ b/examples/hello-world/helloworld.yaml
@@ -1,13 +1,14 @@
tosca_definitions_version: tosca_simple_yaml_1_0
node_types:
- web_server:
+
+ WebServer:
derived_from: tosca.nodes.Root
capabilities:
host:
type: tosca.capabilities.Container
- web_app:
+ WebApp:
derived_from: tosca.nodes.WebApplication
properties:
port:
@@ -17,10 +18,10 @@ topology_template:
node_templates:
web_server:
- type: web_server
+ type: WebServer
web_app:
- type: web_app
+ type: WebApp
properties:
port: 9090
requirements:
@@ -29,4 +30,9 @@ topology_template:
Standard:
configure: scripts/configure.sh
start: scripts/start.sh
- stop: scripts/stop.sh
\ No newline at end of file
+ stop: scripts/stop.sh
+
+ outputs:
+ port:
+ type: integer
+ value: { get_property: [ web_app, port ] }
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/tests/cli/test_services.py
----------------------------------------------------------------------
diff --git a/tests/cli/test_services.py b/tests/cli/test_services.py
index e5717cc..7dc84bc 100644
--- a/tests/cli/test_services.py
+++ b/tests/cli/test_services.py
@@ -174,7 +174,30 @@ class TestServicesDelete(TestCliBase):
class TestServicesOutputs(TestCliBase):
- pass
+
+ def test_header_string(self, monkeypatch, mock_storage):
+ monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
+ self.invoke('services outputs test_s')
+ assert 'Showing outputs for service test_s...' in self.logger_output_string
+
+ def test_outputs_no_outputs(self, monkeypatch, mock_storage):
+ monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
+ self.invoke('services outputs service_with_no_outputs')
+
+ assert 'No outputs' in self.logger_output_string
+ assert 'output1' not in self.logger_output_string
+ assert 'value1' not in self.logger_output_string
+
+ def test_outputs_one_output(self, monkeypatch, mock_storage):
+ monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
+ s = mock_models.create_service_with_dependencies(include_output=True)
+ monkeypatch.setattr(mock_storage.service, 'get_by_name', mock.MagicMock(return_value=s))
+
+ self.invoke('services outputs test_s')
+
+ assert 'output1' in self.logger_output_string
+ assert 'value1' in self.logger_output_string
+ assert 'No outputs' not in self.logger_output_string
class TestServicesInputs(TestCliBase):
@@ -193,7 +216,6 @@ class TestServicesInputs(TestCliBase):
assert 'value1' not in self.logger_output_string
def test_inputs_one_input(self, monkeypatch, mock_storage):
-
monkeypatch.setattr(_Environment, 'model_storage', mock_storage)
s = mock_models.create_service_with_dependencies(include_input=True)
monkeypatch.setattr(mock_storage.service, 'get_by_name', mock.MagicMock(return_value=s))
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/tests/end2end/test_hello_world.py
----------------------------------------------------------------------
diff --git a/tests/end2end/test_hello_world.py b/tests/end2end/test_hello_world.py
index 71792dd..b55b9a8 100644
--- a/tests/end2end/test_hello_world.py
+++ b/tests/end2end/test_hello_world.py
@@ -56,5 +56,6 @@ def _verify_deployed_service_in_storage(service_name, model_storage):
assert service.name == service_name
assert len(service.executions) == 1
assert len(service.nodes) == 2
+ assert service.outputs['port'].value == 9090
assert all(node.state == node.STARTED for node in service.nodes.values())
assert len(service.executions[0].logs) > 0
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/tests/mock/models.py
----------------------------------------------------------------------
diff --git a/tests/mock/models.py b/tests/mock/models.py
index 56a6e3e..7f6bbea 100644
--- a/tests/mock/models.py
+++ b/tests/mock/models.py
@@ -86,6 +86,7 @@ def create_service(service_template, name=SERVICE_NAME, inputs=None):
def create_service_with_dependencies(include_execution=False,
include_input=False,
+ include_output=False,
include_node=False):
service_template = create_service_template()
service = create_service(service_template=service_template)
@@ -96,6 +97,9 @@ def create_service_with_dependencies(include_execution=False,
if include_input:
input = create_input(name='input1', value='value1')
service.inputs = {'input1': input}
+ if include_output:
+ output = create_output(name='output1', value='value1')
+ service.outputs = {'output1': output}
if include_node:
node_template = create_node_template(service_template=service_template)
node = create_node(node_template, service, state=models.Node.STARTED)
@@ -290,6 +294,10 @@ def create_input(name, value):
return _create_parameter(name, value, model_cls=models.Input)
+def create_output(name, value):
+ return _create_parameter(name, value, model_cls=models.Output)
+
+
def _dictify(item):
return dict(((item.name, item),))
@@ -300,8 +308,8 @@ def get_standard_interface_template(service_template):
op_templates = dict(
(op_name, models.OperationTemplate(
name=op_name, implementation='{0}.{1}'.format(__file__, mock_operation.__name__)))
- for op_name in [NORMATIVE_CREATE, NORMATIVE_CONFIGURE, NORMATIVE_START,
- NORMATIVE_STOP, NORMATIVE_DELETE]
+ for op_name in (NORMATIVE_CREATE, NORMATIVE_CONFIGURE, NORMATIVE_START,
+ NORMATIVE_STOP, NORMATIVE_DELETE)
)
return models.InterfaceTemplate(name=NORMATIVE_STANDARD_INTERFACE,
operation_templates=op_templates,
@@ -314,8 +322,8 @@ def get_standard_interface(service):
ops = dict(
(op_name, models.Operation(
name=op_name, implementation='{0}.{1}'.format(__file__, mock_operation.__name__)))
- for op_name in [NORMATIVE_CREATE, NORMATIVE_CONFIGURE, NORMATIVE_START,
- NORMATIVE_STOP, NORMATIVE_DELETE]
+ for op_name in (NORMATIVE_CREATE, NORMATIVE_CONFIGURE, NORMATIVE_START,
+ NORMATIVE_STOP, NORMATIVE_DELETE)
)
return {
NORMATIVE_STANDARD_INTERFACE:
@@ -329,7 +337,7 @@ def get_configure_interfaces(service):
operations = dict(
(op_name, models.Operation(
name=op_name, implementation='{0}.{1}'.format(__file__, mock_operation.__name__)))
- for op_name in [NORMATIVE_PRE_CONFIGURE_SOURCE,
+ for op_name in (NORMATIVE_PRE_CONFIGURE_SOURCE,
NORMATIVE_POST_CONFIGURE_SOURCE,
NORMATIVE_ADD_SOURCE,
NORMATIVE_REMOVE_SOURCE,
@@ -337,8 +345,7 @@ def get_configure_interfaces(service):
NORMATIVE_PRE_CONFIGURE_TARGET,
NORMATIVE_POST_CONFIGURE_TARGET,
NORMATIVE_ADD_TARGET,
- NORMATIVE_REMOVE_TARGET
- ]
+ NORMATIVE_REMOVE_TARGET)
)
interface = {
NORMATIVE_CONFIGURE_INTERFACE: models.Interface(
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/5afa2f7f/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml
----------------------------------------------------------------------
diff --git a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml
index 4d53f9b..a34301c 100644
--- a/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml
+++ b/tests/resources/service-templates/tosca-simple-1.0/node-cellar/node-cellar.yaml
@@ -144,6 +144,10 @@ topology_template:
type: nodejs.Server
requirements:
- host: application_host
+ capabilities:
+ data_endpoint:
+ properties:
+ url_path: /app
node_filter: # cannot be validated
properties:
#- flavor_name: { valid_values: [ {concat:[m1,.,small]} ] } # won't work because not validated :/
@@ -302,6 +306,14 @@ topology_template:
capabilities:
app_endpoint: [ loadbalancer, client ]
+ outputs:
+
+ endpoint:
+ description: >-
+ The application endpoint.
+ type: string
+ value: { get_property: [ nodejs, data_endpoint, url_path ] }
+
policy_types:
MaintenanceWorkflow:
[06/13] incubator-ariatosca git commit: Fixed WD03, Rev01 (2016-7-29)
Posted by av...@apache.org.
Fixed WD03, Rev01 (2016-7-29)
Also fixed a typo that repeated itself.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/422a95b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/422a95b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/422a95b2
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 422a95b277e28e83f24373ce9e2c903e6444e5b7
Parents: 5afa2f7
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Sun Jun 4 22:11:10 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../profiles/tosca-simple-1.0/artifacts.yaml | 8 ++--
.../profiles/tosca-simple-1.0/capabilities.yaml | 2 +-
.../profiles/tosca-simple-1.0/data.yaml | 2 +-
.../profiles/tosca-simple-1.0/groups.yaml | 2 +-
.../profiles/tosca-simple-1.0/interfaces.yaml | 2 +-
.../profiles/tosca-simple-1.0/nodes.yaml | 2 +-
.../profiles/tosca-simple-1.0/policies.yaml | 10 ++--
.../tosca-simple-1.0/relationships.yaml | 2 +-
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 48 ++++++++++----------
9 files changed, 40 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
index af99340..cfb0df5 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/artifacts.yaml
@@ -17,7 +17,7 @@ artifact_types:
tosca.artifacts.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.3.1
@@ -41,7 +41,7 @@ artifact_types:
tosca.artifacts.Deployment:
_extensions:
- shorthand_name: Deployment # ARIA NOTE: ommitted in the spec
+ shorthand_name: Deployment # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Deployment
specification: tosca-simple-1.0
specification_section: 5.3.3.1
@@ -67,7 +67,7 @@ artifact_types:
tosca.artifacts.Deployment.Image.VM:
_extensions:
- shorthand_name: Deployment.VM # ARIA NOTE: ommitted in the spec
+ shorthand_name: Deployment.VM # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Deployment.VM
specification: tosca-simple-1.0
specification_section: 5.3.3.4
@@ -85,7 +85,7 @@ artifact_types:
tosca.artifacts.Implementation:
_extensions:
- shorthand_name: Implementation # ARIA NOTE: ommitted in the spec
+ shorthand_name: Implementation # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Implementation
specification: tosca-simple-1.0
specification_section: 5.3.4.1
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
index 0b81a16..30abe10 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/capabilities.yaml
@@ -17,7 +17,7 @@ capability_types:
tosca.capabilities.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.4.1
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
index 5210aa0..771a969 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/data.yaml
@@ -95,7 +95,7 @@ data_types:
tosca.datatypes.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.2.1
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/groups.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/groups.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/groups.yaml
index 31cfc55..66cc25f 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/groups.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/groups.yaml
@@ -17,7 +17,7 @@ group_types:
tosca.groups.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.9.1
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/interfaces.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/interfaces.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/interfaces.yaml
index 1e83ef9..473bd98 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/interfaces.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/interfaces.yaml
@@ -17,7 +17,7 @@ interface_types:
tosca.interfaces.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.7.3
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/nodes.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/nodes.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/nodes.yaml
index bb33b6f..1d2fe90 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/nodes.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/nodes.yaml
@@ -214,7 +214,7 @@ node_types:
tosca.nodes.DBMS:
_extensions:
- shorthand_name: DBMS # ARIA NOTE: ommitted in the spec
+ shorthand_name: DBMS # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:DBMS
specification: tosca-simple-1.0
specification_section: 5.8.6
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/policies.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/policies.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/policies.yaml
index 015d2b0..c65e38b 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/policies.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/policies.yaml
@@ -17,7 +17,7 @@ policy_types:
tosca.policies.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.10.1
@@ -27,7 +27,7 @@ policy_types:
tosca.policies.Placement:
_extensions:
- shorthand_name: Placement # ARIA NOTE: ommitted in the spec
+ shorthand_name: Placement # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Placement
specification: tosca-simple-1.0
specification_section: 5.10.2
@@ -38,7 +38,7 @@ policy_types:
tosca.policies.Scaling:
_extensions:
- shorthand_name: Scaling # ARIA NOTE: ommitted in the spec
+ shorthand_name: Scaling # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Scaling
specification: tosca-simple-1.0
specification_section: 5.10.3
@@ -49,7 +49,7 @@ policy_types:
tosca.policies.Update:
_extensions:
- shorthand_name: Update # ARIA NOTE: ommitted in the spec
+ shorthand_name: Update # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Update
specification: tosca-simple-1.0
specification_section: 5.10.4
@@ -60,7 +60,7 @@ policy_types:
tosca.policies.Performance:
_extensions:
- shorthand_name: Performance # ARIA NOTE: ommitted in the spec
+ shorthand_name: Performance # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Performance
specification: tosca-simple-1.0
specification_section: 5.10.5
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/relationships.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/relationships.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/relationships.yaml
index 6ea4d12..b9d3176 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/relationships.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-1.0/relationships.yaml
@@ -17,7 +17,7 @@ relationship_types:
tosca.relationships.Root:
_extensions:
- shorthand_name: Root # ARIA NOTE: ommitted in the spec
+ shorthand_name: Root # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:Root
specification: tosca-simple-1.0
specification_section: 5.6.1
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/422a95b2/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 0dfe38d..d2c11dc 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
@@ -17,7 +17,7 @@ node_types:
tosca.nodes.nfv.VNF:
_extensions:
- shorthand_name: VNF # ARIA NOTE: ommitted in the spec
+ shorthand_name: VNF # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:VNF
specification: tosca-simple-nfv-1.0
specification_section: 8.5.1
@@ -45,23 +45,23 @@ node_types:
capability: tosca.capabilities.nfv.VirtualLinkable
relationship: tosca.relationships.nfv.VirtualLinksTo
- tosca.nodes.nfv.VDU:
- _extensions:
- shorthand_name: VDU
- type_qualified_name: tosca:VDU
- specification: tosca-simple-nfv-1.0
- specification_section: 8.5.2
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290242'
- description: >-
- The NFV vdu node type represents a logical vdu entity as defined by [ETSI GS NFV-MAN 001 v1.1.1].
- derived_from: tosca.nodes.Root
- capabilities:
- nfv_compute:
- type: tosca.capabilities.Compute.Container.Architecture
- virtual_binding:
- type: tosca.capabilities.nfv.VirtualBindable
- monitoring_parameter:
- type: tosca.capabilities.nfv.Metric
+# tosca.nodes.nfv.VDU:
+# _extensions:
+# shorthand_name: VDU
+# type_qualified_name: tosca:VDU
+# specification: tosca-simple-nfv-1.0
+# specification_section: 8.5.2
+# specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290242'
+# description: >-
+# The NFV vdu node type represents a logical vdu entity as defined by [ETSI GS NFV-MAN 001 v1.1.1].
+# derived_from: tosca.nodes.Root
+# capabilities:
+# nfv_compute:
+# type: tosca.capabilities.Compute.Container.Architecture
+# virtual_binding:
+# type: tosca.capabilities.nfv.VirtualBindable
+# monitoring_parameter:
+# type: tosca.capabilities.nfv.Metric
tosca.nodes.nfv.CP:
_extensions:
@@ -82,7 +82,7 @@ node_types:
This may be, for example, a virtual port, a virtual NIC address, a SR-IOV port, a physical port, a physical NIC address
or the endpoint of an IP VPN enabling network connectivity.
type: string
- anti_spoof_protection:
+ anti_spoofing_protection:
description: >-
Indicates of whether anti-spoofing rule need to be enabled for this vNIC. This is applicable only when CP type is virtual
NIC (vPort).
@@ -147,7 +147,7 @@ node_types:
tosca.nodes.nfv.VL.ELine:
_extensions:
- shorthand_name: VL.ELine # ARIA NOTE: ommitted in the spec
+ shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:VL.ELine
specification: tosca-simple-nfv-1.0
specification_section: 9.2
@@ -158,11 +158,13 @@ node_types:
capabilities:
virtual_linkable:
type: tosca.capabilities.nfv.VirtualLinkable
- occurrences: [ 2, UNBOUNDED ] # ARIA NOTE: the spec is wrong here, must be a range
+ occurrences: [ 2, 2 ] # ARIA NOTE: section 3.2.3.1 states that the upper bound must be
+ # higher than the lower bound, but section 3.6.2.1 uses a range with
+ # equal bounds
tosca.nodes.nfv.VL.ELAN:
_extensions:
- shorthand_name: VL.ELAN # ARIA NOTE: ommitted in the spec
+ shorthand_name: VL.ELAN # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:VL.ELAN
specification: tosca-simple-nfv-1.0
specification_section: 9.3
@@ -173,7 +175,7 @@ node_types:
tosca.nodes.nfv.VL.ETree:
_extensions:
- shorthand_name: VL.ETree # ARIA NOTE: ommitted in the spec
+ shorthand_name: VL.ETree # ARIA NOTE: omitted in the spec
type_qualified_name: tosca:VL.ETree
specification: tosca-simple-nfv-1.0
specification_section: 9.4
[08/13] incubator-ariatosca git commit: Fixed WD04,
Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)
Posted by av...@apache.org.
Fixed WD04, Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/f4241645
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/f4241645
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/f4241645
Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: f4241645c3da8cfff9a52341e92cb10c724f887b
Parents: bb8c4af
Author: Avia Efrat <av...@gigaspaces.com>
Authored: Mon Jun 5 16:36:52 2017 +0300
Committer: Avia Efrat <av...@gigaspaces.com>
Committed: Wed Jun 7 23:01:04 2017 +0300
----------------------------------------------------------------------
.../tosca-simple-nfv-1.0/capabilities.yaml | 45 --------
.../profiles/tosca-simple-nfv-1.0/data.yaml | 75 -------------
.../profiles/tosca-simple-nfv-1.0/nodes.yaml | 112 +------------------
3 files changed, 5 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f4241645/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 6bc6b67..375ba13 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
@@ -15,51 +15,6 @@
capability_types:
- tosca.capabilities.Compute.Container.Architecture:
- _extensions:
- shorthand_name: Compute.Container.Architecture
- type_qualified_name: tosca:Compute.Container.Architecture
- specification: tosca-simple-nfv-1.0
- specification_section: 8.2.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#DEFN_TYPE_CAPABILITIES_CONTAINER'
- description: >-
- Enhance compute architecture capability that needs to be typically use for performance sensitive NFV workloads.
- derived_from: tosca.capabilities.Container
- properties:
- mem_page_size:
- description: >-
- Describe page size of the VM:
-
- * small page size is typically 4KB
- * large page size is typically 2MB
- * any page size maps to system default
- * custom MB value: sets TLB size to this specific value
- type: string
- # ARIA NOTE: seems wrong in the spec
- #constraints:
- # - [ normal, huge ]
- cpu_allocation:
- description: >-
- Describes CPU allocation requirements like dedicated CPUs (cpu pinning), socket count, thread count, etc.
- type: tosca.datatypes.compute.Container.Architecture.CPUAllocation
- required: false
- numa_node_count:
- description: >-
- Specifies the symmetric count of NUMA nodes to expose to the VM. vCPU and Memory equally split across this number of
- NUMA.
-
- NOTE: the map of numa_nodes should not be specified.
- type: integer
- required: false
- numa_nodes:
- description: >-
- Asymmetric allocation of vCPU and Memory across the specific NUMA nodes (CPU sockets and memory banks).
-
- NOTE: symmetric numa_node_count should not be specified.
- type: map
- entry_schema: tosca.datatypes.compute.Container.Architecture.NUMA
- required: false
-
tosca.capabilities.nfv.VirtualBindable:
_extensions:
shorthand_name: VirtualBindable
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f4241645/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 f6a07ef..cf35cba 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
@@ -303,78 +303,3 @@ data_types:
entry_schema:
type: string
required: false
-
- tosca.datatypes.compute.Container.Architecture.CPUAllocation:
- _extensions:
- shorthand_name: Container.Architecture.CPUAllocation # seems to be a mistake in the spec; the norm is to add a "Container.Architecture." prefix
- type_qualified_name: tosca:Container.Architecture.CPUAllocation
- specification: tosca-simple-nfv-1.0
- specification_section: 8.3.1
- description: >-
- Granular CPU allocation requirements for NFV workloads.
- derived_from: tosca.datatypes.Root
- properties:
- cpu_affinity:
- description: >-
- Describes whether vCPU need to be pinned to dedicated CPU core or shared dynamically.
- type: string
- constraints:
- - valid_values: [ shared, dedicated ]
- required: false
- thread_allocation:
- description: >-
- Describe thread allocation requirement.
- type: string
- constraints:
- - valid_values: [ avoid, isolate, separate, prefer ]
- required: false
- socket_count:
- description: >-
- Number of CPU sockets.
- type: integer
- required: false
- core_count:
- description: >-
- Number of cores per socket.
- type: integer
- required: false
- thread_count:
- description: >-
- Number of threads per core.
- type: integer
- required: false
-
- tosca.datatypes.compute.Container.Architecture.NUMA:
- _extensions:
- shorthand_name: Container.Architecture.NUMA # ARIA NOTE: seems to be a mistake in the spec; the norm is to add a "Container.Architecture." prefix
- type_qualified_name: tosca:Container.Architecture.NUMA
- specification: tosca-simple-nfv-1.0
- specification_section: 8.3.2
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714697'
- description: >-
- Granular Non-Uniform Memory Access (NUMA) topology requirements for NFV workloads.
- derived_from: tosca.datatypes.Root
- properties:
- id:
- description: >-
- CPU socket identifier.
- type: integer
- constraints:
- - greater_or_equal: 0
- required: false
- vcpus:
- description: >-
- List of specific host cpu numbers within a NUMA socket complex.
-
- TODO: need a new base type, with non-overlapping, positive value validation (exclusivity),
- type: map
- entry_schema:
- type: integer
- required: false
- mem_size:
- description: >-
- Size of memory allocated from this NUMA memory bank.
- type: scalar-unit.size
- constraints:
- - greater_or_equal: 0 MB
- required: false
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/f4241645/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 e8ab50f..d0ccadd 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
@@ -15,36 +15,6 @@
node_types:
- tosca.nodes.nfv.VNF:
- _extensions:
- shorthand_name: VNF # ARIA NOTE: omitted in the spec
- type_qualified_name: tosca:VNF
- specification: tosca-simple-nfv-1.0
- specification_section: 8.5.1
- specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc379455076'
- description: >-
- The NFV VNF Node Type represents a Virtual Network Function as defined by [ETSI GS NFV-MAN 001 v1.1.1]. It is the default
- type that all other VNF Node Types derive from. This allows for all VNF nodes to have a consistent set of features for
- modeling and management (e.g., consistent definitions for requirements, capabilities and lifecycle interfaces).
- derived_from: tosca.nodes.Root
- properties:
- id:
- description: >-
- ID of this VNF.
- type: string
- vendor:
- description: >-
- Name of the vendor who generate this VNF.
- type: string
- version:
- description: >-
- Version of the software for this VNF.
- type: string
- requirements:
- - virtual_link:
- capability: tosca.capabilities.nfv.VirtualLinkable
- relationship: tosca.relationships.nfv.VirtualLinksTo
-
tosca.nodes.nfv.Cpd:
_extensions:
shorthand_name: Cpd
@@ -123,7 +93,11 @@ node_types:
description: Describe the requirement for binding with VDU
capability: tosca.capabilities.nfv.VirtualBindable
relationship: tosca.relationships.nfv.VirtualBindsTo
- node: tosca.nodes.nfv.VDU
+ 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.
VnfVirtualLinkDesc:
_extensions:
@@ -173,62 +147,6 @@ node_types:
# monitoring_parameters:
# modeled as ad hoc (named) capabilities in node template
-# tosca.nodes.nfv.VDU:
-# _extensions:
-# shorthand_name: VDU
-# type_qualified_name: tosca:VDU
-# specification: tosca-simple-nfv-1.0
-# specification_section: 8.5.2
-# specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290242'
-# description: >-
-# The NFV vdu node type represents a logical vdu entity as defined by [ETSI GS NFV-MAN 001 v1.1.1].
-# derived_from: tosca.nodes.Root
-# capabilities:
-# nfv_compute:
-# type: tosca.capabilities.Compute.Container.Architecture
-# virtual_binding:
-# type: tosca.capabilities.nfv.VirtualBindable
-# monitoring_parameter:
-# type: tosca.capabilities.nfv.Metric
-
-# tosca.nodes.nfv.CP:
-# _extensions:
-# shorthand_name: CP
-# type_qualified_name: tosca:CP
-# specification: tosca-simple-nfv-1.0
-# specification_section: 8.5.3
-# specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290245'
-# description: >-
-# The NFV CP node represents a logical connection point entity as defined by [ETSI GS NFV-MAN 001 v1.1.1]. A connection point
-# may be, for example, a virtual port, a virtual NIC address, a physical port, a physical NIC address or the endpoint of an IP
-# VPN enabling network connectivity. It is assumed that each type of connection point will be modeled using subtypes of the CP
-# type.
-# derived_from: tosca.nodes.network.Port
-# properties:
-# type:
-# description: >-
-# This may be, for example, a virtual port, a virtual NIC address, a SR-IOV port, a physical port, a physical NIC address
-# or the endpoint of an IP VPN enabling network connectivity.
-# type: string
-# anti_spoofing_protection:
-# description: >-
-# Indicates of whether anti-spoofing rule need to be enabled for this vNIC. This is applicable only when CP type is virtual
-# NIC (vPort).
-# type: boolean
-# required: false
-# attributes:
-# address:
-# description: >-
-# The actual virtual NIC address that is been assigned when instantiating the connection point.
-# type: string
-# requirements:
-# - virtual_link:
-# capability: tosca.capabilities.nfv.VirtualLinkable
-# relationship: tosca.relationships.nfv.VirtualLinksTo
-# - virtual_binding:
-# capability: tosca.capabilities.nfv.VirtualBindable
-# relationship: tosca.relationships.nfv.VirtualBindsTo
-
tosca.nodes.nfv.FP:
_extensions:
shorthand_name: FP # ARIA NOTE: the spec must be mistaken here, says "VL"
@@ -253,26 +171,6 @@ node_types:
# Virtual link
#
-# tosca.nodes.nfv.VL:
-# _extensions:
-# shorthand_name: VL
-# type_qualified_name: tosca:VL
-# specification: tosca-simple-nfv-1.0
-# specification_section: 9.1
-# specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290251'
-# description: >-
-# The NFV VL node type represents a logical virtual link entity as defined by [ETSI GS NFV-MAN 001 v1.1.1]. It is the default
-# type from which all other virtual link types derive.
-# derived_from: tosca.nodes.network.Network
-# properties:
-# vendor:
-# description: >-
-# Vendor generating this VLD.
-# type: string
-# capabilities:
-# virtual_linkable:
-# type: tosca.capabilities.nfv.VirtualLinkable
-
tosca.nodes.nfv.VL.ELine:
_extensions:
shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec