Commit 208df219 authored by admin_forge's avatar admin_forge
Browse files

Update to version 2.7.1

parent 02556b3c
Loading
Loading
Loading
Loading
+85 −4
Original line number Original line Diff line number Diff line
tosca_definitions_version: tosca_simple_yaml_1_2
tosca_definitions_version: tosca_simple_yaml_1_2
description: ETSI NFV SOL 001 common types definitions version 2.6.1
description: ETSI NFV SOL 001 common types definitions version 2.7.1
metadata:
metadata:
  template_name: etsi_nfv_sol001_common_types
  template_name: etsi_nfv_sol001_common_types
  template_author: ETSI_NFV
  template_author: ETSI_NFV
  template_version: 2.6.1
  template_version: 2.7.1


data_types:
data_types:
  tosca.datatypes.nfv.L2AddressData:
  tosca.datatypes.nfv.L2AddressData:
@@ -156,15 +156,48 @@ data_types:
        constraints:
        constraints:
           - in_range: [ 0.0, 1.0 ]
           - in_range: [ 0.0, 1.0 ]


  tosca.datatypes.nfv.VnfMonitoringParameter:
    derived_from: tosca.datatypes.Root
    description: Represents information on virtualised resource related performance metrics applicable to the VNF.
    properties:
      name:
       type: string
       description: Human readable name of the monitoring parameter
       required: true
      performance_metric:
       type: string
       description: Identifies a performance metric to be monitored, according to ETSI GS NFV-IFA 027. 
       required: true
       constraints:
        - valid_values: [ v_cpu_usage_mean_vnf, v_cpu_usage_peak_vnf, v_memory_usage_mean_vnf, v_memory_usage_peak_vnf, v_disk_usage_mean_vnf, v_disk_usage_peak_vnf, byte_incoming_vnf_ext_cp, byte_outgoing_vnf_ext_cp, packet_incoming_vnf_ext_cp, packet_outgoing_vnf_ext_cp ] 
      collection_period:
       type: scalar-unit.time
       description: Describes the periodicity at which to collect the performance information. 
       required: false
       constraints: 
        - greater_than: 0 s
        
capability_types:
capability_types:
  tosca.capabilities.nfv.VirtualLinkable:
  tosca.capabilities.nfv.VirtualLinkable:
    derived_from: tosca.capabilities.Node
    derived_from: tosca.capabilities.Node
    description: A node type that includes the VirtualLinkable capability indicates that it can be pointed by tosca.relationships.nfv.VirtualLinksTo relationship type
    description: A node type that includes the VirtualLinkable capability indicates that it can be pointed by tosca.relationships.nfv.VirtualLinksTo relationship type


  tosca.capabilities.nfv.Forwarding:
    derived_from: tosca.capabilities.Root
 
relationship_types:
relationship_types:
  tosca.relationships.nfv.VirtualLinksTo:
  tosca.relationships.nfv.VirtualLinksTo:
    derived_from: tosca.relationships.DependsOn
    derived_from: tosca.relationships.DependsOn
    description: Represents an association relationship between the VduCp and VnfVirtualLink node types 
    description: Represents an association relationship between the VduCp and VnfVirtualLink node types or the association between either a VnfExtCp, a PnfExtCp or a Sap and an NsVirtualLink node types. 
    valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]

  tosca.relationships.nfv.ForwardTo:
    derived_from: tosca.relationships.Root
    valid_target_types: [ tosca.capabilities.nfv.Forwarding ]

  tosca.relationships.nfv.VipVirtualLinksTo:
    derived_from: tosca.relationships.DependsOn
    description: Represents an association relationship between the VipCp and a VnfVirtualLink node types or between the former and a NsVirtualLink node types. 
    valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
    valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
    
    
node_types:
node_types:
@@ -180,7 +213,7 @@ node_types:
          type: string
          type: string
          constraints:
          constraints:
            - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
            - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
      role: #Name in ETSI NFV IFA011 v0.7.3: cpRole
      role: #Name in ETSI NFV IFA011: cpRole
        type: string
        type: string
        description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS 
        description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS 
        required: false
        required: false
@@ -200,3 +233,51 @@ node_types:
        type: boolean
        type: boolean
        description: Provides information about whether the CP instantiated from this Cp is in Trunk mode (802.1Q or other), When operating in "trunk mode", the Cp is capable of carrying traffic for several VLANs. Absence of this property implies that trunkMode is not configured for the Cp i.e. It is equivalent to boolean value "false".
        description: Provides information about whether the CP instantiated from this Cp is in Trunk mode (802.1Q or other), When operating in "trunk mode", the Cp is capable of carrying traffic for several VLANs. Absence of this property implies that trunkMode is not configured for the Cp i.e. It is equivalent to boolean value "false".
        required: false
        required: false

