Add cli option framesize for router 09/66609/4
authorJohn O Loughlin <john.oloughlin@intel.com>
Thu, 24 Jan 2019 10:18:08 +0000 (10:18 +0000)
committerJohn O'Loughlin <john.oloughlin@intel.com>
Wed, 30 Jan 2019 17:09:24 +0000 (17:09 +0000)
Remove any duplicated testcases
Default framesize to 64B: 100

JIRA: YARDSTICK-1554

Change-Id: I793cead17bc98c2487ca010a6639850bea5d7991
Signed-off-by: John O Loughlin <john.oloughlin@intel.com>
58 files changed:
samples/vnf_samples/nsut/router/tc_baremetal_rfc2544_ipv4_1flow_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml with 88% similarity]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports.yaml [moved from samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_256B.yaml with 94% similarity]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1024B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1280B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_128B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1518B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_512B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_64B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports.yaml [moved from samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1024B.yaml with 95% similarity]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1280B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_128B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1518B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_256B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_512B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_64B.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1024B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1280B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_128B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1518B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_256B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_64B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_512B_trex.yaml with 95% similarity]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1024B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1280B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1518B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_256B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_512B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_64B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_128B_trex.yaml with 94% similarity]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1280B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_128B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1518B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_256B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_512B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_64B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1024B_trex.yaml with 96% similarity]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1024B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1280B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_128B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_256B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_512B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_64B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1518B_trex.yaml with 95% similarity]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_6ports_1518B_trex.yaml
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1024B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1280B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_128B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1518B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_256B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_512B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_64B_trex.yaml with 93% similarity]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1280B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_128B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1518B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_256B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_512B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_64B_trex.yaml [deleted file]
samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_trex.yaml [moved from samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1024B_trex.yaml with 95% similarity]

@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -23,8 +23,8 @@ scenarios:
     vnf__0: vnf.yardstick
   options:
     framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26'
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: compute_0.compute_nodes
   options:
     framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '10.0.2.26-10.0.2.105'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1024B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1024B.yaml
deleted file mode 100644 (file)
index 5b268d0..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c2p
-     flavor:
-      vcpus: 5
-      ram: 20480
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 5
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 1
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_mem.0: 20480
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1280B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1280B.yaml
deleted file mode 100644 (file)
index 20305df..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c2p
-     flavor:
-      vcpus: 5
-      ram: 20480
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 5
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 1
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_mem.0: 20480
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_128B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_128B.yaml
deleted file mode 100644 (file)
index 73459c3..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c2p
-     flavor:
-      vcpus: 5
-      ram: 20480
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 5
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 1
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_mem.0: 20480
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1518B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_1518B.yaml
deleted file mode 100644 (file)
index fb7f48a..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 2
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c2p
-     flavor:
-      vcpus: 5
-      ram: 20480
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 5
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 1
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_mem.0: 20480
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_512B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_512B.yaml
deleted file mode 100644 (file)
index bb17eb4..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c2p
-     flavor:
-      vcpus: 5
-      ram: 20480
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 5
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 1
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_mem.0: 20480
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_64B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_5cores_2ports_64B.yaml
deleted file mode 100644 (file)
index 0726e10..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c2p
-     flavor:
-      vcpus: 5
-      ram: 20480
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 5
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 1
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_mem.0: 20480
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: compute_0.compute_nodes
   options:
     framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '10.0.2.26-10.0.2.105'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1280B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1280B.yaml
