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/1d855472 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/1d855472 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/1d855472 Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04 Commit: 1d855472b9181a86b92aafa7ccbd899660c2a269 Parents: 636244c Author: Avia Efrat <[email protected]> Authored: Tue Jun 6 01:05:13 2017 +0300 Committer: Avia Efrat <[email protected]> Committed: Tue Jun 6 01:05:13 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/1d855472/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.
