Commit b3aae42a authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fixed exmples of VNFDs

parent 70e6b625

SOL002/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

+82 −101
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_2

description: "TST010 reference VNF-B"



imports:

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



metadata:

  descriptor_id: "VNF-B"

  vendor: "ETSI TST WG"

  version: "2.0"



node_types:

  tst010.vnf.simple:

    derived_from: tosca.nodes.nfv.VNF

    properties:

      descriptor_id:

        type: string

        default: VNF-B

      descriptor_version:

        type: string

        default: '1.0'

      provider:

        type: string

        default: ETSI TST WG

      product_name:

        type: string

        default: VNF-B

      software_version:

        type: string

        default: '1.0'

      product_info_name:

        type: string

        default: VNF-B

      product_info_description:

        type: string

        default: TST010 reference VNF-B

      flavour_id:

        type: string

        default: VNF-B_flavor

      flavour_description:

        type: string

        default: "VNF-B flavor"

      vnfm_info:

        type: list

        entry_schema:

          type: string

          default: [ 'etsivnfm:v2.3.1' ]

    interfaces:

      Vnflcm:

        type: "tosca.interfaces.nfv.Vnflcm"

        scale:

          description: Invoked upon receipt of a Scale VNF request

        terminate:

          description: Invoked upon receipt Terminate VNF request

        operate:

          description: Invoked upon receipt of an Operate VNF request



topology_template:

  substitution_mappings:

    node_type: "tosca.nodes.nfv.VNF"

    node_type: "tst010.vnf.simple"

    requirements:

      virtual_link_right:

        [right, virtual_link_right]

      virtual_link_management:

        [management, virtual_link_management]

      virtual_link_left:

        [left, virtual_link_left]

      virtual_link_right:

        [right, virtual_link_right]

  node_templates:

    right:

      type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template: 
        order: 1

      requirements:

        virtual_link_right:

        virtual_binding: VDU-B-2

        virtual_binding: VDU-B

    management:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 0

      requirements:

        virtual_link_management:

        virtual_binding: VDU-B-1

        virtual_binding: VDU-B

    left:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 2

      requirements:

        virtual_link_left:

        virtual_binding: VDU-B-1

    internal_vl:

      type: "tosca.nodes.nfv.VnfVirtualLink"

      properties:

        connectivity_type:

          layer_protocols: [ ipv4 ]

        description: Internal Virtual link in the VNF

        vl_profile:

          max_bitrate_requirements:

            root: 100000

            leaf: 20000

          min_bitrate_requirements:

            root: 10000

            leaf: 10000

    internal_vdu_b_1_cp:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 2

      requirements:

        - virtual_binding: VDU-B-1

        - virtual_link: internal_vl

    internal_vdu_b_2_cp:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 0

      requirements:

        - virtual_binding: VDU-B-2

        - virtual_link: internal_vl

    vdu_b_1_vsd:

        virtual_binding: VDU-B

    vdu-b-1-vsd:

      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

      properties:

        virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template: 
          min-disk: '1'

          min-ram: '2'

          size: '1'

      artifacts:

        sw_image:

          type: "tosca.artifacts.nfv.SwImage"

          file: vdu-b-1.qcow2

    vdu_b_2_vsd:

      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

      properties:

        virtual_block_storage_data:

          size_of_storage: 20

          rdma_enabled: false

        sw_image_data:

          name: "vdu-b-2 image"

          version: "1.1"

          checksum: 

            algorithm: "sha-224"

            hash: "somehashfortst010"

          container_format: "bare"

          disk-format: qcow2

          min-disk: '1'

          min-ram: '2'

          size: '1'

      artifacts:

        sw_image:

          type: tosca.artifacts.nfv.SwImage

          file: vdu-b-2.qcow2

    vnf_b_1_VNF:

      type: "tosca.nodes.nfv.VNF"

      properties:

        descriptor_id: "VNF-B-2VDUs"

        descriptor_version: "2.0"

        provider: "ETSI TST WG"

        product_name: "VNF-B-2VDUs"

        software_version: "2.0"

        product_info_name: "VNF-B-2VDUs"

        product_info_description: "TST010 reference VNF-B with 2 VDUs"

        flavour_id: "VNF-B-2VDU_flavor"

        flavour_description: "VNF-B with 2 VDUs flavor"

        vnfm_info: 

          etsivnfm: 

          - v2.3.1 

        interfaces:

            Vnflcm:

              scale:

                implementation: scale-example.yaml

              terminate:

                implementation: terminate-example.yaml

              operate:

                implementation: operate-example.yaml

    VDU_B_1:

    VDU-B:

      type: "tosca.nodes.nfv.Vdu.Compute"

      properties:

        name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template: 
      requirements:

        virtual_storage:

        - "vdu-b-1-vsd"

    VDU_B_2:

      type: "tosca.nodes.nfv.Vdu.Compute"

    vnf-b-1_VNF:

      type: "tst010.vnf.simple"

      properties:

        name: "vdu-b-2-vcd"

        descriptor: "Description of VDU-B-2"

        vdu_profile:

          min_number_of_instances: 1

          max_number_of_instances: 4

      capabilities:

        virtual_compute:

          properties:

            virtual_memory:

              virtual_mem_size: 6144

              numa_enabled: false

            virtual_cpu:

              num_virtual_cpu: 2

      requirements:

        virtual_storage:

        - "vdu-b-2-vsd"                
 No newline at end of file
 
        descriptor_id: "VNF-B"

        descriptor_version: "2.0"

        provider: "ETSI TST WG"

        product_name: "VDU_VNF-B"

        software_version: "2.0"

        product_info_name: "VDU_VNF-B"

        product_info_description: "TST010 reference VNF-A"

        flavour_id: "VNF-B_flavor"

        flavour_description: "VNF-B flavor"

        vnfm_info: 

          - etsivnfm:v2.3.1 

      interfaces:

        Vnflcm:

          type: "tosca.interfaces.nfv.Vnflcm"

          scale:

            implementation: scale-example.yaml

          terminate:

            implementation: terminate-example.yaml

          operate:

            implementation: operate-example.yaml