policy_types:
  tosca.policies.nfv.Abstract.SecurityGroupRule:
    derived_from: tosca.policies.Root
    description: The Abstract.SecurityGroupRule type represents an abstract policy type without any target requirements
    properties:
      description:
        type: string
        description: Human readable description of the security group rule.
        required: false
      direction:
        type: string
        description: The direction in which the security group rule is applied. The direction of 'ingress' or 'egress' is specified against the associated CP. I.e., 'ingress' means the packets entering a CP, while 'egress' means the packets sent out of a CP.
        required: false
        constraints:
          - valid_values: [ ingress, egress ]
        default: ingress
      ether_type:
        type: string
        description: Indicates the protocol carried over the Ethernet layer.
        required: false
        constraints:
          - valid_values: [ ipv4, ipv6 ]
        default: ipv4
      protocol:
        type: string
        description: Indicates the protocol carried over the IP layer. Permitted values include any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc.
        required: false
        constraints:
          - valid_values: [ hopopt, icmp, igmp, ggp, ipv4, st, tcp, cbt, egp, igp, bbn_rcc_mon, nvp_ii, pup, argus, emcon, xnet, chaos, udp, mux, dcn_meas, hmp, prm, xns_idp, trunk_1, trunk_2, leaf_1, leaf_2, rdp, irtp, iso_tp4, netblt, mfe_nsp, merit_inp, dccp, 3pc, idpr, xtp, ddp, idpr_cmtp, tp++, il, ipv6, sdrp, ipv6_route, ipv6_frag, idrp, rsvp, gre, dsr, bna, esp, ah, i_nlsp, swipe, narp, mobile, tlsp, skip, ipv6_icmp, ipv6_no_nxt, ipv6_opts, cftp, sat_expak, kryptolan, rvd, ippc, sat_mon, visa, ipcv, cpnx, cphb, wsn, pvp, br_sat_mon, sun_nd, wb_mon, wb_expak, iso_ip, vmtp, secure_vmtp, vines, ttp, iptm, nsfnet_igp, dgp, tcf, eigrp, ospfigp, sprite_rpc, larp, mtp, ax.25, ipip, micp, scc_sp, etherip, encap, gmtp, ifmp, pnni, pim, aris, scps, qnx, a/n, ip_comp, snp, compaq_peer, ipx_in_ip, vrrp, pgm, l2tp, ddx, iatp, stp, srp, uti, smp, sm, ptp, isis, fire, crtp, crudp, sscopmce, iplt, sps, pipe, sctp, fc, rsvp_e2e_ignore, mobility, udp_lite, mpls_in_ip, manet, hip, shim6, wesp, rohc ]
        default: tcp
      port_range_min:
        type: integer
        description: Indicates minimum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
        required: false
        constraints:
          - greater_or_equal: 0
          - less_or_equal: 65535
        default: 0
      port_range_max:
        type: integer
        description: Indicates maximum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
        required: false
        constraints:
          - greater_or_equal: 0
          - less_or_equal: 65535
        default: 65535
+241 −65

File changed.

Preview size limit exceeded, changes collapsed.

+60 −91
Original line number Original line Diff line number Diff line
tosca_definitions_version: tosca_simple_yaml_1_2
tosca_definitions_version: tosca_simple_yaml_1_2
description: ETSI NFV SOL 001 pnfd types definitions version 2.6.1
description: ETSI NFV SOL 001 pnfd types definitions version 2.7.1
metadata:
metadata:
  template_name: etsi_nfv_sol001_pnfd_types
  template_name: etsi_nfv_sol001_pnfd_types
  template_author: ETSI_NFV
  template_author: ETSI_NFV
  template_version: 2.6.1
  template_version: 2.7.1


imports:
imports:
  - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.6.1/etsi_nfv_sol001_common_types.yaml
     - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.7.1/etsi_nfv_sol001_common_types.yaml
     # editor's note: During the development of the SOL001ed271 GS, to enable this file to be verified by a TOSCA parser, the imports statement has to be replaced with a reference to a local copy of the common definitions YAML file



data_types:
data_types:
  tosca.datatypes.nfv.LocationInfo:
  tosca.datatypes.nfv.LocationInfo:
@@ -42,26 +44,33 @@ node_types:
    derived_from: tosca.nodes.Root
    derived_from: tosca.nodes.Root
    properties: 
    properties: 
      descriptor_id: # instead of pnfd_id
      descriptor_id: # instead of pnfd_id
        type: string # GUID
       type: string # UUID
       required: true
       required: true
       description: Identifier of this PNFD information element. It uniquely identifies the PNFD.
      function_description:
      function_description:
       type: string
       type: string
       required: true
       required: true
       description: Describes the PNF function.
      provider:
      provider:
       type: string
       type: string
       required: true
       required: true
       description: Identifies the provider of the PNFD.
      version:
      version:
       type: string
       type: string
       required: true
       required: true
       description: Identifies the version of the PNFD.
      descriptor_invariant_id: # instead of pnfd-invariant-id
      descriptor_invariant_id: # instead of pnfd-invariant-id
        type: string # GUID
       type: string # UUID
       required: true
       required: true
       description: Identifier of this PNFD in a version independent manner. This attribute is invariant across versions of PNFD.
      name:
      name:
       type: string
       type: string
       required: true
       required: true
       description: Name to identify the PNFD.
      geographical_location_info: 
      geographical_location_info: 
       type: tosca.datatypes.nfv.LocationInfo 
       type: tosca.datatypes.nfv.LocationInfo 
       required: false
       required: false
       description: Provides information about the geographical location (e.g. geographic coordinates or address of the building, etc.) of the PNF
    requirements:
    requirements:
    - virtual_link:
    - virtual_link:
        capability: tosca.capabilities.nfv.VirtualLinkable
        capability: tosca.capabilities.nfv.VirtualLinkable
@@ -76,51 +85,11 @@ node_types:
    - external_virtual_link:
    - external_virtual_link:
        capability: tosca.capabilities.nfv.VirtualLinkable
        capability: tosca.capabilities.nfv.VirtualLinkable
        relationship: tosca.relationships.nfv.VirtualLinksTo
        relationship: tosca.relationships.nfv.VirtualLinksTo
        occurrences: [0, 1]


policy_types:
policy_types:
  tosca.policies.nfv.SecurityGroupRule:
  tosca.policies.nfv.PnfSecurityGroupRule:
    derived_from: tosca.policies.Root
    derived_from: tosca.policies.nfv.Abstract.SecurityGroupRule
    description: The SecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited connection points as defined in ETSI GS NFV-IFA 011 [1].
    description: The PnfSecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited PNF external connection points.
    properties:
      description:
        type: string
        description: Human readable description of the security group rule.
        required: false
      direction:
        type: string
        description: The direction in which the security group rule is applied. The direction of 'ingress' or 'egress' is specified against the associated CP. I.e., 'ingress' means the packets entering a CP, while 'egress' means the packets sent out of a CP.
        required: false
        constraints:
          - valid_values: [ ingress, egress ]
        default: ingress
      ether_type:
        type: string
        description: Indicates the protocol carried over the Ethernet layer.
        required: false
        constraints:
          - valid_values: [ ipv4, ipv6 ]
        default: ipv4
      protocol:
        type: string
        description: Indicates the protocol carried over the IP layer. Permitted values include any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc.
        required: false
        constraints:
          - valid_values: [ hopopt, icmp, igmp, ggp, ipv4, st, tcp, cbt, egp, igp, bbn_rcc_mon, nvp_ii, pup, argus, emcon, xnet, chaos, udp, mux, dcn_meas, hmp, prm, xns_idp, trunk_1, trunk_2, leaf_1, leaf_2, rdp, irtp, iso_tp4, netblt, mfe_nsp, merit_inp, dccp, 3pc, idpr, xtp, ddp, idpr_cmtp, tp++, il, ipv6, sdrp, ipv6_route, ipv6_frag, idrp, rsvp, gre, dsr, bna, esp, ah, i_nlsp, swipe, narp, mobile, tlsp, skip, ipv6_icmp, ipv6_no_nxt, ipv6_opts, cftp, sat_expak, kryptolan, rvd, ippc, sat_mon, visa, ipcv, cpnx, cphb, wsn, pvp, br_sat_mon, sun_nd, wb_mon, wb_expak, iso_ip, vmtp, secure_vmtp, vines, ttp, iptm, nsfnet_igp, dgp, tcf, eigrp, ospfigp, sprite_rpc, larp, mtp, ax.25, ipip, micp, scc_sp, etherip, encap, gmtp, ifmp, pnni, pim, aris, scps, qnx, a/n, ip_comp, snp, compaq_peer, ipx_in_ip, vrrp, pgm, l2tp, ddx, iatp, stp, srp, uti, smp, sm, ptp, isis, fire, crtp, crudp, sscopmce, iplt, sps, pipe, sctp, fc, rsvp_e2e_ignore, mobility, udp_lite, mpls_in_ip, manet, hip, shim6, wesp, rohc ]
        default: tcp
      port_range_min:
        type: integer
        description: Indicates minimum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
        required: false
        constraints:
          - greater_or_equal: 0
          - less_or_equal: 65535
        default: 0
      port_range_max:
        type: integer
        description: Indicates maximum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
        required: false
        constraints:
          - greater_or_equal: 0
          - less_or_equal: 65535
        default: 65535
    targets: [ tosca.nodes.nfv.PnfExtCp ]
    targets: [ tosca.nodes.nfv.PnfExtCp ]
+1151 −1056

File changed.

Preview size limit exceeded, changes collapsed.