Adding scale out templates for ovs_dpdk/sriov using 2 node setup 15/44415/1
authorDeepak S <deepak.s@linux.intel.com>
Sat, 16 Sep 2017 04:14:46 +0000 (21:14 -0700)
committerRoss Brattain <ross.b.brattain@intel.com>
Fri, 6 Oct 2017 09:05:46 +0000 (02:05 -0700)
2 - node setup:
  - Traffic generator starts new stream on both uplink and downlink

This patch addes amsible scripts to enable scale_out testcases

- vfw

Change-Id: I0340636bce3e74cd6175f728b9e7e014a4eb2fd5
Signed-off-by: Deepak S <deepak.s@linux.intel.com>
19 files changed:
ansible/ovs_scale_out_test_templates.yml [new file with mode: 0644]
ansible/sriov_scale_out_test_templates.yml [new file with mode: 0644]
ansible/standalone_ovs_scale_out_test.yaml [new file with mode: 0644]
ansible/standalone_sriov_scale_out_test.yaml [new file with mode: 0644]
etc/yardstick/nodes/standalone/pod_ovs.yaml [new file with mode: 0644]
etc/yardstick/nodes/standalone/pod_sriov.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_scale_out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/opnfv_ovs_vfw_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/opnfv_sriov_vfw_scale_out_template.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_scale_out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_scale_out.yaml [new file with mode: 0644]
samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out.yaml [new file with mode: 0644]
samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml [new file with mode: 0644]
samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml [new file with mode: 0644]