deleted file mode 100644 (file)
index be08b5b..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-        - '10.0.4.26-10.0.4.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-        - '10.0.5.26-10.0.5.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod_4p.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c4p
-     flavor:
-      vcpus: 9
-      ram: 8192
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 9
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 2
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_cpus.1: 5,6,7,8
-        hw:numa_mem.0: 4096
-        hw:numa_mem.1: 4096
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe2:
-         cidr: '10.0.4.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant4
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe3:
-         cidr: '10.0.5.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant5
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_128B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_128B.yaml
deleted file mode 100644 (file)
index afc4a68..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-        - '10.0.4.26-10.0.4.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-        - '10.0.5.26-10.0.5.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod_4p.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c4p
-     flavor:
-      vcpus: 9
-      ram: 8192
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 9
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 2
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_cpus.1: 5,6,7,8
-        hw:numa_mem.0: 4096
-        hw:numa_mem.1: 4096
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe2:
-         cidr: '10.0.4.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant4
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe3:
-         cidr: '10.0.5.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant5
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1518B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_1518B.yaml
deleted file mode 100644 (file)
index c0bbc8c..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-        - '10.0.4.26-10.0.4.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-        - '10.0.5.26-10.0.5.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod_4p.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c4p
-     flavor:
-      vcpus: 9
-      ram: 8192
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 9
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 2
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_cpus.1: 5,6,7,8
-        hw:numa_mem.0: 4096
-        hw:numa_mem.1: 4096
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe2:
-         cidr: '10.0.4.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant4
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe3:
-         cidr: '10.0.5.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant5
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_256B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_256B.yaml
deleted file mode 100644 (file)
index c78f0c2..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-        - '10.0.4.26-10.0.4.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-        - '10.0.5.26-10.0.5.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod_4p.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c4p
-     flavor:
-      vcpus: 9
-      ram: 8192
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 9
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 2
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_cpus.1: 5,6,7,8
-        hw:numa_mem.0: 4096
-        hw:numa_mem.1: 4096
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe2:
-         cidr: '10.0.4.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant4
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe3:
-         cidr: '10.0.5.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant5
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_512B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_512B.yaml
deleted file mode 100644 (file)
index 9d22329..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-        - '10.0.4.26-10.0.4.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-        - '10.0.5.26-10.0.5.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod_4p.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c4p
-     flavor:
-      vcpus: 9
-      ram: 8192
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 9
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 2
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_cpus.1: 5,6,7,8
-        hw:numa_mem.0: 4096
-        hw:numa_mem.1: 4096
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe2:
-         cidr: '10.0.4.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant4
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe3:
-         cidr: '10.0.5.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant5
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_64B.yaml b/samples/vnf_samples/nsut/router/tc_heat_external_rfc2544_ipv4_128Kflows_9cores_4ports_64B.yaml
deleted file mode 100644 (file)
index 45a8c2c..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.baremetal
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: compute_0.compute_nodes
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '10.0.2.26-10.0.2.105'
-        - '10.0.4.26-10.0.4.105'
-      dst_ip:
-        - '10.0.3.26-10.0.3.105'
-        - '10.0.5.26-10.0.5.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: compute_nodes
-     type: Node
-     file: /etc/yardstick/nodes/compute.yaml
-
-   - name: baremetal
-     type: Node
-     file: /etc/yardstick/nodes/pod_4p.yaml
-
-   - name: yardstick
-     image: vrouter_affinity_2c4p
-     flavor:
-      vcpus: 9
-      ram: 8192
-      disk: 10
-      extra_specs:
-        hw:cpu_sockets: 1
-        hw:cpu_cores: 9
-        hw:cpu_threads: 1
-        hw:mem_page_size: large
-        hw:cpu_policy: dedicated
-        hw:cpu_thread_policy: prefer
-        hw:numa_nodes: 2
-        hw:numa_mempolicy: preffered
-        hw:numa_cpus.0: 0,1,2,3,4
-        hw:numa_cpus.1: 5,6,7,8
-        hw:numa_mem.0: 4096
-        hw:numa_mem.1: 4096
-     user: "root"
-     password: "password"
-     placement_groups:
-       pgrp1:
-         policy: "availability"
-     servers:
-        vnf:
-          floating_ip: true
-          placement: "pgrp1"
-     networks:
-       mgmt:
-         cidr: '10.0.1.0/24'
-       xe0:
-         cidr: '10.0.2.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant2
-         port_security_enabled: False 
-         enable_dhcp: 'false'
-       xe1:
-         cidr: '10.0.3.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant3
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe2:
-         cidr: '10.0.4.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant4
-         port_security_enabled: False
-         enable_dhcp: 'false'
-       xe3:
-         cidr: '10.0.5.0/24'
-         gateway_ip: 'null'
-         provider: true
-         physical_network: phystenant5
-         port_security_enabled: False
-         enable_dhcp: 'false'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1024B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1024B_trex.yaml
deleted file mode 100644 (file)
index b3e4157..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       # override pmd_threads; use specific cpus
-       pmd_cpu_mask: "0x78"
-       lcore_mask: "0x4"
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_5cores.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 5
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='11'/>
-    <vcpupin vcpu='1' cpuset='12'/>
-    <vcpupin vcpu='2' cpuset='13'/>
-    <vcpupin vcpu='3' cpuset='14'/>
-    <vcpupin vcpu='4' cpuset='15'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1280B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1280B_trex.yaml
deleted file mode 100644 (file)
index 6d13532..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       # override pmd_threads; Use specific cpus
-       pmd_cpu_mask: "0x78"
-       lcore_mask: "0x4"
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_5cores.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 5
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='11'/>
-    <vcpupin vcpu='1' cpuset='12'/>
-    <vcpupin vcpu='2' cpuset='13'/>
-    <vcpupin vcpu='3' cpuset='14'/>
-    <vcpupin vcpu='4' cpuset='15'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_128B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_128B_trex.yaml
deleted file mode 100644 (file)
index 99e9b8d..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       # override pmd_threads; use specific CPUs
-       pmd_cpu_mask: "0x78"
-       lcore_mask: "0x4"
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_5cores.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 5
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='11'/>
-    <vcpupin vcpu='1' cpuset='12'/>
-    <vcpupin vcpu='2' cpuset='13'/>
-    <vcpupin vcpu='3' cpuset='14'/>
-    <vcpupin vcpu='4' cpuset='15'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1518B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_1518B_trex.yaml
deleted file mode 100644 (file)
index 1a1be37..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 2
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       pmd_cpu_mask: "0x78"
-       lcore_mask: "0x4"
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_5cores.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 5
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='11'/>
-    <vcpupin vcpu='1' cpuset='12'/>
-    <vcpupin vcpu='2' cpuset='13'/>
-    <vcpupin vcpu='3' cpuset='14'/>
-    <vcpupin vcpu='4' cpuset='15'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_256B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_256B_trex.yaml
deleted file mode 100644 (file)
index 6c30b62..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-        # override pmd_threads to use specific cpus
-       pmd_cpu_mask: "0x78"
-       lcore_mask: "0x4"
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_5cores.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 5 
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='11'/>
-    <vcpupin vcpu='1' cpuset='12'/>
-    <vcpupin vcpu='2' cpuset='13'/>
-    <vcpupin vcpu='3' cpuset='14'/>
-    <vcpupin vcpu='4' cpuset='15'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_64B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_5cores_2ports_64B_trex.yaml
deleted file mode 100644 (file)
index c141f4e..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       # override pmd_threads to use specific cpus
-       pmd_cpu_mask: "0x78"
-       lcore_mask: "0x4"
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_5cores.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 5
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='11'/>
-    <vcpupin vcpu='1' cpuset='12'/>
-    <vcpupin vcpu='2' cpuset='13'/>
-    <vcpupin vcpu='3' cpuset='14'/>
-    <vcpupin vcpu='4' cpuset='15'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: ovs_dpdk.yardstick
   options:
     framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1024B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1024B_trex.yaml
