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