From 2f5fa31272f66939257417287488ecb47ca49a68 Mon Sep 17 00:00:00 2001 From: Vishwanath Jayaraman Date: Wed, 20 Apr 2016 15:55:23 -0500 Subject: [PATCH] Adds sample TOSCA VNFDs for EVP features This commit adds sample TOSCA VNFD template yaml files for specifying EVP features such as CPU pinning, Huge pages, vCPU topology and numa nodes. Change-Id: I43e09c9f141194a5d979c60594ffbcf68b5d2813 Closes-Bug: #1570693 --- .../sample-tosca-vnfd-cpu-dedicate.yaml | 37 +++++++++++++++ .../samples/sample-tosca-vnfd-hugepages.yaml | 36 +++++++++++++++ .../samples/sample-tosca-vnfd-numacount.yaml | 36 +++++++++++++++ .../samples/sample-tosca-vnfd-numadefine.yaml | 46 +++++++++++++++++++ devstack/samples/sample-tosca-vnfd-sriov.yaml | 46 +++++++++++++++++++ .../sample-tosca-vnfd-vcpu-topology.yaml | 39 ++++++++++++++++ 6 files changed, 240 insertions(+) create mode 100644 devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml create mode 100644 devstack/samples/sample-tosca-vnfd-hugepages.yaml create mode 100644 devstack/samples/sample-tosca-vnfd-numacount.yaml create mode 100644 devstack/samples/sample-tosca-vnfd-numadefine.yaml create mode 100644 devstack/samples/sample-tosca-vnfd-sriov.yaml create mode 100644 devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml diff --git a/devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml b/devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml new file mode 100644 index 000000000..623e390e0 --- /dev/null +++ b/devstack/samples/sample-tosca-vnfd-cpu-dedicate.yaml @@ -0,0 +1,37 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 + +description: Dedicated CPU example + +metadata: + template_name: sample-tosca-vnfd-cpu-dedicate + +topology_template: + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + disk_size: 10 GB + mem_size: 2048 MB + num_cpus: 2 + cpu_allocation: + cpu_affinity: dedicated + properties: + image: cirros-0.3.4-x86_64-uec + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net-mgmt + vendor: Tacker \ No newline at end of file diff --git a/devstack/samples/sample-tosca-vnfd-hugepages.yaml b/devstack/samples/sample-tosca-vnfd-hugepages.yaml new file mode 100644 index 000000000..2021b2b2d --- /dev/null +++ b/devstack/samples/sample-tosca-vnfd-hugepages.yaml @@ -0,0 +1,36 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 + +description: Huge Pages example + +metadata: + template_name: sample-tosca-vnfd-hugepages + +topology_template: + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + disk_size: 10 GB + mem_size: 2048 MB + num_cpus: 2 + mem_page_size: large + properties: + image: cirros-0.3.4-x86_64-uec + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net-mgmt + vendor: Tacker \ No newline at end of file diff --git a/devstack/samples/sample-tosca-vnfd-numacount.yaml b/devstack/samples/sample-tosca-vnfd-numacount.yaml new file mode 100644 index 000000000..598050cd7 --- /dev/null +++ b/devstack/samples/sample-tosca-vnfd-numacount.yaml @@ -0,0 +1,36 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 + +description: NUMA Node Count Input example + +metadata: + template_name: sample-tosca-vnfd-numacount + +topology_template: + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + disk_size: 10 GB + mem_size: 2048 MB + num_cpus: 2 + numa_node_count: 2 + properties: + image: cirros-0.3.4-x86_64-uec + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net-mgmt + vendor: Tacker \ No newline at end of file diff --git a/devstack/samples/sample-tosca-vnfd-numadefine.yaml b/devstack/samples/sample-tosca-vnfd-numadefine.yaml new file mode 100644 index 000000000..67d912c72 --- /dev/null +++ b/devstack/samples/sample-tosca-vnfd-numadefine.yaml @@ -0,0 +1,46 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 + +description: NUMA Node Define example + +metadata: + template_name: sample-tosca-vnfd-numadefine + +topology_template: + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + disk_size: 10 GB + mem_size: 4096 MB + num_cpus: 6 + numa_nodes: + node0: + id: 0 + vcpus: [0, 1] + mem_size: 1024 + node1: + id: 1 + vcpus: [2,3,4,5] + mem_size: 3072 + properties: + image: cirros-0.3.4-x86_64-uec + mgmt_driver: noop + availability_zone: nova + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net-mgmt + vendor: Tacker diff --git a/devstack/samples/sample-tosca-vnfd-sriov.yaml b/devstack/samples/sample-tosca-vnfd-sriov.yaml new file mode 100644 index 000000000..96cb2de51 --- /dev/null +++ b/devstack/samples/sample-tosca-vnfd-sriov.yaml @@ -0,0 +1,46 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 + +description: SR-IOV example + +metadata: + template_name: sample-tosca-vnfd-sriov + +topology_template: + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + properties: + image: ubuntu + flavor: numa-sriov + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + CP2: + type: tosca.nodes.nfv.CP.Tacker + properties: + type: sriov + requirements: + - virtualLink: + node: VL2 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net-mgmt + vendor: Tacker + + VL2: + type: tosca.nodes.nfv.VL + properties: + network_name: sr3010 + vendor: Tacker diff --git a/devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml b/devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml new file mode 100644 index 000000000..593b8fd71 --- /dev/null +++ b/devstack/samples/sample-tosca-vnfd-vcpu-topology.yaml @@ -0,0 +1,39 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 + +description: vCPU Topology example + +metadata: + template_name: sample-tosca-vnfd-vcpu-topology + +topology_template: + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + disk_size: 80 GB + mem_size: 4096 MB + num_cpus: 8 + cpu_allocation: + socket_count: 2 + thread_count: 2 + core_count: 2 + properties: + image: cirros-0.3.4-x86_64-uec + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: net-mgmt + vendor: Tacker \ No newline at end of file