deleted file mode 100644 (file)
index bfa5ba4..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1280B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1280B_trex.yaml
deleted file mode 100644 (file)
index ea5fb16..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1518B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_1518B_trex.yaml
deleted file mode 100644 (file)
index ac38751..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_256B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_256B_trex.yaml
deleted file mode 100644 (file)
index 145f69d..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_512B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_512B_trex.yaml
deleted file mode 100644 (file)
index 6417d93..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_64B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_7cores_2ports_64B_trex.yaml
deleted file mode 100644 (file)
index ae46b86..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 7
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 4
-       ram:
-         socket_0: 2048
-         socket_1: 2048
-       queues: 4
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:1a:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:18:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: ovs_dpdk.yardstick
   options:
     framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1280B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1280B_trex.yaml
deleted file mode 100644 (file)
index 0467436..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 8
-       # override pmd_threads to use NUMA 1 vcpus
-       pmd_cpu_mask: "0x3FC00000"
-       lcore_mask: "0x200000"
-       ram:
-         socket_0: 0
-         socket_1: 4096
-       queues: 2
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         #gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         #gateway_ip: '152.16.40.20'
-       uplink_1:
-         port_num: 2
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         port_num: 3
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_128B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_128B_trex.yaml
deleted file mode 100644 (file)
index 30119c7..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 8
-       # override pmd_threads to use NUMA 1 vcpus
-       pmd_cpu_mask: "0x3FC00000"
-       lcore_mask: "0x200000"
-       ram:
-         socket_0: 0
-         socket_1: 4096
-       queues: 2
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         port_num: 2
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         port_num: 3
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1518B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_1518B_trex.yaml
deleted file mode 100644 (file)
index ac52c29..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 5
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 8
-       # override pmd_threads to use NUMA 1 vcpus
-       # 8 cores (CPU 22-29) in NUMA 1 of a 2 socket 20 cpus per socket
-       pmd_cpu_mask: "0x3FC00000"
-       lcore_mask: "0x200000"
-       ram:
-         socket_0: 0
-         socket_1: 4096
-       queues: 2
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         port_num: 2
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         port_num: 3
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_256B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_256B_trex.yaml
deleted file mode 100644 (file)
index 2767851..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 8
-       # override pmd_threads to use NUMA 1 vcpus
-       pmd_cpu_mask: "0x3FC00000"
-       lcore_mask: "0x200000"
-       ram:
-         socket_0: 0
-         socket_1: 4096
-       queues: 2
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         port_num: 2
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         port_num: 3
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_512B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_512B_trex.yaml
deleted file mode 100644 (file)
index 006718f..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 8
-       # override pmd_threads to use NUMA 1 vcpus
-       pmd_cpu_mask: "0x3FC00000"
-       lcore_mask: "0x200000"
-       ram:
-         socket_0: 0
-         socket_1: 4096
-       queues: 2
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         port_num: 2
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         port_num: 3
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
diff --git a/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_64B_trex.yaml b/samples/vnf_samples/nsut/router/tc_ovs_rfc2544_ipv4_128Kflows_9cores_4ports_64B_trex.yaml
deleted file mode 100644 (file)
index 601d308..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput-2.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: ovs_dpdk.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-
-   - name: yardstick
-     type: StandaloneOvsDpdk
-     file: /etc/yardstick/nodes/standalone/pod_ovs.yaml
-     vm_deploy: True
-     ovs_properties:
-       version:
-         ovs: 2.7.0
-         dpdk: 16.11.1
-       pmd_threads: 8
-       # override pmd_threads to use NUMA 1 vcpus
-       pmd_cpu_mask: "0x3FC00000"
-       lcore_mask: "0x200000"
-       ram:
-         socket_0: 0
-         socket_1: 4096
-       queues: 2
-       vpath: "/usr/local"
-
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         port_num: 0
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         port_num: 1
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         port_num: 2
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         port_num: 3
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: ovs_dpdk.yardstick
   options:
     framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'
