Commit dafc69e2 authored by Antoine Mouquet's avatar Antoine Mouquet
Browse files

Update 4 files 

- /etsi_nfv_sol001_pnfd_types.yaml
- /etsi_nfv_sol001_vnfd_types.yaml
- /etsi_nfv_sol001_nsd_types.yaml
- /etsi_nfv_sol001_common_types.yaml
parent a75a50c7

etsi_nfv_sol001_common_types.yaml

+49 −4
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 common types definitions version 4.4.1

description: ETSI NFV SOL 001 common types definitions version 5.0.4

metadata:

  template_name: etsi_nfv_sol001_common_types

  template_author: ETSI_NFV

  template_version: 4.4.1

  template_version: 5.0.4



data_types:

  tosca.datatypes.nfv.L2AddressData:
@@ -162,6 +162,16 @@ data_types: 
        required: false

        entry_schema:

          type: tosca.datatypes.nfv.VersionDependency

      selected_deployable_modules:

        type: tosca.datatypes.nfv.SelectedDeployableModules

        description: Indicates the selected deployable module(s) for the VNF instances created from this profile.    

        required: false

      vdu_capacity-overriding-allowed:

        type: map # key: name of a Vdu.OsContainerDeployableUnit or a Vdu.Compute node template in the VNFD or the string “ALL�? if the value applies to all VDUs in the VNFD.

        descriptrion: Indicates whether the capacity related attributes specified in the VNFD as being configurable can be overridden by new values at run time.

        required: false

        entry-schema:

          type: boolean



  tosca.datatypes.nfv.Qos:

    derived_from: tosca.datatypes.Root
@@ -199,7 +209,7 @@ data_types: 
       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 ] 

        - 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, cpu_usage_mean_os_container, cpu_usage_peak_os_container, memory_usage_mean_os_container, memory_usage_peak_os_container, byte_incoming_compute_mcio, byte_outgoing_compute_mcio, packet_incoming_compute_mcio, packet_outgoing_compute_mcio, storage_usage_mean_os_container, storage_usage_peak_os_container ] 

      collection_period:

       type: scalar-unit.time

       description: Describes the periodicity at which to collect the performance information.
@@ -244,11 +254,33 @@ data_types: 
       constraints:

         - greater_or_equal: 0



  tosca.datatypes.nfv. SelectedDeployableModules:

    derived_from: tosca.datatypes.Root

    description: Indicates the selected deployable modules of a VNF, which is a constituent of an NS. 

    properties:

      deployable_module:

        type: list

        description: Name(s) of the selected deployable module(s) for the VNF instances created from the applicable VNF or NS profile.

        required: false

        entry_schema:

          type: string

        constraints:

          - min_length: 0

      overriding_selection_allowed:

        type: boolean

        description: Indicates whether it is allowed or not to override the selection of deployable modules indicated in a property of this data type by means of attributes in an NS LCM operation, or by  attributes in the NsProfile if the VNF is part of a nested NS, during the lifecycle of a VNF instance. If not present, overriding the selection is allowed.        

        required: true

        default: true

       

capability_types:

  tosca.capabilities.nfv.VirtualLinkable:

    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



  tosca.capabilities.nfv.AssociablePaasService:

    derived_from: tosca.capabilities.Node

    description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.PaasServiceAssociates relationship type.

	

relationship_types:

  tosca.relationships.nfv.VirtualLinksTo:

    derived_from: tosca.relationships.DependsOn
@@ -260,6 +292,11 @@ relationship_types: 
    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 ]



  tosca.relationships.nfv.PaasServiceAssociates:

    derived_from: tosca.relationships.DependsOn

    description: Represents an association relationship between the VNF or NS and NsPaasServiceProfile node types 

    valid_target_types: [ tosca.capabilities.nfv.AssociablePaasService ]

    

node_types:

  tosca.nodes.nfv.Cp:

    derived_from: tosca.nodes.Root
@@ -299,6 +336,14 @@ node_types: 
        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".

        required: false

      purpose:

        type: list

        entry_schema:

          type: string

          constraints:

            - valid_values: [ cp, dp, mp, mp_external ]

        description: Identifies in a machine-processable form the purpose of the CP.

        required: false



policy_types:

  tosca.policies.nfv.Abstract.SecurityGroupRule:

etsi_nfv_sol001_nsd_types.yaml

+148 −5
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 nsd types definitions version 4.4.1

description: ETSI NFV SOL 001 nsd types definitions version 5.0.4

metadata:

  template_name: etsi_nfv_sol001_nsd_types

  template_author: ETSI_NFV

  template_version: 4.4.1

  template_version: 5.0.4



imports:

     - etsi_nfv_sol001_common_types.yaml
@@ -89,6 +89,13 @@ data_types: 
        required: false

        entry_schema:

          type: tosca.datatypes.nfv.VersionDependency

      deployable_modules_in_constituent_vnf:

        type: map #key: node template name of a constituent VNF

        description: Indicates the selected deployable modules of a VNF instance which is a constituent of the NS instances created from this profile.

        entry_schema:

          type: tosca.datatypes.nfv.SelectedDeployableModules 

        constraints:

          - min_length: 1



  tosca.datatypes.nfv.Mask:

    derived_from: tosca.datatypes.Root
