Adding auto generate scale-out support for correlated traffic 57/43657/2
authorDeepak S <deepak.s@linux.intel.com>
Fri, 29 Sep 2017 10:45:06 +0000 (03:45 -0700)
committerDeepak S <deepak.s@linux.intel.com>
Tue, 3 Oct 2017 22:43:35 +0000 (15:43 -0700)
Change-Id: I2755b596068545c1a3a672ceff47d814a44ae050
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
14 files changed:
ansible/ovs_scale_out_test_ixia_correlated_templates.yml [new file with mode: 0644]
ansible/sriov_scale_out_test_ixia_correlated_templates.yml [new file with mode: 0644]
ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml [new file with mode: 0644]
ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml [new file with mode: 0644]
etc/yardstick/nodes/standalone/ixia_correlated_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out.yaml [new file with mode: 0644]

diff --git a/ansible/ovs_scale_out_test_ixia_correlated_templates.yml b/ansible/ovs_scale_out_test_ixia_correlated_templates.yml
new file mode 100644 (file)
index 0000000..ca5fe00
--- /dev/null
@@ -0,0 +1,61 @@
+# Copyright (c) 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.
+---
+
+- set_fact:
+    num_vnfs: "{{ item }}"
+
+- debug:
+    var: num_vnfs
+    verbosity: 2
+
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/ixia_correlated_template.yaml
+    dest: /etc/yardstick/nodes/ixia_correlated_{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/pod_ovs.yaml
+    dest: /etc/yardstick/nodes/ovs_host.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-ixia-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
diff --git a/ansible/sriov_scale_out_test_ixia_correlated_templates.yml b/ansible/sriov_scale_out_test_ixia_correlated_templates.yml
new file mode 100644 (file)
index 0000000..2a6c352
--- /dev/null
@@ -0,0 +1,61 @@
+# Copyright (c) 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.
+---
+
+- set_fact:
+    num_vnfs: "{{ item }}"
+
+- debug:
+    var: num_vnfs
+    verbosity: 2
+
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/ixia_correlated_template.yaml
+    dest: /etc/yardstick/nodes/ixia_correlated_{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/pod_sriov.yaml
+    dest: /etc/yardstick/nodes/sriov_host.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-ixia-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml
diff --git a/ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml b/ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml
new file mode 100644 (file)
index 0000000..e3c8c7c
--- /dev/null
@@ -0,0 +1,147 @@
+# Copyright (c) 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.
+---
+- hosts: localhost
+  connection: local
+  vars:
+    scale_out:
+      - 1
+      - 2
+    ovs_properties:
+      ovs: 2.6.0
+      dpdk: 16.07.1
+      vpath: "/usr/local"
+      queues: 4
+      pmd_threads: 2
+      ram:
+        socket_0: 2048
+        socket_1: 2048
+    flavor:
+      ram: 4096
+      image: "/var/lib/libvirt/images/ubuntu.qcow2"
+      extra_specs:
+        cpu_sockets: 1
+        cpu_cores: 6
+        cpu_threads: 2
+    flow:
+      traffic_type: 4
+      pkt_size:
+         uplink: {64B: 100}
+         downlink: {64B: 100}
+      count: 10
+      rfc2544:
+        allowed_drop_rate: 0.0001 - 0.0001
+      vnf_config:
+        lb_config: 'SW'
+        lb_count: 1
+        worker_config: '1C/1T'
+        worker_threads: 1
+    # Environment variables
+    gen:
+      user: ""
+      password: ""
+      key_filename: ~
+      tg_config: 
+        ixchassis: "1.1.1.127" #ixia chassis ip
+        tcl_port: "8009" # tcl server port
+        lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0"
+        ""_dir: "/opt/ixia/ixos-api/8.01.0.2/"
+        py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/"
+        py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi"
+        dut_result_dir: "/mnt/results"
+        version: "8.01.106.3"
+      pcis:
+        uplink:
+          - "2:5" #Card:port
+          - "2:3" #Card:port
+        downlink:
+          - "2:6" #Card:port
+          - "2:5" #Card:port
+      ip:
+        mgmt:
+          - '1.1.1.138/24' # ixia network machine ip
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:98:10:64:14:00'
+          - '00:ac:10:64:14:0'
+        downlink:
+          - '00:98:10:28:14:00'
+          - '00:ac:10:28:14:00'
+
+    # Environment variables
+    gen_1:
+      user: ""
+      password: ""!
+      key_filename: /""/.ssh/id_rsa
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+    host:
+      ip: "192.168.100.101/24"
+      user: ""
+      password: ""
+      key_filename: ~
+
+    vnf:
+      user: ""
+      password: ""
+      key_filename: ~
+      pcis:
+        uplink:
+          - "0000:07:00.0"
+          - "0000:07:00.2"
+        downlink:
+          - "0000:07:00.1"
+          - "0000:07:00.3"
+      ip:
+        mgmt:
+          - '1.1.1.1/24'
+          - '1.1.1.7/24'
+        uplink:
+          - '152.16.100.10/24'
+          - '172.16.100.10/24'
+        downlink:
+          - '152.16.40.10/24'
+          - '172.16.40.10/24'
+
+  tasks:
+    - include: ovs_scale_out_test_ixia_correlated_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml b/ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml
new file mode 100644 (file)
index 0000000..084dcbf
--- /dev/null
@@ -0,0 +1,139 @@
+# Copyright (c) 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.
+---
+- hosts: localhost
+  connection: local
+  vars:
+    scale_out:
+      - 1
+      - 2
+    flavor:
+      ram: 4096
+      image: "/var/lib/libvirt/images/ubuntu.qcow2"
+      extra_specs:
+        cpu_sockets: 1
+        cpu_cores: 6
+        cpu_threads: 2
+    flow:
+      traffic_type: 4
+      pkt_size:
+         uplink: {64B: 100}
+         downlink: {64B: 100}
+      count: 10
+      rfc2544:
+        allowed_drop_rate: 0.0001 - 0.0001
+      vnf_config:
+        lb_config: 'SW'
+        lb_count: 1
+        worker_config: '1C/1T'
+        worker_threads: 1
+
+    # Environment variables
+    gen:
+      user: ""
+      password: ""
+      key_filename: ~
+      tg_config: 
+        ixchassis: "1.1.1.127" #ixia chassis ip
+        tcl_port: "8009" # tcl server port
+        lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0"
+        ""_dir: "/opt/ixia/ixos-api/8.01.0.2/"
+        py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/"
+        py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi"
+        dut_result_dir: "/mnt/results"
+        version: "8.01.106.3"
+      pcis:
+        uplink:
+          - "2:5" #Card:port
+          - "2:3" #Card:port
+        downlink:
+          - "2:6" #Card:port
+          - "2:5" #Card:port
+      ip:
+        mgmt:
+          - '1.1.1.138/24' # ixia network machine ip
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:98:10:64:14:00'
+          - '00:ac:10:64:14:0'
+        downlink:
+          - '00:98:10:28:14:00'
+          - '00:ac:10:28:14:00'
+
+    # Environment variables
+    gen_1:
+      user: ""
+      password: ""
+      key_filename: /""/.ssh/id_rsa
+      pcis:
+        uplink:
+          - "0000:05:00.0"
+          - "0000:05:00.2"
+        downlink:
+          - "0000:05:00.1"
+          - "0000:05:00.3"
+      ip:
+        mgmt:
+          - '1.2.1.6/24'
+        uplink:
+          - '152.16.100.20/24'
+          - '172.16.100.20/24'
+        downlink:
+          - '152.16.40.20/24'
+          - '172.16.40.20/24'
+      mac:
+        uplink:
+          - '00:00:00:9e:00:f8'
+          - '00:00:00:9e:00:fa'
+        downlink:
+          - '00:00:00:9e:00:f9'
+          - '00:00:00:9e:00:fb'
+
+    host:
+      ip: "192.168.100.101/24"
+      user: ""
+      password: ""
+      key_filename: ~
+
+    vnf:
+      user: ""
+      password: ""
+      key_filename: ~
+      pcis:
+        uplink:
+          - "0000:07:00.0"
+          - "0000:07:00.2"
+        downlink:
+          - "0000:07:00.1"
+          - "0000:07:00.3"
+      ip:
+        mgmt:
+          - '1.1.1.1/24'
+          - '1.1.1.7/24'
+        uplink:
+          - '152.16.100.10/24'
+          - '172.16.100.10/24'
+        downlink:
+          - '152.16.40.10/24'
+          - '172.16.40.10/24'
+
+  tasks:
+    - include: sriov_scale_out_test_ixia_correlated_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml b/etc/yardstick/nodes/standalone/ixia_correlated_template.yaml
new file mode 100644 (file)
index 0000000..7250c4c
--- /dev/null
@@ -0,0 +1,77 @@
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# Sample config file about the POD information, including the
+# name/IP/user/ssh key of Bare Metal and Controllers/Computes
+#
+# The options of this config file include:
+# name: the name of this node
+# role: node's role, support role: Master/Controller/Comupte/BareMetal
+# ip: the node's IP address
+# user: the username for login
+# key_filename:the path of the uplink key file for login
+
+
+nodes:
+-
+    name: tg__0
+    role: IxNet
+    ip: {{gen.ip.mgmt[0]| ipaddr('address')}}
+    user: {{gen.user}}
+    password: {{gen.password}}
+    key_filename: {{gen.key_filename}}
+    tg_config: 
+        ixchassis: "{{gen.tg_config.ixchassis}}" #ixia chassis ip
+        tcl_port: "{{gen.tg_config.tcl_port}}" # tcl server port
+        lib_path: "{{gen.tg_config.lib_path}}"
+        root_dir: "{{gen.tg_config.root_dir}}"
+        py_bin_path: "{{gen.tg_config.py_bin_path}}"
+        py_lib_path: "{{gen.tg_config.py_lib_path}}"
+        dut_result_dir: "{{gen.tg_config.dut_result_dir}}"
+        version: "{{gen.tg_config.version}}"
+    interfaces:
+{% for num in range(num_vnfs|int) %}
+       xe{{num * 2}}:  # logical name from topology.yaml and vnfd.yaml
+           vpci:      "{{gen.pcis.uplink[num]}}"
+           dpdk_port_num: {{num * 2}}
+           driver: none
+           local_ip: "{{gen.ip.uplink[num] | ipaddr('address')}}"
+           netmask: "{{gen.ip.uplink[num] | ipaddr('netmask')}}"
+           local_mac:   "{{gen.mac.uplink[num]}}"
+       xe{{(num * 2) + 1}}:  # logical name from topology.yaml and vnfd.yaml
+           vpci:      "{{gen.pcis.downlink[num]}}"
+           dpdk_port_num: {{(num * 2) + 1}}
+           driver: none
+           local_ip: "{{gen.ip.downlink[num] | ipaddr('address') }}"
+           netmask: "{{gen.ip.uplink[num] | ipaddr('netmask')}}"
+           local_mac:   "{{gen.mac.downlink[num]}}"
+{% endfor %}
+
+-
+    name: tg__1
+    role: tg__1
+    ip: {{gen_1.ip.mgmt[0]| ipaddr('address')}}
+    user: {{gen_1.user}}
+    password: {{gen_1.password}}
+    key_filename: {{gen_1.key_filename}}
+    interfaces:
+{% for num in range(num_vnfs|int) %}
+       xe{{num * 2}}:  # logical name from topology.yaml and vnfd.yaml
+           vpci:      "{{gen_1.pcis.uplink[num]}}"
+           dpdk_port_num: {{num * 2}}
+           local_ip: "{{gen_1.ip.uplink[num] | ipaddr('address')}}"
+           netmask: "{{gen_1.ip.uplink[num] | ipaddr('netmask')}}"
+           local_mac:   "{{gen_1.mac.uplink[num]}}"
+       xe{{(num * 2) + 1}}:  # logical name from topology.yaml and vnfd.yaml
+           vpci:      "{{gen_1.pcis.downlink[num]}}"
+           dpdk_port_num: {{(num * 2) + 1}}
+           local_ip: "{{gen_1.ip.downlink[num] | ipaddr('address') }}"
+           netmask: "{{gen_1.ip.uplink[num] | ipaddr('netmask')}}"
+           local_mac:   "{{gen_1.mac.downlink[num]}}"
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out.yaml
new file mode 100644 (file)
index 0000000..4700b7e
--- /dev/null
@@ -0,0 +1,56 @@
+# 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3-tg_vnf-topology
+        name: 3-tg_vnf-topology
+        short-name: 3-tg_vnf-topology
+        description: 3-tg_vnf-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+{% for vnf_num in range(num_vnfs|int) %}
+        - member-vnf-index: '{{ vnf_num + 2 }}'
+          vnfd-id-ref: vnf__{{ vnf_num }}
+          VNF model: ../../vnf_descriptors/acl_vnf.yaml      #VNF type
+{% endfor %}
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__{{ vnf_num }} link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '{{ vnf_num + 2 }}'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__{{ vnf_num }}
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__1 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '{{ vnf_num  + 2}}'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__{{ vnf_num }}
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__1
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..8e1c43f
--- /dev/null
@@ -0,0 +1,106 @@
+# Copyright (c) 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-ixia-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+{% endfor %}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs}}_port.ixncfg
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: StandaloneOvsDpdk
+     name: yardstick
+     file: /etc/yardstick/nodes/ovs_host.yaml
+     vm_deploy: True
+     ovs_properties:
+       version:
+         ovs: {{ ovs_properties.ovs  }}
+         dpdk: {{ ovs_properties.dpdk }}
+       vpath: "{{ ovs_properties.vpath }}"
+       queues: {{ovs_properties.queues}}
+       pmd_threads: {{ovs_properties.pmd_threads}}
+       ram:
+         socket_0: {{ovs_properties.ram.socket_0}}
+         socket_1: {{ovs_properties.ram.socket_1}}
+     flavor:
+       images: {{ flavor.image }}
+       ram: {{ flavor.ram }}
+       extra_specs:
+         hw:cpu_sockets: {{ flavor.extra_specs.cpu_sockets }}
+         hw:cpu_cores: {{ flavor.extra_specs.cpu_cores }}
+         hw:cpu_threads: {{ flavor.extra_specs.cpu_threads }}
+       user: {{ vnf.user }}
+       password: {{ vnf.password }}
+     servers:
+{% for vnf_num in range(num_vnfs|int) %}
+       vnf_{{ vnf_num }}:
+         network_ports:
+           mgmt:
+             cidr: '{{vnf.ip.mgmt[vnf_num]}}'
+           xe0:
+             - uplink_{{ vnf_num }}
+           xe1:
+             - downlink_{{ vnf_num }}
+{% endfor %}
+     networks:
+{% for vnf_num in range(num_vnfs|int) %}
+       uplink_{{ vnf_num }}:
+         port_num: {{ vnf_num * 2 }}
+         phy_port: "{{vnf.pcis.uplink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (99 | random)}}.0"
+         cidr: '{{vnf.ip.uplink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.uplink[vnf_num]}}'
+       downlink_{{ vnf_num }}:
+         port_num: {{ (vnf_num * 2) + 1}}
+         phy_port: "{{vnf.pcis.downlink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (9 | random)}}.0"
+         cidr: '{{vnf.ip.downlink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.downlink[vnf_num]}}'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..d06c2ec
--- /dev/null
@@ -0,0 +1,97 @@
+# 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-ixia-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-ixia-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+{% endfor %}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs}}_port.ixncfg
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: StandaloneSriov
+     file: /etc/yardstick/nodes/sriov_host.yaml
+     name: yardstick
+     vm_deploy: True
+     flavor:
+       images: {{ flavor.image }}
+       ram: {{ flavor.ram }}
+       extra_specs:
+         hw:cpu_sockets: {{ flavor.extra_specs.cpu_sockets }}
+         hw:cpu_cores: {{ flavor.extra_specs.cpu_cores }}
+         hw:cpu_threads: {{ flavor.extra_specs.cpu_threads }}
+       user: {{ vnf.user }}
+       password: {{ vnf.password }}
+     servers:
+{% for vnf_num in range(num_vnfs|int) %}
+       vnf_{{ vnf_num }}:
+         network_ports:
+           mgmt:
+             cidr: '{{vnf.ip.mgmt[vnf_num]}}'
+           xe0:
+             - uplink_{{ vnf_num }}
+           xe1:
+             - downlink_{{ vnf_num }}
+{% endfor %}
+     networks:
+{% for vnf_num in range(num_vnfs|int) %}
+       uplink_{{ vnf_num }}:
+         port_num: {{ vnf_num * 2 }}
+         phy_port: "{{vnf.pcis.uplink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (89 | random)}}.0"
+         cidr: '{{vnf.ip.uplink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.uplink[vnf_num]}}'
+       downlink_{{ vnf_num }}:
+         port_num: {{ (vnf_num * 2) + 1}}
+         phy_port: "{{vnf.pcis.downlink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (89 | random)}}.0"
+         cidr: '{{vnf.ip.downlink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.downlink[vnf_num]}}'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml
new file mode 100644 (file)
index 0000000..352e413
--- /dev/null
@@ -0,0 +1,56 @@
+# 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3-tg_vnf-topology
+        name: 3-tg_vnf-topology
+        short-name: 3-tg_vnf-topology
+        description: 3-tg_vnf-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+{% for vnf_num in range(num_vnfs|int) %}
+        - member-vnf-index: '{{ vnf_num + 2 }}'
+          vnfd-id-ref: vnf__{{ vnf_num }}
+          VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml      #VNF type
+{% endfor %}
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__{{ vnf_num }} link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '{{ vnf_num + 2 }}'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__{{ vnf_num }}
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__1 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '{{ vnf_num  + 2}}'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__{{ vnf_num }}
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__1
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..5f575d7
--- /dev/null
@@ -0,0 +1,107 @@
+# Copyright (c) 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-cgnapt-ixia-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        public_ip: ["152.40.40.10"]
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+{% endfor %}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs}}_port.ixncfg
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: StandaloneOvsDpdk
+     name: yardstick
+     file: /etc/yardstick/nodes/ovs_host.yaml
+     vm_deploy: True
+     ovs_properties:
+       version:
+         ovs: {{ ovs_properties.ovs  }}
+         dpdk: {{ ovs_properties.dpdk }}
+       vpath: "{{ ovs_properties.vpath }}"
+       queues: {{ovs_properties.queues}}
+       pmd_threads: {{ovs_properties.pmd_threads}}
+       ram:
+         socket_0: {{ovs_properties.ram.socket_0}}
+         socket_1: {{ovs_properties.ram.socket_1}}
+     flavor:
+       images: {{ flavor.image }}
+       ram: {{ flavor.ram }}
+       extra_specs:
+         hw:cpu_sockets: {{ flavor.extra_specs.cpu_sockets }}
+         hw:cpu_cores: {{ flavor.extra_specs.cpu_cores }}
+         hw:cpu_threads: {{ flavor.extra_specs.cpu_threads }}
+       user: {{ vnf.user }}
+       password: {{ vnf.password }}
+     servers:
+{% for vnf_num in range(num_vnfs|int) %}
+       vnf_{{ vnf_num }}:
+         network_ports:
+           mgmt:
+             cidr: '{{vnf.ip.mgmt[vnf_num]}}'
+           xe0:
+             - uplink_{{ vnf_num }}
+           xe1:
+             - downlink_{{ vnf_num }}
+{% endfor %}
+     networks:
+{% for vnf_num in range(num_vnfs|int) %}
+       uplink_{{ vnf_num }}:
+         port_num: {{ vnf_num * 2 }}
+         phy_port: "{{vnf.pcis.uplink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (99 | random)}}.0"
+         cidr: '{{vnf.ip.uplink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.uplink[vnf_num]}}'
+       downlink_{{ vnf_num }}:
+         port_num: {{ (vnf_num * 2) + 1}}
+         phy_port: "{{vnf.pcis.downlink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (9 | random)}}.0"
+         cidr: '{{vnf.ip.downlink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.downlink[vnf_num]}}'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..5b6d4a5
--- /dev/null
@@ -0,0 +1,97 @@
+# 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-cgnapt-ixia-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-ixia-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        public_ip: ["152.40.40.10"]
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}:
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+{% endfor %}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs}}_port.ixncfg
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: StandaloneSriov
+     file: /etc/yardstick/nodes/sriov_host.yaml
+     name: yardstick
+     vm_deploy: True
+     flavor:
+       images: {{ flavor.image }}
+       ram: {{ flavor.ram }}
+       extra_specs:
+         hw:cpu_sockets: {{ flavor.extra_specs.cpu_sockets }}
+         hw:cpu_cores: {{ flavor.extra_specs.cpu_cores }}
+         hw:cpu_threads: {{ flavor.extra_specs.cpu_threads }}
+       user: {{ vnf.user }}
+       password: {{ vnf.password }}
+     servers:
+{% for vnf_num in range(num_vnfs|int) %}
+       vnf_{{ vnf_num }}:
+         network_ports:
+           mgmt:
+             cidr: '{{vnf.ip.mgmt[vnf_num]}}'
+           xe0:
+             - uplink_{{ vnf_num }}
+           xe1:
+             - downlink_{{ vnf_num }}
+{% endfor %}
+     networks:
+{% for vnf_num in range(num_vnfs|int) %}
+       uplink_{{ vnf_num }}:
+         port_num: {{ vnf_num * 2 }}
+         phy_port: "{{vnf.pcis.uplink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (89 | random)}}.0"
+         cidr: '{{vnf.ip.uplink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.uplink[vnf_num]}}'
+       downlink_{{ vnf_num }}:
+         port_num: {{ (vnf_num * 2) + 1}}
+         phy_port: "{{vnf.pcis.downlink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (89 | random)}}.0"
+         cidr: '{{vnf.ip.downlink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.downlink[vnf_num]}}'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..a82cece
--- /dev/null
@@ -0,0 +1,106 @@
+# Copyright (c) 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-ixia-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+{% endfor %}
+    ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs}}_port.ixncfg
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: StandaloneOvsDpdk
+     name: yardstick
+     file: /etc/yardstick/nodes/ovs_host.yaml
+     vm_deploy: True
+     ovs_properties:
+       version:
+         ovs: {{ ovs_properties.ovs  }}
+         dpdk: {{ ovs_properties.dpdk }}
+       vpath: "{{ ovs_properties.vpath }}"
+       queues: {{ovs_properties.queues}}
+       pmd_threads: {{ovs_properties.pmd_threads}}
+       ram:
+         socket_0: {{ovs_properties.ram.socket_0}}
+         socket_1: {{ovs_properties.ram.socket_1}}
+     flavor:
+       images: {{ flavor.image }}
+       ram: {{ flavor.ram }}
+       extra_specs:
+         hw:cpu_sockets: {{ flavor.extra_specs.cpu_sockets }}
+         hw:cpu_cores: {{ flavor.extra_specs.cpu_cores }}
+         hw:cpu_threads: {{ flavor.extra_specs.cpu_threads }}
+       user: {{ vnf.user }}
+       password: {{ vnf.password }}
+     servers:
+{% for vnf_num in range(num_vnfs|int) %}
+       vnf_{{ vnf_num }}:
+         network_ports:
+           mgmt:
+             cidr: '{{vnf.ip.mgmt[vnf_num]}}'
+           xe0:
+             - uplink_{{ vnf_num }}
+           xe1:
+             - downlink_{{ vnf_num }}
+{% endfor %}
+     networks:
+{% for vnf_num in range(num_vnfs|int) %}
+       uplink_{{ vnf_num }}:
+         port_num: {{ vnf_num * 2 }}
+         phy_port: "{{vnf.pcis.uplink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (99 | random)}}.0"
+         cidr: '{{vnf.ip.uplink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.uplink[vnf_num]}}'
+       downlink_{{ vnf_num }}:
+         port_num: {{ (vnf_num * 2) + 1}}
+         phy_port: "{{vnf.pcis.downlink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (9 | random)}}.0"
+         cidr: '{{vnf.ip.downlink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.downlink[vnf_num]}}'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..efa51a4
--- /dev/null
@@ -0,0 +1,97 @@
+# 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-ixia-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-ixia-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.yardstick
+      tg__1: tg__1.yardstick
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}: vnf_{{ vnf_num }}.yardstick
+{% endfor %}
+    options:
+      framesize:
+        uplink: {{ flow.pkt_size.uplink }}
+        downlink: {{ flow.pkt_size.downlink }}
+      flow:
+        src_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ vnf_num }}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__1': 'xe{{ vnf_num }}'}
+{% endfor %}
+        count: {{ flow.count }}
+      traffic_type: {{ flow.traffic_type }}
+      rfc2544:
+        allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }}
+{% for vnf_num in range(num_vnfs|int) %}
+      vnf__{{ vnf_num }}:
+        rules: acl_1rule.yaml
+        vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}}
+{% endfor %}
+    ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml
+   - type: StandaloneSriov
+     file: /etc/yardstick/nodes/sriov_host.yaml
+     name: yardstick
+     vm_deploy: True
+     flavor:
+       images: {{ flavor.image }}
+       ram: {{ flavor.ram }}
+       extra_specs:
+         hw:cpu_sockets: {{ flavor.extra_specs.cpu_sockets }}
+         hw:cpu_cores: {{ flavor.extra_specs.cpu_cores }}
+         hw:cpu_threads: {{ flavor.extra_specs.cpu_threads }}
+       user: {{ vnf.user }}
+       password: {{ vnf.password }}
+     servers:
+{% for vnf_num in range(num_vnfs|int) %}
+       vnf_{{ vnf_num }}:
+         network_ports:
+           mgmt:
+             cidr: '{{vnf.ip.mgmt[vnf_num]}}'
+           xe0:
+             - uplink_{{ vnf_num }}
+           xe1:
+             - downlink_{{ vnf_num }}
+{% endfor %}
+     networks:
+{% for vnf_num in range(num_vnfs|int) %}
+       uplink_{{ vnf_num }}:
+         port_num: {{ vnf_num * 2 }}
+         phy_port: "{{vnf.pcis.uplink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (89 | random)}}.0"
+         cidr: '{{vnf.ip.uplink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.uplink[vnf_num]}}'
+       downlink_{{ vnf_num }}:
+         port_num: {{ (vnf_num * 2) + 1}}
+         phy_port: "{{vnf.pcis.downlink[vnf_num]}}"
+         vpci: "0000:00:{{10 + (89 | random)}}.0"
+         cidr: '{{vnf.ip.downlink[vnf_num]}}'
+         gateway_ip: '{{gen.ip.downlink[vnf_num]}}'
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-scale-out.yaml
new file mode 100644 (file)
index 0000000..8ec05d9
--- /dev/null
@@ -0,0 +1,56 @@
+# 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.
+
+nsd:nsd-catalog:
+    nsd:
+    -   id: 3-tg_vnf-topology
+        name: 3-tg_vnf-topology
+        short-name: 3-tg_vnf-topology
+        description: 3-tg_vnf-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/ixia_rfc2544_tpl.yaml
+        - member-vnf-index: '1'
+          vnfd-id-ref: tg__1
+          VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml      #VNF type
+{% for vnf_num in range(num_vnfs|int) %}
+        - member-vnf-index: '{{ vnf_num + 2 }}'
+          vnfd-id-ref: vnf__{{ vnf_num }}
+          VNF model: ../../vnf_descriptors/vfw_vnf.yaml      #VNF type
+{% endfor %}
+
+        vld:
+{% for vnf_num in range(num_vnfs|int) %}
+          - id: uplink_{{ vnf_num }}
+            name: "tg__0 to vnf__{{ vnf_num }} link {{ (vnf_num * 2) }}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '{{ vnf_num + 2 }}'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__{{ vnf_num }}
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__1 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '{{ vnf_num  + 2}}'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__{{ vnf_num }}
+              - member-vnf-index-ref: '1'
+                vnfd-connection-point-ref: xe{{ vnf_num }}
+                vnfd-id-ref: tg__1
+{% endfor %}