@@ -97,7 +97,6 @@ contexts:
     <vcpupin vcpu='8' cpuset='39'/>
     <emulatorpin cpuset='31-39'/>
                    </cputune>"
-
        user: "root"
        password: "password"
      servers:
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1024B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1024B_trex.yaml
deleted file mode 100644 (file)
index 18e25e2..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_13cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 13
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='27'/>
-    <vcpupin vcpu='1' cpuset='28'/>
-    <vcpupin vcpu='2' cpuset='29'/>
-    <vcpupin vcpu='3' cpuset='30'/>
-    <vcpupin vcpu='4' cpuset='31'/>
-    <vcpupin vcpu='5' cpuset='32'/>
-    <vcpupin vcpu='6' cpuset='33'/>
-    <vcpupin vcpu='7' cpuset='34'/>
-    <vcpupin vcpu='8' cpuset='35'/>
-    <vcpupin vcpu='9' cpuset='36'/>
-    <vcpupin vcpu='10' cpuset='37'/>
-    <vcpupin vcpu='11' cpuset='38'/>
-    <vcpupin vcpu='12' cpuset='39'/>
-    <emulatorpin cpuset='27-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1280B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_1280B_trex.yaml
deleted file mode 100644 (file)
index bfaf74b..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_13cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 13
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='27'/>
-    <vcpupin vcpu='1' cpuset='28'/>
-    <vcpupin vcpu='2' cpuset='29'/>
-    <vcpupin vcpu='3' cpuset='30'/>
-    <vcpupin vcpu='4' cpuset='31'/>
-    <vcpupin vcpu='5' cpuset='32'/>
-    <vcpupin vcpu='6' cpuset='33'/>
-    <vcpupin vcpu='7' cpuset='34'/>
-    <vcpupin vcpu='8' cpuset='35'/>
-    <vcpupin vcpu='9' cpuset='36'/>
-    <vcpupin vcpu='10' cpuset='37'/>
-    <vcpupin vcpu='11' cpuset='38'/>
-    <vcpupin vcpu='12' cpuset='39'/>
-    <emulatorpin cpuset='27-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_128B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_128B_trex.yaml
deleted file mode 100644 (file)
index 529c8a5..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_13cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 13
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='27'/>
-    <vcpupin vcpu='1' cpuset='28'/>
-    <vcpupin vcpu='2' cpuset='29'/>
-    <vcpupin vcpu='3' cpuset='30'/>
-    <vcpupin vcpu='4' cpuset='31'/>
-    <vcpupin vcpu='5' cpuset='32'/>
-    <vcpupin vcpu='6' cpuset='33'/>
-    <vcpupin vcpu='7' cpuset='34'/>
-    <vcpupin vcpu='8' cpuset='35'/>
-    <vcpupin vcpu='9' cpuset='36'/>
-    <vcpupin vcpu='10' cpuset='37'/>
-    <vcpupin vcpu='11' cpuset='38'/>
-    <vcpupin vcpu='12' cpuset='39'/>
-    <emulatorpin cpuset='27-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_256B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_256B_trex.yaml
deleted file mode 100644 (file)
index 9e1e8eb..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_13cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 13
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='27'/>
-    <vcpupin vcpu='1' cpuset='28'/>
-    <vcpupin vcpu='2' cpuset='29'/>
-    <vcpupin vcpu='3' cpuset='30'/>
-    <vcpupin vcpu='4' cpuset='31'/>
-    <vcpupin vcpu='5' cpuset='32'/>
-    <vcpupin vcpu='6' cpuset='33'/>
-    <vcpupin vcpu='7' cpuset='34'/>
-    <vcpupin vcpu='8' cpuset='35'/>
-    <vcpupin vcpu='9' cpuset='36'/>
-    <vcpupin vcpu='10' cpuset='37'/>
-    <vcpupin vcpu='11' cpuset='38'/>
-    <vcpupin vcpu='12' cpuset='39'/>
-    <emulatorpin cpuset='27-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_512B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_512B_trex.yaml
deleted file mode 100644 (file)
index 4b3fbe4..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_13cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 13
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='27'/>
-    <vcpupin vcpu='1' cpuset='28'/>
-    <vcpupin vcpu='2' cpuset='29'/>
-    <vcpupin vcpu='3' cpuset='30'/>
-    <vcpupin vcpu='4' cpuset='31'/>
-    <vcpupin vcpu='5' cpuset='32'/>
-    <vcpupin vcpu='6' cpuset='33'/>
-    <vcpupin vcpu='7' cpuset='34'/>
-    <vcpupin vcpu='8' cpuset='35'/>
-    <vcpupin vcpu='9' cpuset='36'/>
-    <vcpupin vcpu='10' cpuset='37'/>
-    <vcpupin vcpu='11' cpuset='38'/>
-    <vcpupin vcpu='12' cpuset='39'/>
-    <emulatorpin cpuset='27-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_64B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_13cores_4ports_64B_trex.yaml
deleted file mode 100644 (file)
index d23ab4e..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_13cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 13
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='27'/>
-    <vcpupin vcpu='1' cpuset='28'/>
-    <vcpupin vcpu='2' cpuset='29'/>
-    <vcpupin vcpu='3' cpuset='30'/>
-    <vcpupin vcpu='4' cpuset='31'/>
-    <vcpupin vcpu='5' cpuset='32'/>
-    <vcpupin vcpu='6' cpuset='33'/>
-    <vcpupin vcpu='7' cpuset='34'/>
-    <vcpupin vcpu='8' cpuset='35'/>
-    <vcpupin vcpu='9' cpuset='36'/>
-    <vcpupin vcpu='10' cpuset='37'/>
-    <vcpupin vcpu='11' cpuset='38'/>
-    <vcpupin vcpu='12' cpuset='39'/>
-    <emulatorpin cpuset='27-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: sriov.yardstick
   options:
     framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'