diff --git a/ansible/ovs_scale_out_test_templates.yml b/ansible/ovs_scale_out_test_templates.yml
new file mode 100644 (file)
index 0000000..aadec6d
--- /dev/null
@@ -0,0 +1,60 @@
+# 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-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/baremetal_trex.yaml
+    dest: /etc/yardstick/nodes/baremetal_trex_{{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_ovs_vfw_udp_scale_out.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_scale_out_{{ num_vnfs }}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-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_scale_out.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out-{{ num_vnfs }}.yaml
diff --git a/ansible/sriov_scale_out_test_templates.yml b/ansible/sriov_scale_out_test_templates.yml
new file mode 100644 (file)
index 0000000..33ecfad
--- /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-scale-out.yaml
+    dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../etc/yardstick/nodes/standalone/baremetal_trex.yaml
+    dest: /etc/yardstick/nodes/baremetal_trex_{{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_scale_out.yaml
+    dest: ../samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml
+    dest: ../samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
+
+- template:
+    src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-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_scale_out.yaml
+    dest: ../samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_scale_out_{{num_vnfs}}.yaml
+
+- template:
+     src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out.yaml
+     dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out-{{ num_vnfs }}.yaml
diff --git a/ansible/standalone_ovs_scale_out_test.yaml b/ansible/standalone_ovs_scale_out_test.yaml
new file mode 100644 (file)
index 0000000..2a0246c
--- /dev/null
@@ -0,0 +1,109 @@
+# 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:
+      user: root
+      password: ""
+      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: root
+      password: ""
+      key_filename: /root/.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: root
+      password: ""
+      key_filename: /root/.ssh/id_rsa
+
+    vnf:
+      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'
+          - '1.2.1.6/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_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/ansible/standalone_sriov_scale_out_test.yaml b/ansible/standalone_sriov_scale_out_test.yaml
new file mode 100644 (file)
index 0000000..e51e561
--- /dev/null
@@ -0,0 +1,100 @@
+# 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:
+      user: root
+      password: ""!
+      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: root
+      password: ""
+      key_filename: '~'
+      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: root
+      password: ""
+      key_filename: '~'
+
+    vnf:
+      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'
+          - '1.2.1.6/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_templates.yml
+      with_items: "{{ scale_out }}"
+
diff --git a/etc/yardstick/nodes/standalone/pod_ovs.yaml b/etc/yardstick/nodes/standalone/pod_ovs.yaml
new file mode 100644 (file)
index 0000000..c1a9f8a
--- /dev/null
@@ -0,0 +1,22 @@
+# Copyright (c) 2016 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.
+
+nodes:
+-
+    name: ovs_dpdk
+    role: OvsDpdk
+    ip: {{host.ip}}
+    user: {{host.user}}
+    password: {{host.password}}
+    key_filename: {{host.key_filename}}
diff --git a/etc/yardstick/nodes/standalone/pod_sriov.yaml b/etc/yardstick/nodes/standalone/pod_sriov.yaml
new file mode 100644 (file)
index 0000000..ca818fa
--- /dev/null
@@ -0,0 +1,22 @@
+# 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.
+
+nodes:
+-
+    name: sriov
+    role: Sriov
+    ip: {{host.ip}}
+    user: {{host.user}}
+    password: {{host.password}}
+    key_filename: {{host.key_filename}}
diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out.yaml
new file mode 100644 (file)
index 0000000..d497234
--- /dev/null
@@ -0,0 +1,53 @@
+# 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: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+{% for vnf_num in range(num_vnfs|int) %}
+        - member-vnf-index: '{{ vnf_num + 1 }}'
+          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 * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '{{ vnf_num + 1 }}'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__{{ vnf_num }}
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '{{ vnf_num  + 1}}'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__{{ vnf_num }}
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml
new file mode 100644 (file)
index 0000000..0fbfcdc
--- /dev/null
@@ -0,0 +1,104 @@
+# 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-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.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 * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% 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 %}
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{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: {{ flavor.user }}
+       password: {{ flavor.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_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml
new file mode 100644 (file)
index 0000000..91e47df
--- /dev/null
@@ -0,0 +1,95 @@
+# 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-{{ num_vnfs }}.yaml
+    topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.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 * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% 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 %}
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{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: {{ flavor.user }}
+       password: {{ flavor.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-scale-out.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out.yaml
new file mode 100644 (file)
index 0000000..e4b1bae
--- /dev/null
@@ -0,0 +1,53 @@
+# 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: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+{% for vnf_num in range(num_vnfs|int) %}
+        - member-vnf-index: '{{ vnf_num + 1 }}'
+          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 * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '{{ vnf_num + 1 }}'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__{{ vnf_num }}
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '{{ vnf_num  + 1}}'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__{{ vnf_num }}
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml
new file mode 100644 (file)
index 0000000..1a2f57f
--- /dev/null
@@ -0,0 +1,105 @@
+# 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-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.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 * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% 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 %}
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{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: {{ flavor.user }}
+       password: {{ flavor.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_scale_out.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_scale_out.yaml
new file mode 100644 (file)
index 0000000..cb1f5eb
--- /dev/null
@@ -0,0 +1,96 @@
+# 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-{{ num_vnfs }}.yaml
+    topology: cgnapt-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.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 * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% 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 %}
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{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: {{ flavor.user }}
+       password: {{ flavor.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/opnfv_ovs_vfw_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/opnfv_ovs_vfw_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..b2e4dae
--- /dev/null
@@ -0,0 +1,24 @@
+# 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:suite:0.1"
+
+name: "vfw-sriov-scale-out"
+test_cases_dir: "samples/vnf_samples/nsut/vfw"
+test_cases:
+{% for vnf_num in range(item.num_vnfs|int) %}
+-
+  file_name: tc_ovs_vfw_udp_scale_out_{{vnf_num + 1}}.yaml
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/opnfv_sriov_vfw_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/opnfv_sriov_vfw_scale_out_template.yaml
new file mode 100644 (file)
index 0000000..8c23b80
--- /dev/null
@@ -0,0 +1,24 @@
+# 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:suite:0.1"
+
+name: "vfw-sriov-scale-out"
+test_cases_dir: "samples/vnf_samples/nsut/vfw"
+test_cases:
+{% for vnf_num in range(item.num_vnfs|int) %}
+-
+  file_name: tc_sriov_vfw_udp_scale_out_{{vnf_num + 1}}.yaml
+{% endfor %}
diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_scale_out.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_scale_out.yaml
new file mode 100644 (file)
index 0000000..1e4cccc
--- /dev/null
@@ -0,0 +1,104 @@
+# 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-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.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 * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% 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 %}
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{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: {{ flavor.user }}
+       password: {{ flavor.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_scale_out.yaml b/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_scale_out.yaml
new file mode 100644 (file)
index 0000000..d6ff613
--- /dev/null
@@ -0,0 +1,95 @@
+# 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-{{ num_vnfs }}.yaml
+    topology: vfw-tg-topology-scale-out-{{ num_vnfs }}.yaml
+    nodes:
+      tg__0: tg__0.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 * 2)}}'}
+{% endfor %}
+        dst_ip:
+{% for vnf_num in range(num_vnfs|int) %}
+          - {'tg__0': 'xe{{ (vnf_num * 2) + 1}}'}
+{% 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 %}
+
+    runner:
+      type: Iteration
+      iterations: 10
+      interval: 35
+contexts:
+   - name: yardstick
+     type: Node
+     file: /etc/yardstick/nodes/baremetal_trex_{{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: {{ flavor.user }}
+       password: {{ flavor.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-scale-out.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out.yaml
new file mode 100644 (file)
index 0000000..a3e349d
--- /dev/null
@@ -0,0 +1,53 @@
+# 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: 2tg-topology
+        name: 2tg-topology
+        short-name: 2tg-topology
+        description: 2tg-topology
+        constituent-vnfd:
+        - member-vnf-index: '0'
+          vnfd-id-ref: tg__0
+          VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml      #VNF type
+{% for vnf_num in range(num_vnfs|int) %}
+        - member-vnf-index: '{{ vnf_num + 1 }}'
+          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 * 2}}
+                vnfd-id-ref: tg__0
+              - member-vnf-index-ref: '{{ vnf_num + 1 }}'
+                vnfd-connection-point-ref: xe0
+                vnfd-id-ref: vnf__{{ vnf_num }}
+          - id: downlink_{{ vnf_num }}
+            name: "vnf__{{ vnf_num }} to tg__0 link {{ (vnf_num * 2) + 1}}"
+            type: ELAN
+            vnfd-connection-point-ref:
+              - member-vnf-index-ref: '{{ vnf_num  + 1}}'
+                vnfd-connection-point-ref: xe1
+                vnfd-id-ref: vnf__{{ vnf_num }}
+              - member-vnf-index-ref: '0'
+                vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}}
+                vnfd-id-ref: tg__0
+{% endfor %}
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml
new file mode 100644 (file)
index 0000000..215433b
--- /dev/null
@@ -0,0 +1,99 @@
+#jinja2:variable_start_string:'[[', variable_end_string:']]', block_start_string:'[%', block_end_string:'%]'
+# 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.
+
+# flow definition for ACL tests - 1K flows - ipv4 only
+#
+# the number of flows defines the widest range of parameters
+# for example if srcip_range=1.0.0.1-1.0.0.255 and dst_ip_range=10.0.0.1-10.0.1.255
+# and it should define only 16 flows
+#
+# there is assumption that packets generated will have a random sequences of following addresses pairs
+# in the packets
+# 1. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
+# 2. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
+# ...
+# 512. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
+#
+# not all combination should be filled
+# Any other field with random range will be added to flow definition
+#
+# the example.yaml provides all possibilities for traffic generation
+#
+# the profile defines a public and private side to make limited traffic correlation
+# between private and public side same way as it is made by IXIA solution.
+#
+---
+schema: "nsb:traffic_profile:0.1"
+
+# This file is a template, it will be filled with values from tc.yaml before passing to the traffic generator
+
+name: rfc2544
+description: Traffic profile to run RFC2544 latency
+traffic_profile:
+  traffic_type: RFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
+  frame_rate: 100  # pc of linerate
+  # that specifies a range (e.g. ipv4 address, port)
+
+
+[% for vnf_num in range(num_vnfs|int) %]
+uplink_[[ vnf_num ]]:
+  ipv4:
+    outer_l2:
+      framesize:
+        64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
+        128B: "{{ get(imix, 'imix.uplink.128B', '0') }}"
+        256B: "{{ get(imix, 'imix.uplink.256B', '0') }}"
+        373b: "{{ get(imix, 'imix.uplink.373B', '0') }}"
+        512B: "{{ get(imix, 'imix.uplink.512B', '0') }}"
+        570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+        1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+        1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+        1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
+    outer_l3v4:
+      proto: "udp"
+      srcip4: "{{get(flow, 'flow.src_ip_[[ vnf_num ]]', '1.1.1.1-1.1.255.255') }}"
+      dstip4: "{{get(flow, 'flow.dst_ip_[[ vnf_num ]]', '90.90.1.1-90.90.255.255') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+      ttl: 32
+      dscp: 0
+    outer_l4:
+      srcport: "{{get(flow, 'flow.src_port_[[ vnf_num ]]', '1234-4321') }}"
+      dstport: "{{get(flow, 'flow.dst_port_[[ vnf_num ]]', '2001-4001') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+downlink_[[ vnf_num ]]:
+  ipv4:
+    outer_l2:
+      framesize:
+        64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
+        128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
+        256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
+        373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
+        512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
+        570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+        1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+        1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+        1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
+    outer_l3v4:
+      proto: "udp"
+      srcip4: "{{get(flow, 'flow.dst_ip_[[ vnf_num ]]', '90.90.1.1-90.90.255.255') }}"
+      dstip4: "{{get(flow, 'flow.public_ip_[[ vnf_num ]]', '1.1.1.1-1.1.255.255') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+      ttl: 32
+      dscp: 0
+    outer_l4:
+      srcport: "{{get(flow, 'flow.dst_port_[[ vnf_num ]]', '1234-4321') }}"
+      dstport: "{{get(flow, 'flow.src_port_[[ vnf_num ]]', '2001-4001') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+[% endfor %]
diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml
new file mode 100644 (file)
index 0000000..821c3c8
--- /dev/null
@@ -0,0 +1,99 @@
+#jinja2:variable_start_string:'[[', variable_end_string:']]', block_start_string:'[%', block_end_string:'%]'
+# 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.
+
+# flow definition for ACL tests - 1K flows - ipv4 only
+#
+# the number of flows defines the widest range of parameters
+# for example if srcip_range=1.0.0.1-1.0.0.255 and dst_ip_range=10.0.0.1-10.0.1.255
+# and it should define only 16 flows
+#
+# there is assumption that packets generated will have a random sequences of following addresses pairs
+# in the packets
+# 1. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
+# 2. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
+# ...
+# 512. src=1.x.x.x(x.x.x =random from 1..255) dst=10.x.x.x (random from 1..512)
+#
+# not all combination should be filled
+# Any other field with random range will be added to flow definition
+#
+# the example.yaml provides all possibilities for traffic generation
+#
+# the profile defines a public and private side to make limited traffic correlation
+# between private and public side same way as it is made by IXIA solution.
+#
+---
+schema: "nsb:traffic_profile:0.1"
+
+# This file is a template, it will be filled with values from tc.yaml before passing to the traffic generator
+
+name: rfc2544
+description: Traffic profile to run RFC2544 latency
+traffic_profile:
+  traffic_type: RFC2544Profile # defines traffic behavior - constant or look for highest possible throughput
+  frame_rate: 100  # pc of linerate
+  # that specifies a range (e.g. ipv4 address, port)
+
+
+[% for vnf_num in range(num_vnfs|int) %]
+uplink_[[ vnf_num ]]:
+  ipv4:
+    outer_l2:
+      framesize:
+        64B: "{{ get(imix, 'imix.uplink.64B', '0') }}"
+        128B: "{{ get(imix, 'imix.uplink.128B', '0') }}"
+        256B: "{{ get(imix, 'imix.uplink.256B', '0') }}"
+        373b: "{{ get(imix, 'imix.uplink.373B', '0') }}"
+        512B: "{{ get(imix, 'imix.uplink.512B', '0') }}"
+        570B: "{{get(imix, 'imix.uplink.570B', '0') }}"
+        1400B: "{{get(imix, 'imix.uplink.1400B', '0') }}"
+        1500B: "{{get(imix, 'imix.uplink.1500B', '0') }}"
+        1518B: "{{get(imix, 'imix.uplink.1518B', '0') }}"
+    outer_l3v4:
+      proto: "udp"
+      srcip4: "{{get(flow, 'flow.src_ip_[[ vnf_num ]]', '1.1.1.1-1.1.255.255') }}"
+      dstip4: "{{get(flow, 'flow.dst_ip_[[ vnf_num ]]', '90.90.1.1-90.90.255.255') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+      ttl: 32
+      dscp: 0
+    outer_l4:
+      srcport: "{{get(flow, 'flow.src_port_[[ vnf_num ]]', '1234-4321') }}"
+      dstport: "{{get(flow, 'flow.dst_port_[[ vnf_num ]]', '2001-4001') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+downlink_[[ vnf_num ]]:
+  ipv4:
+    outer_l2:
+      framesize:
+        64B: "{{ get(imix, 'imix.downlink.64B', '0') }}"
+        128B: "{{ get(imix, 'imix.downlink.128B', '0') }}"
+        256B: "{{ get(imix, 'imix.downlink.256B', '0') }}"
+        373b: "{{ get(imix, 'imix.downlink.373B', '0') }}"
+        512B: "{{ get(imix, 'imix.downlink.512B', '0') }}"
+        570B: "{{get(imix, 'imix.downlink.570B', '0') }}"
+        1400B: "{{get(imix, 'imix.downlink.1400B', '0') }}"
+        1500B: "{{get(imix, 'imix.downlink.1500B', '0') }}"
+        1518B: "{{get(imix, 'imix.downlink.1518B', '0') }}"
+    outer_l3v4:
+      proto: "udp"
+      srcip4: "{{get(flow, 'flow.dst_ip_[[ vnf_num ]]', '90.90.1.1-90.90.255.255') }}"
+      dstip4: "{{get(flow, 'flow.src_ip_[[ vnf_num ]]', '1.1.1.1-1.1.255.255') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+      ttl: 32
+      dscp: 0
+    outer_l4:
+      srcport: "{{get(flow, 'flow.dst_port_[[ vnf_num ]]', '1234-4321') }}"
+      dstport: "{{get(flow, 'flow.src_port_[[ vnf_num ]]', '2001-4001') }}"
+      count: "{{get(flow, 'flow.count', '1') }}"
+[% endfor %]