@@ -320,11 +327,29 @@ capability_types: 
  tosca.capabilities.nfv.Forwarding:

    derived_from: tosca.capabilities.Root



  tosca.capabilities.nfv.NsPaasServiceRequestable:

    derived_from: tosca.capabilities.Node

    description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.NsPaasServiceRequestsTo relationship type.



  tosca.capabilities.nfv.VirtualLinkCapabilityConfigurable:

    derived_from: tosca.capabilities.Node

    description: Indicates that the node that includes it can be pointed by a tosca.relationships.nfv.VirtualLinkCapabilityConfiguresTo relationship type.

	

relationship_types:

  tosca.relationships.nfv.ForwardTo:

    derived_from: tosca.relationships.Root

    valid_target_types: [ tosca.capabilities.nfv.Forwarding ]



  tosca.relationships.nfv.NsPaasServiceRequestsTo:

    derived_from: tosca.relationships.DependsOn

    description: Represents an association relationship between NsPaasServiceProfile or NsVirtualLinkAdditionalCapability and NsPaasServiceRequest node types 

    valid_target_types: [ tosca.capabilities.nfv.NsPaasServiceRequestable ]

    

  tosca.relationships.nfv.VirtualLinkCapabilityConfiguresTo:

    derived_from: tosca.relationships.DependsOn

    description: Represents an association relationship between NsVirtualLink and NsVirtualLinkAdditionalCapability node types 

    valid_target_types: [ tosca.capabilities.nfv.VirtualLinkCapabilityConfigurable ]

	

interface_types:

  tosca.interfaces.nfv.Nslcm:

    derived_from: tosca.interfaces.Root
@@ -452,6 +477,11 @@ node_types: 
          relationship: tosca.relationships.nfv.VirtualLinksTo

          node: tosca.nodes.nfv.NsVirtualLink

          occurrences: [ 0, 1 ]

      - associated_paas_service:

          capability: tosca.capabilities.nfv.AssociablePaasService

          relationship: tosca.relationships.nfv.PaasServiceAssociates

          node: tosca.nodes.nfv.NsPaasServiceProfile

          occurrences: [ 0, UNBOUNDED ]

    interfaces:

      Nslcm:

        type: tosca.interfaces.nfv.Nslcm
@@ -498,6 +528,17 @@ node_types: 
    capabilities:

      virtual_linkable:

        type: tosca.capabilities.nfv.VirtualLinkable

    requirements:

      - associated_paas_service:

          capability: tosca.capabilities.nfv.AssociablePaasService

          relationship: tosca.relationships.nfv.PaasServiceAssociates

          node: tosca.nodes.nfv.NsPaasServiceProfile

          occurrences: [ 0, UNBOUNDED ]

      - additional_capability:

          capability: tosca.capabilities.nfv.VirtualLinkCapabilityConfigurable

          relationship: tosca.relationships.nfv.VirtualLinkCapabilityConfiguresTo

          node: tosca.nodes.nfv.NsVirtualLinkAdditionalCapability

          occurrences: [ 0, UNBOUNDED ]



  tosca.nodes.nfv.NfpPositionElement:

    derived_from: tosca.nodes.Root
@@ -558,6 +599,91 @@ node_types: 
      - virtual_link:

          capability: tosca.capabilities.nfv.VirtualLinkable

          relationship: tosca.relationships.nfv.VirtualLinksTo

          occurrences: [0, 1]



  tosca.nodes.nfv.NsPaasServiceRequest:

    derived_from: tosca.nodes.Root

    description: describes the information about and requirements by the NS on the PaaS Services that the NS needs for its operation as specified in [2].

    properties:

      name:

        type: string

        description: Provides the human readable name of the requested PaaS Service.

        required: false

      is_mandatory:

        type: boolean

        description: Indicates whether the PaaS Service is mandatory for successful NS operation.

        required: true

        default: false

      type:

        type: string

        description: The type of PaaS Service.

        required: true

      min_version:

        type: string

        description: In the case the PaaS Service is versioned, it specifies the minimum version of the requested PaaS Service.

        required: false

      preferred_version:

        type: string

        description: In the case the PaaS Service is versioned, it specifies the preferred version of the requested PaaS Service.

        required: false

      usage_format:

        type: string

        description: Describes the usage format of the PaaS Service, as specified in [2].

        required: true

        constraints:

          - valid_values: [ vnf_common, vnf_dedicated, ns, undefined ]

      specific_parameters:

        type: map

        description: Provides attributes specific to the type of the PaaS Service. This property is reserved for future use in the present document.

        required: false

        entry_schema:

          type: string

    capabilities: 

      ns_paas_service_requesting:

        type: tosca.capabilities.nfv.NsPaasServiceRequestable

        occurrences: [ 1, UNBOUNDED ]

 

  tosca.nodes.nfv.NsPaasServiceProfile:

    derived_from: tosca.nodes.Root

    description: Describes how many instances of a PaaS Service is requested, as well as the dependencies between the NS constituents and the requested PaaS Service as defined in ETSI GS NFV-IFA 014.  

    properties:

      number_of_instances:

        type: integer

        description: Number of instances of the PaaS Service that is requested for this profile.

        required: true

        constraints:

          - greater_or_equal: 0

    requirements:

      - ns_paas_service_request:

          capability: tosca.capabilities.nfv.NsPaasServiceRequestable

          relationship: tosca.relationships.nfv.NsPaasServiceRequestsTo

          occurrences: [ 1, 1]

    capabilities:

      associable_paas_service:

        type: tosca.capabilities.nfv.AssociablePaasService

        occurrences: [ 1, UNBOUNDED ]

 

  tosca.nodes.nfv.NsVirtualLinkAdditionalCapability:

    derived_from: tosca.nodes.Root

    description: specifies additional capabilities and/or services for an NS VL.

    properties:

      capability_type:

        type: string

        description: Defines the type of VL additional capability.

        required: true

      capability_configurable_parameters:

        type: map

        description: Defines the configurable parameters related to the VL.

        required: false

        entry_schema: string

    capabilities:

      virtual_link_capability_configurable:

        type: tosca.capabilities.nfv.VirtualLinkCapabilityConfigurable

    requirements: 

      - ns_paas_service_request:

          capability: tosca.capabilities.nfv.NsPaasServiceRequestable

          relationship: tosca.relationships.nfv.NsPaasServiceRequestsTo

          occurrences: [ 0, 1]

 