index 0353b38..3675ec8 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: sriov.yardstick
   options:
     framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1024B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1024B_trex.yaml
deleted file mode 100644 (file)
index 4fa2297..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 4
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 6
-         hw:cpu_threads: 2
-       user: "root"
-       password: "password"
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '192.168.18.185'
-             cidr: '192.168.18.185/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         phy_port: "0000:07:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:07:00.1"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1280B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1280B_trex.yaml
deleted file mode 100644 (file)
index a7acbaf..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 4
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '192.168.18.185'
-             cidr: '192.168.18.185/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         phy_port: "0000:07:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:07:00.1"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_128B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_128B_trex.yaml
deleted file mode 100644 (file)
index 121aaec..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 4
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '192.168.18.185'
-             cidr: '192.168.18.185/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         phy_port: "0000:07:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:07:00.1"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1518B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_1518B_trex.yaml
deleted file mode 100644 (file)
index 6e856c8..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 4
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '192.168.18.185'
-             cidr: '192.168.18.185/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         phy_port: "0000:07:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:07:00.1"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_256B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_256B_trex.yaml
deleted file mode 100644 (file)
index 54a26bc..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 4
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '192.168.18.185'
-             cidr: '192.168.18.185/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         phy_port: "0000:07:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:07:00.1"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_512B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_7cores_2ports_512B_trex.yaml
deleted file mode 100644 (file)
index 1ed39c2..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 4
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex.yaml
-
-   - name: yardstick
-     type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu.qcow2"
-       ram: 4096
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 7
-         hw:cpu_threads: 1
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '192.168.18.185'
-             cidr: '192.168.18.185/30'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-     networks:
-       uplink_0:
-         phy_port: "0000:07:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:07:00.1"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.100.20'
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -24,8 +24,8 @@ scenarios:
     cpt__0: sriov.yardstick
   options:
     framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1280B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1280B_trex.yaml
