Commit c1657dc0 authored by Laurent Vreck's avatar Laurent Vreck
Browse files

Update etsi_nfv_sol001_common_types.yaml, etsi_nfv_sol001_nsd_types.yaml,... 

Update etsi_nfv_sol001_common_types.yaml, etsi_nfv_sol001_nsd_types.yaml, etsi_nfv_sol001_pnfd_types.yaml, etsi_nfv_sol001_vnfd_types.yaml files
parent ac6deaaf

etsi_nfv_sol001_common_types.yaml

+12 −4
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_2

description: ETSI NFV SOL 001 common types definitions version 2.8.1

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 common types definitions version 3.3.1

metadata:

  template_name: etsi_nfv_sol001_common_types

  template_author: ETSI_NFV

  template_version: 2.8.1

  template_version: 3.3.1



data_types:

  tosca.datatypes.nfv.L2AddressData:
@@ -29,7 +29,7 @@ data_types: 
        required: true

      ip_address_type:

        type: string

        description: Defines address type. The address type should be aligned with the address type supported by the layer_protocols properties of the connection point

        description: Defines address type. The address type should be aligned with the address type supported by the layer_protocols properties of the connetion point

        required: false

        constraints:

          - valid_values: [ ipv4, ipv6 ]
@@ -132,6 +132,12 @@ data_types: 
        required: true

        constraints:

          - greater_or_equal: 0

      service_availability_level:

        type: integer

        description: Specifies the service availability level for the VNF instance created from this profile.

        required: false

        constraints:

          - greater_or_equal: 1



  tosca.datatypes.nfv.Qos:

    derived_from: tosca.datatypes.Root
@@ -273,3 +279,5 @@ policy_types: 
          - greater_or_equal: 0

          - less_or_equal: 65535

        default: 65535

etsi_nfv_sol001_nsd_types.yaml

+63 −65
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_2

description: ETSI NFV SOL 001 nsd types definitions version 2.8.1

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 nsd types definitions version 3.3.1

metadata:

  template_name: etsi_nfv_sol001_nsd_types

  template_author: ETSI_NFV

  template_version: 2.8.1

  template_version: 3.3.1



imports:

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_common_types.yaml

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_vnfd_types.yaml

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_pnfd_types.yaml

     # editor's note: During the development of the SOL001ed281 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

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.3.1/etsi_nfv_sol001_common_types.yaml

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.3.1/etsi_nfv_sol001_vnfd_types.yaml

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.3.1/etsi_nfv_sol001_pnfd_types.yaml





data_types:

  tosca.datatypes.nfv.ServiceAvailability:

    derived_from: tosca.datatypes.Root

    description: service availability 

    properties:

      level:

        type: string

        description: service availability levels

        required: true

        constraints:

          - valid_values: [ level1, level2, level3 ]



  tosca.datatypes.nfv.NsVlProfile:

    derived_from: tosca.datatypes.Root

    description: Describes additional instantiation data for a given NsVirtualLink used in a specific NS deployment flavour.
@@ -40,10 +28,12 @@ data_types: 
        type: tosca.datatypes.nfv.NsVirtualLinkQos

        description: Specifies the QoS requirements of a VL instantiated according to this profile.

        required: false

      service_availability:

        type: tosca.datatypes.nfv.ServiceAvailability

        description: Network service virtual link service availability levels, as described in ETSI GS NFV-REL 001

      service_availability_level:

        type: integer

        description: Specifies the service availability level for the VL instance created from this profile

        required: false 

        constraints:

          - greater_or_equal: 1



  tosca.datatypes.nfv.NsVirtualLinkQos:

    derived_from: tosca.datatypes.nfv.Qos
@@ -134,6 +124,7 @@ interface_types: 
  tosca.interfaces.nfv.Nslcm:

    derived_from: tosca.interfaces.Root

    description: This interface encompasses a set of TOSCA operations corresponding to NS LCM operations defined in ETSI GS NFV-IFA 013. as well as to preamble and postamble procedures to the execution of the NS LCM operations.

    operations:

      instantiate_start:

        description: Preamble to execution of the instantiate operation

      instantiate:
@@ -209,6 +200,12 @@ node_types: 
        type: tosca.datatypes.nfv.NsProfile

        description: Specifies a profile of a NS, when this NS is used as nested NS within another NS.

        required: false

      service_availability_level:

        type: integer

        description: Specifies the service availability level for the NS instance.

        required: false

        constraints:

          - greater_or_equal: 1

    requirements:

      - virtual_link:

          capability: tosca.capabilities.nfv.VirtualLinkable
@@ -353,7 +350,7 @@ policy_types: 
        description: Specifies the scope of the local affinity rule.

        required: true

        constraints:

          - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ]

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

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



  tosca.policies.nfv.NsAntiAffinityRule:
@@ -365,7 +362,7 @@ policy_types: 
        description: Specifies the scope of the local affinity rule..

        required: true

        constraints:

          - valid_values: [ nfvi_node, zone, zone_group, nfvi_pop ]

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

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



  tosca.policies.nfv.NsSecurityGroupRule:
@@ -460,3 +457,4 @@ policy_types: 
        constraints:

          - min_length: 1

    targets: [ tosca.nodes.nfv.VNF ]

etsi_nfv_sol001_pnfd_types.yaml

+7 −7
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_2

description: ETSI NFV SOL 001 pnfd types definitions version 2.8.1

tosca_definitions_version: tosca_simple_yaml_1_3

description: ETSI NFV SOL 001 pnfd types definitions version 3.3.1

metadata:

  template_name: etsi_nfv_sol001_pnfd_types

  template_author: ETSI_NFV

  template_version: 2.8.1

  template_version: 3.3.1



imports:

     - https://forge.etsi.org/rep/nfv/SOL001/raw/v2.8.1/etsi_nfv_sol001_common_types.yaml

     # editor's note: During the development of the SOL001ed281 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



     - https://forge.etsi.org/rep/nfv/SOL001/raw/v3.3.1/etsi_nfv_sol001_common_types.yaml



data_types:

  tosca.datatypes.nfv.LocationInfo:
@@ -45,7 +43,7 @@ data_types: 


  tosca.datatypes.nfv.GeographicCoordinates:

    derived_from: tosca.datatypes.Root

    description: Represents an element of a geographic coordinate location as specified in IETF RFC?6225 [21]. 

    description: Represents an element of a geographic coordinate location as specified in IETF RFC?6225. 

    properties:

      latitude_uncertainty:

        type: string # RFC 6225
@@ -76,6 +74,8 @@ data_types: 
        description: Altitude value as per RFC 6225

        required: true







node_types:

  tosca.nodes.nfv.PNF:

    derived_from: tosca.nodes.Root

etsi_nfv_sol001_vnfd_types.yaml

+407 −134

File changed.

Preview size limit exceeded, changes collapsed.