Commit 2fb4f373 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_common_types.yaml
- /etsi_nfv_sol001_nsd_types.yaml
parent dafc69e2

etsi_nfv_sol001_common_types.yaml

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

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 common types definitions version 5.0.4

description: ETSI NFV SOL 001 common types definitions version 5.1.4

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: 5.0.4

  template_version: 5.1.4





data_types:

data_types:

  tosca.datatypes.nfv.L2AddressData:

  tosca.datatypes.nfv.L2AddressData:
@@ -167,7 +167,7 @@ data_types: 
        description: Indicates the selected deployable module(s) for the VNF instances created from this profile.    

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

        required: false

        required: false

      vdu_capacity-overriding-allowed:

      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.

        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.

        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

        required: false

        entry-schema:

        entry-schema:
@@ -209,7 +209,7 @@ data_types: 
       description: Identifies a performance metric to be monitored, according to ETSI GS NFV-IFA 027. 

       description: Identifies a performance metric to be monitored, according to ETSI GS NFV-IFA 027. 

       required: true

       required: true

       constraints:

       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, 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 ] 

        - 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, energy_consumption_vnf, energy_consumption_mean_vnf ] 

      collection_period:

      collection_period:

       type: scalar-unit.time

       type: scalar-unit.time

       description: Describes the periodicity at which to collect the performance information. 

       description: Describes the periodicity at which to collect the performance information.
@@ -344,6 +344,12 @@ node_types: 
            - valid_values: [ cp, dp, mp, mp_external ]

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

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

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

        required: false

        required: false

      domain_name:

        type: list

        description: Provides information on the domain names to be applied to the CP. 

        required: false

        entry_schema:

          type: tosca.datatypes.nfv.DomainNameData





policy_types:

policy_types:

  tosca.policies.nfv.Abstract.SecurityGroupRule:

  tosca.policies.nfv.Abstract.SecurityGroupRule:

etsi_nfv_sol001_nsd_types.yaml

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

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 nsd types definitions version 5.0.4

description: ETSI NFV SOL 001 nsd types definitions version 5.1.4

metadata:

metadata:

  template_name: etsi_nfv_sol001_nsd_types

  template_name: etsi_nfv_sol001_nsd_types

  template_author: ETSI_NFV

  template_author: ETSI_NFV

  template_version: 5.0.4

  template_version: 5.1.4





imports:

imports:

     - etsi_nfv_sol001_common_types.yaml

     - etsi_nfv_sol001_common_types.yaml
@@ -135,7 +135,7 @@ data_types: 
        description: Identifies a performance metric to be monitored, according to ETSI GS NFV-IFA 027. 

        description: Identifies a performance metric to be monitored, according to ETSI GS NFV-IFA 027. 

        required: true

        required: true

        constraints:

        constraints:

           - valid_values: [byte_incoming_sap, byte_outgoing_sap, packet_incoming_sap, packet_outgoing_sap, byte_incoming, byte_outgoing, packet_incoming, packet_outgoing ] 

           - valid_values: [byte_incoming_sap, byte_outgoing_sap, packet_incoming_sap, packet_outgoing_sap, byte_incoming, byte_outgoing, packet_incoming, packet_outgoing, energy_consumption_ns, energy_consumption_mean_ns ] 

      collection_period:  

      collection_period:  

        type: scalar-unit.time

        type: scalar-unit.time

        description: Describes the periodicity at which to collect the performance information.

        description: Describes the periodicity at which to collect the performance information.

etsi_nfv_sol001_pnfd_types.yaml

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

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 pnfd types definitions version 5.0.4

description: ETSI NFV SOL 001 pnfd types definitions version 5.1.4

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: 5.0.4

  template_version: 5.1.4





imports:

imports:

     - etsi_nfv_sol001_common_types.yaml

     - etsi_nfv_sol001_common_types.yaml

etsi_nfv_sol001_vnfd_types.yaml

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

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 vnfd types definitions version 5.0.4

description: ETSI NFV SOL 001 vnfd types definitions version 5.1.4

metadata:

metadata:

  template_name: etsi_nfv_sol001_vnfd_types

  template_name: etsi_nfv_sol001_vnfd_types

  template_author: ETSI_NFV

  template_author: ETSI_NFV

  template_version: 5.0.4

  template_version: 5.1.4





imports:

imports:

   - etsi_nfv_sol001_common_types.yaml

   - etsi_nfv_sol001_common_types.yaml
@@ -180,7 +180,7 @@ data_types: 
       description: Maximum number of instances of the VNFC based on this Vdu.Compute (for VM based VDU) or Vdu.OsContainerDeployableUnit node (for Oscontainer based VDU) that is permitted to exist for a particular VNF deployment flavour. 

       description: Maximum number of instances of the VNFC based on this Vdu.Compute (for VM based VDU) or Vdu.OsContainerDeployableUnit node (for Oscontainer based VDU) that is permitted to exist for a particular VNF deployment flavour. 

       required: true

       required: true

       constraints:

       constraints:

         - greater_or_equal: 0

         - greater_than: 0

     nfvi_maintenance_info:

     nfvi_maintenance_info:

       type: tosca.datatypes.nfv.NfviMaintenanceInfo

       type: tosca.datatypes.nfv.NfviMaintenanceInfo

       description: Provides information on the impact tolerance and rules to be observed when instance(s) of the Vdu.Compute (for VM based VDU) are impacted during NFVI operation and maintenance (e.g. NFVI resource upgrades). 

       description: Provides information on the impact tolerance and rules to be observed when instance(s) of the Vdu.Compute (for VM based VDU) are impacted during NFVI operation and maintenance (e.g. NFVI resource upgrades).
@@ -567,7 +567,7 @@ data_types: 




  tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:

  tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:

   derived_from: tosca.datatypes.Root

   derived_from: tosca.datatypes.Root

   description: is an empty base type for deriving data types for describing VNF-specific metadata

   description: is an empty base type for deriving data types for describing VNF-specific metadata, like information about supported protocols and data models for configuring the VNF.





  tosca.datatypes.nfv.LogicalNodeData:

  tosca.datatypes.nfv.LogicalNodeData:

   derived_from: tosca.datatypes.Root

   derived_from: tosca.datatypes.Root
@@ -2113,13 +2113,18 @@ node_types: 
        description: Specifies the encapsulation type for the traffics coming in and out of the trunk subport.

        description: Specifies the encapsulation type for the traffics coming in and out of the trunk subport.

        required: false

        required: false

        constraints:

        constraints:

          - valid_values: [ vlan, inherit ]

          - valid_values: [ vlan, inherit, vxlan, nvgre ]

      segmentation_id:

      segmentation_id:

        type: integer

        type: integer

        description: Specifies the segmentation ID for the subport, which is used to differentiate the traffics on different networks coming in and out of the trunk port.

        description: Specifies the segmentation ID for the subport, which is used to differentiate the traffics on different networks coming in and out of the trunk port.

        required: false

        required: false

        constraints:

        constraints:

          - greater_or_equal: 0

          - greater_or_equal: 0

      is_automatic_discovery:

        type: boolean

        description: Indicates if additional parameters are exchanged through the use of a routing protocol.

        required: false

        default: false

    requirements:

    requirements:

      - trunk_binding:

      - trunk_binding:

          capability: tosca.capabilities.nfv.TrunkBindable

          capability: tosca.capabilities.nfv.TrunkBindable