Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-275-update-NFV-profile-to-csd04 [created] ee2a16e61
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/5660d518 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/5660d518 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/5660d518 Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04 Commit: 5660d5181d4db234d0c5aa79b2ff6ce965fd1a3a Parents: b6d3c43 Author: Avia Efrat <[email protected]> Authored: Sun Jun 4 22:11:10 2017 +0300 Committer: Avia Efrat <[email protected]> Committed: Sun Jun 4 22:11:10 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/5660d518/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/5660d518/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/5660d518/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/5660d518/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/5660d518/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/5660d518/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/5660d518/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/5660d518/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/5660d518/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