SOL002/VNFLifecycleManagement-API/environment/variables.txt

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ ${descriptorType} SOL006 
${check_multiple_instances}    0



${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VNF}    tosca.nodes.nfv.VNF

${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage

SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

+82 −101
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_2

description: "TST010 reference VNF-B"



imports:

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



metadata:

  descriptor_id: "VNF-B"

  vendor: "ETSI TST WG"

  version: "2.0"



node_types:

  tst010.vnf.simple:

    derived_from: tosca.nodes.nfv.VNF

    properties:

      descriptor_id:

        type: string

        default: VNF-B

      descriptor_version:

        type: string

        default: '1.0'

      provider:

        type: string

        default: ETSI TST WG

      product_name:

        type: string

        default: VNF-B

      software_version:

        type: string

        default: '1.0'

      product_info_name:

        type: string

        default: VNF-B

      product_info_description:

        type: string

        default: TST010 reference VNF-B

      flavour_id:

        type: string

        default: VNF-B_flavor

      flavour_description:

        type: string

        default: "VNF-B flavor"

      vnfm_info:

        type: list

        entry_schema:

          type: string

          default: [ 'etsivnfm:v2.3.1' ]

    interfaces:

      Vnflcm:

        type: "tosca.interfaces.nfv.Vnflcm"

        scale:

          description: Invoked upon receipt of a Scale VNF request

        terminate:

          description: Invoked upon receipt Terminate VNF request

        operate:

          description: Invoked upon receipt of an Operate VNF request



topology_template:

  substitution_mappings:

    node_type: "tosca.nodes.nfv.VNF"

    node_type: "tst010.vnf.simple"

    requirements:

      virtual_link_right:

        [right, virtual_link_right]

      virtual_link_management:

        [management, virtual_link_management]

      virtual_link_left:

        [left, virtual_link_left]

      virtual_link_right:

        [right, virtual_link_right]

  node_templates:

    right:

      type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template: 
        order: 1

      requirements:

        virtual_link_right:

        virtual_binding: VDU-B-2

        virtual_binding: VDU-B

    management:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 0

      requirements:

        virtual_link_management:

        virtual_binding: VDU-B-1

        virtual_binding: VDU-B

    left:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 2

      requirements:

        virtual_link_left:

        virtual_binding: VDU-B-1

    internal_vl:

      type: "tosca.nodes.nfv.VnfVirtualLink"

      properties:

        connectivity_type:

          layer_protocols: [ ipv4 ]

        description: Internal Virtual link in the VNF

        vl_profile:

          max_bitrate_requirements:

            root: 100000

            leaf: 20000

          min_bitrate_requirements:

            root: 10000

            leaf: 10000

    internal_vdu_b_1_cp:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 2

      requirements:

        - virtual_binding: VDU-B-1

        - virtual_link: internal_vl

    internal_vdu_b_2_cp:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 0

      requirements:

        - virtual_binding: VDU-B-2

        - virtual_link: internal_vl

    vdu_b_1_vsd:

        virtual_binding: VDU-B

    vdu-b-1-vsd:

      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

      properties:

        virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template: 
          min-disk: '1'

          min-ram: '2'

          size: '1'

      artifacts:

        sw_image:

          type: "tosca.artifacts.nfv.SwImage"

          file: vdu-b-1.qcow2

    vdu_b_2_vsd:

      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

      properties:

        virtual_block_storage_data:

          size_of_storage: 20

          rdma_enabled: false

        sw_image_data:

          name: "vdu-b-2 image"

          version: "1.1"

          checksum: 

            algorithm: "sha-224"

            hash: "somehashfortst010"

          container_format: "bare"

          disk-format: qcow2

          min-disk: '1'

          min-ram: '2'

          size: '1'

      artifacts:

        sw_image:

          type: tosca.artifacts.nfv.SwImage

          file: vdu-b-2.qcow2

    vnf_b_1_VNF:

      type: "tosca.nodes.nfv.VNF"

      properties:

        descriptor_id: "VNF-B-2VDUs"

        descriptor_version: "2.0"

        provider: "ETSI TST WG"

        product_name: "VNF-B-2VDUs"

        software_version: "2.0"

        product_info_name: "VNF-B-2VDUs"

        product_info_description: "TST010 reference VNF-B with 2 VDUs"

        flavour_id: "VNF-B-2VDU_flavor"

        flavour_description: "VNF-B with 2 VDUs flavor"

        vnfm_info: 

          etsivnfm: 

          - v2.3.1 

        interfaces:

            Vnflcm:

              scale:

                implementation: scale-example.yaml

              terminate:

                implementation: terminate-example.yaml

              operate:

                implementation: operate-example.yaml

    VDU_B_1:

    VDU-B:

      type: "tosca.nodes.nfv.Vdu.Compute"

      properties:

        name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template: 
      requirements:

        virtual_storage:

        - "vdu-b-1-vsd"

    VDU_B_2:

      type: "tosca.nodes.nfv.Vdu.Compute"

    vnf-b-1_VNF:

      type: "tst010.vnf.simple"

      properties:

        name: "vdu-b-2-vcd"

        descriptor: "Description of VDU-B-2"

        vdu_profile:

          min_number_of_instances: 1

          max_number_of_instances: 4

      capabilities:

        virtual_compute:

          properties:

            virtual_memory:

              virtual_mem_size: 6144

              numa_enabled: false

            virtual_cpu:

              num_virtual_cpu: 2

      requirements:

        virtual_storage:

        - "vdu-b-2-vsd"                
 No newline at end of file
 
        descriptor_id: "VNF-B"

        descriptor_version: "2.0"

        provider: "ETSI TST WG"

        product_name: "VDU_VNF-B"

        software_version: "2.0"

        product_info_name: "VDU_VNF-B"

        product_info_description: "TST010 reference VNF-A"

        flavour_id: "VNF-B_flavor"

        flavour_description: "VNF-B flavor"

        vnfm_info: 

          - etsivnfm:v2.3.1 

      interfaces:

        Vnflcm:

          type: "tosca.interfaces.nfv.Vnflcm"

          scale:

            implementation: scale-example.yaml

          terminate:

            implementation: terminate-example.yaml

          operate:

            implementation: operate-example.yaml

SOL003/VNFLifecycleManagement-API/environment/variables.txt

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ ${descriptorType} SOL001 
${check_descriptors}	1



${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute

${tosca_type_VNF}    tosca.nodes.nfv.VNF

${tosca_type_VNF}    tst010.vnf.simple    # custom tosca type defined in the descriptor vnfd_SOL001.yaml in descriptors folder

${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink

${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp

${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage

SOL003/VNFLifecycleOperationGranting-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

+82 −101
Original line number Diff line number Diff line 
tosca_definitions_version: tosca_simple_yaml_1_2

description: "TST010 reference VNF-B"



imports:

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



metadata:

  descriptor_id: "VNF-B"

  vendor: "ETSI TST WG"

  version: "2.0"



node_types:

  tst010.vnf.simple:

    derived_from: tosca.nodes.nfv.VNF

    properties:

      descriptor_id:

        type: string

        default: VNF-B

      descriptor_version:

        type: string

        default: '1.0'

      provider:

        type: string

        default: ETSI TST WG

      product_name:

        type: string

        default: VNF-B

      software_version:

        type: string

        default: '1.0'

      product_info_name:

        type: string

        default: VNF-B

      product_info_description:

        type: string

        default: TST010 reference VNF-B

      flavour_id:

        type: string

        default: VNF-B_flavor

      flavour_description:

        type: string

        default: "VNF-B flavor"

      vnfm_info:

        type: list

        entry_schema:

          type: string

          default: [ 'etsivnfm:v2.3.1' ]

    interfaces:

      Vnflcm:

        type: "tosca.interfaces.nfv.Vnflcm"

        scale:

          description: Invoked upon receipt of a Scale VNF request

        terminate:

          description: Invoked upon receipt Terminate VNF request

        operate:

          description: Invoked upon receipt of an Operate VNF request



topology_template:

  substitution_mappings:

    node_type: "tosca.nodes.nfv.VNF"

    node_type: "tst010.vnf.simple"

    requirements:

      virtual_link_right:

        [right, virtual_link_right]

      virtual_link_management:

        [management, virtual_link_management]

      virtual_link_left:

        [left, virtual_link_left]

      virtual_link_right:

        [right, virtual_link_right]

  node_templates:

    right:

      type: "tosca.nodes.nfv.VduCp"
@@ -21,49 +72,22 @@ topology_template: 
        order: 1

      requirements:

        virtual_link_right:

        virtual_binding: VDU-B-2

        virtual_binding: VDU-B

    management:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 0

      requirements:

        virtual_link_management:

        virtual_binding: VDU-B-1

        virtual_binding: VDU-B

    left:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 2

      requirements:

        virtual_link_left:

        virtual_binding: VDU-B-1

    internal_vl:

      type: "tosca.nodes.nfv.VnfVirtualLink"

      properties:

        connectivity_type:

          layer_protocols: [ ipv4 ]

        description: Internal Virtual link in the VNF

        vl_profile:

          max_bitrate_requirements:

            root: 100000

            leaf: 20000

          min_bitrate_requirements:

            root: 10000

            leaf: 10000

    internal_vdu_b_1_cp:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 2

      requirements:

        - virtual_binding: VDU-B-1

        - virtual_link: internal_vl

    internal_vdu_b_2_cp:

      type: "tosca.nodes.nfv.VduCp"

      properties:

        order: 0

      requirements:

        - virtual_binding: VDU-B-2

        - virtual_link: internal_vl

    vdu_b_1_vsd:

        virtual_binding: VDU-B

    vdu-b-1-vsd:

      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

      properties:

        virtual_block_storage_data:
@@ -80,55 +104,7 @@ topology_template: 
          min-disk: '1'

          min-ram: '2'

          size: '1'

      artifacts:

        sw_image:

          type: "tosca.artifacts.nfv.SwImage"

          file: vdu-b-1.qcow2

    vdu_b_2_vsd:

      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"

      properties:

        virtual_block_storage_data:

          size_of_storage: 20

          rdma_enabled: false

        sw_image_data:

          name: "vdu-b-2 image"

          version: "1.1"

          checksum: 

            algorithm: "sha-224"

            hash: "somehashfortst010"

          container_format: "bare"

          disk-format: qcow2

          min-disk: '1'

          min-ram: '2'

          size: '1'

      artifacts:

        sw_image:

          type: tosca.artifacts.nfv.SwImage

          file: vdu-b-2.qcow2

    vnf_b_1_VNF:

      type: "tosca.nodes.nfv.VNF"

      properties:

        descriptor_id: "VNF-B-2VDUs"

        descriptor_version: "2.0"

        provider: "ETSI TST WG"

        product_name: "VNF-B-2VDUs"

        software_version: "2.0"

        product_info_name: "VNF-B-2VDUs"

        product_info_description: "TST010 reference VNF-B with 2 VDUs"

        flavour_id: "VNF-B-2VDU_flavor"

        flavour_description: "VNF-B with 2 VDUs flavor"

        vnfm_info: 

          etsivnfm: 

          - v2.3.1 

        interfaces:

            Vnflcm:

              scale:

                implementation: scale-example.yaml

              terminate:

                implementation: terminate-example.yaml

              operate:

                implementation: operate-example.yaml

    VDU_B_1:

    VDU-B:

      type: "tosca.nodes.nfv.Vdu.Compute"

      properties:

        name: "vdu-b-1-vcd"
@@ -147,22 +123,27 @@ topology_template: 
      requirements:

        virtual_storage:

        - "vdu-b-1-vsd"

    VDU_B_2:

      type: "tosca.nodes.nfv.Vdu.Compute"

    vnf-b-1_VNF:

      type: "tst010.vnf.simple"

      properties:

        name: "vdu-b-2-vcd"

        descriptor: "Description of VDU-B-2"

        vdu_profile:

          min_number_of_instances: 1

          max_number_of_instances: 4

      capabilities:

        virtual_compute:

          properties:

            virtual_memory:

              virtual_mem_size: 6144

              numa_enabled: false

            virtual_cpu:

              num_virtual_cpu: 2

      requirements:

        virtual_storage:

        - "vdu-b-2-vsd"                
 No newline at end of file
 
        descriptor_id: "VNF-B"

        descriptor_version: "2.0"

        provider: "ETSI TST WG"

        product_name: "VDU_VNF-B"

        software_version: "2.0"

        product_info_name: "VDU_VNF-B"

        product_info_description: "TST010 reference VNF-A"

        flavour_id: "VNF-B_flavor"

        flavour_description: "VNF-B flavor"

        vnfm_info: 

          - etsivnfm:v2.3.1 

      interfaces:

        Vnflcm:

          type: "tosca.interfaces.nfv.Vnflcm"

          scale:

            implementation: scale-example.yaml

          terminate:

            implementation: terminate-example.yaml

          operate:

            implementation: operate-example.yaml