diff options
author | Deepak S <deepak.s@linux.intel.com> | 2017-09-15 21:14:46 -0700 |
---|---|---|
committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-10-06 02:05:46 -0700 |
commit | a714bd856676acef5653211064ae68bbb4a39015 (patch) | |
tree | 64e09cbfceeb02c90ff9be7929974cab472f5db0 /samples/vnf_samples/nsut | |
parent | 8e35dc2c45ec1897690173b374406a05b2132954 (diff) |
Adding scale out templates for ovs_dpdk/sriov using 2 node setup
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>
Diffstat (limited to 'samples/vnf_samples/nsut')
11 files changed, 806 insertions, 0 deletions
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 index 000000000..d497234e4 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-scale-out.yaml @@ -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 index 000000000..0fbfcdc2e --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_scale_out.yaml @@ -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 index 000000000..91e47df1d --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_scale_out.yaml @@ -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 index 000000000..e4b1baed6 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-scale-out.yaml @@ -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 index 000000000..1a2f57ff5 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_scale_out.yaml @@ -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 index 000000000..cb1f5ebf9 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_scale_out.yaml @@ -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 index 000000000..b2e4daed9 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/opnfv_ovs_vfw_scale_out_template.yaml @@ -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 index 000000000..8c23b801a --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/opnfv_sriov_vfw_scale_out_template.yaml @@ -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 index 000000000..1e4ccccb4 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_scale_out.yaml @@ -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 index 000000000..d6ff61363 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_scale_out.yaml @@ -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 index 000000000..a3e349d0d --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-scale-out.yaml @@ -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 %} |