deleted file mode 100644 (file)
index cf73e16..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1280B: 100}
-      downlink: {1280B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_128B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_128B_trex.yaml
deleted file mode 100644 (file)
index 493acb2..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {128B: 100}
-      downlink: {128B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1518B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_1518B_trex.yaml
deleted file mode 100644 (file)
index 6a88e3b..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {1518B: 100}
-      downlink: {1518B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_256B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_256B_trex.yaml
deleted file mode 100644 (file)
index 79aba60..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {256B: 100}
-      downlink: {256B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_512B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_512B_trex.yaml
deleted file mode 100644 (file)
index f83c788..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {512B: 100}
-      downlink: {512B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
diff --git a/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_64B_trex.yaml b/samples/vnf_samples/nsut/router/tc_sriov_rfc2544_ipv4_128Kflows_9cores_4ports_64B_trex.yaml
deleted file mode 100644 (file)
index 2c43972..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (c) 2016-2017 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-schema: yardstick:task:0.1
-scenarios:
-- type: NSPerf
-  traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml
-  topology: router-tg-topology-4port.yaml
-  nodes:
-    tg__0: trafficgen_1.yardstick
-    vnf__0: vnf.yardstick
-# Required for enabling NFVi collection
-    cpt__0: sriov.yardstick
-  options:
-    framesize:
-      uplink: {64B: 100}
-      downlink: {64B: 100}
-    flow:
-      src_ip:
-        - '152.16.100.26-152.16.100.105'
-        - '152.16.101.26-152.16.101.105'
-      dst_ip:
-        - '152.16.40.26-152.16.40.105'
-        - '152.16.41.26-152.16.41.105'
-      src_port:
-        - '1234-1238'
-      dst_port:
-        - '2001-2004'
-      count: 128000
-    traffic_type: 4
-    rfc2544:
-      allowed_drop_rate: 0.0001 - 0.1
-    tg__0:
-      queues_per_port: 8
-    vnf__0:
-      nfvi_enable: True
-  runner:
-    type: Iteration
-    iterations: 10
-    interval: 35
-contexts:
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-   - name: yardstick
-     type: Node
-     file: /etc/yardstick/nodes/standalone/pod_trex_4ports.yaml
-   - type: StandaloneSriov
-     file: /etc/yardstick/nodes/standalone/host_sriov.yaml
-     name: yardstick
-     vm_deploy: True
-     flavor:
-       images: "/var/lib/libvirt/images/ubuntu_9cores.qcow2"
-       ram: 4096
-       hw_socket: 1
-       extra_specs:
-         hw:cpu_sockets: 1
-         hw:cpu_cores: 9
-         hw:cpu_threads: 1
-         cputune: "<cputune>
-    <vcpupin vcpu='0' cpuset='31'/>
-    <vcpupin vcpu='1' cpuset='32'/>
-    <vcpupin vcpu='2' cpuset='33'/>
-    <vcpupin vcpu='3' cpuset='34'/>
-    <vcpupin vcpu='4' cpuset='35'/>
-    <vcpupin vcpu='5' cpuset='36'/>
-    <vcpupin vcpu='6' cpuset='37'/>
-    <vcpupin vcpu='7' cpuset='38'/>
-    <vcpupin vcpu='8' cpuset='39'/>
-    <emulatorpin cpuset='31-39'/>
-                   </cputune>"
-       user: root
-       password: password
-     servers:
-       vnf:
-         network_ports:
-           mgmt:
-             ip: '10.166.31.252'
-             cidr: '10.166.31.252/28'
-           xe0:
-             - uplink_0
-           xe1:
-             - downlink_0
-           xe2:
-             - uplink_1
-           xe3:
-             - downlink_1
-     networks:
-       uplink_0:
-         phy_port: "0000:88:00.0"
-         vpci: "0000:00:07.0"
-         cidr: '152.16.100.19/24'
-         gateway_ip: '152.16.100.20'
-       downlink_0:
-         phy_port: "0000:d8:00.0"
-         vpci: "0000:00:08.0"
-         cidr: '152.16.40.19/24'
-         gateway_ip: '152.16.40.20'
-       uplink_1:
-         phy_port: "0000:81:00.0"
-         vpci: "0000:00:09.0"
-         cidr: '152.16.101.19/24'
-         gateway_ip: '152.16.101.20'
-       downlink_1:
-         phy_port: "0000:86:00.0"
-         vpci: "0000:00:0a.0"
-         cidr: '152.16.41.19/24'
-         gateway_ip: '152.16.41.20'
-
@@ -1,4 +1,4 @@
-# Copyright (c) 2016-2017 Intel Corporation
+# Copyright (c) 2016-2019 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+{% set framesize = framesize or "{64B: 100}" %}
 ---
 schema: yardstick:task:0.1
 scenarios:
@@ -25,8 +25,8 @@ scenarios:
     cpt__0: sriov.yardstick
   options:
     framesize:
-      uplink: {1024B: 100}
-      downlink: {1024B: 100}
+      uplink: {{ framesize }}
+      downlink: {{ framesize }}
     flow:
       src_ip:
         - '152.16.100.26-152.16.100.105'