group_types:

  tosca.groups.nfv.NsPlacementGroup:
@@ -592,7 +718,7 @@ policy_types: 
        required: true

        constraints:

          - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop, network_link_and_node, container_namespace, l2_network ]

    targets: [tosca.nodes.nfv.VNF, tosca.nodes.nfv.NsVirtualLink, tosca.nodes.nfv.NS, tosca.groups.nfv.NsPlacementGroup, tosca.nodes.nfv.Sap, tosca.nodes.nfv.Forwarding ]

    targets: [tosca.nodes.nfv.VNF, tosca.nodes.nfv.NsVirtualLink, tosca.nodes.nfv.NS, tosca.groups.nfv.NsPlacementGroup, tosca.nodes.nfv.Sap, tosca.nodes.nfv.Forwarding, tosca.nodes.nfv.NsPaasServiceRequest ]



  tosca.policies.nfv.NsAntiAffinityRule:

    derived_from: tosca.policies.Placement
@@ -604,7 +730,7 @@ policy_types: 
        required: true

        constraints:

          - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop, network_link_and_node, container_namespace, l2_network ]

    targets: [tosca.nodes.nfv.VNF, tosca.nodes.nfv.NsVirtualLink, tosca.nodes.nfv.NS, tosca.groups.nfv.NsPlacementGroup, tosca.nodes.nfv.Sap, tosca.nodes.nfv.Forwarding ]

    targets: [tosca.nodes.nfv.VNF, tosca.nodes.nfv.NsVirtualLink, tosca.nodes.nfv.NS, tosca.groups.nfv.NsPlacementGroup, tosca.nodes.nfv.Sap, tosca.nodes.nfv.Forwarding, tosca.nodes.nfv.NsPaasServiceRequest ]



  tosca.policies.nfv.NsSecurityGroupRule:

    derived_from: tosca.policies.nfv.Abstract.SecurityGroupRule
@@ -869,3 +995,20 @@ policy_types: 
        constraints:

          - valid_values: [ in, out, both ]

    targets: [ tosca.nodes.nfv.Forwarding, tosca.nodes.nfv.Sap ]

    

  tosca.policies.nfv.SapToDeployableModuleMapping:

    derived_from: tosca.policies.Root

    description: The SapToDeployableModuleMapping policy type is a policy type for defining how SAPs in an NSD relate to deployable modules of VNFs that are constituent of the NS defined by the NSD, or that are constituent of a nested NS of that NS as defined in ETSI GS NFV-IFA 014.

    properties:

      sap_to_depl_mod_mapping:

        type: map # name of the virtual_link requirement in the NS node. Only SAPs that map to connection points in the target node that are part of a deployable module have to be listed.

        description: Indicates the deployable modules to which the VduCpd exposed by a SAP belongs, each deployable module in an element of the list.

        required: true

        constraints:

          - min_length: 1

        entry_schema:

          type: list

          entry_schema: string

          constraints:

            - min_length: 1

    targets: [ tosca.nodes.nfv.NS, tosca.nodes.nfv.VNF ]

etsi_nfv_sol001_pnfd_types.yaml

+3 −3
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 pnfd types definitions version 4.4.1

description: ETSI NFV SOL 001 pnfd types definitions version 5.0.4

metadata:

  template_name: etsi_nfv_sol001_pnfd_types

  template_author: ETSI_NFV

  template_version: 4.4.1

  template_version: 5.0.4



imports:

     - etsi_nfv_sol001_common_types.yaml

etsi_nfv_sol001_vnfd_types.yaml

+421 −16

File changed.

Preview size limit exceeded, changes collapsed.