From f01066907aa0d40e5026c209af7a53843229de13 Mon Sep 17 00:00:00 2001 From: Deepak S Date: Fri, 29 Sep 2017 03:45:06 -0700 Subject: Adding auto generate scale-out support for correlated traffic Change-Id: I2755b596068545c1a3a672ceff47d814a44ae050 Signed-off-by: Deepak S --- ...napt-tg-topology-ixia-correlated-scale-out.yaml | 56 +++++++++++ ...apt_udp_ixia_correlated_scale_out_template.yaml | 107 +++++++++++++++++++++ ...apt_udp_ixia_correlated_scale_out_template.yaml | 97 +++++++++++++++++++ 3 files changed, 260 insertions(+) create mode 100644 samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml create mode 100644 samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml create mode 100644 samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml (limited to 'samples/vnf_samples/nsut/cgnapt') 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 index 000000000..352e413ab --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-scale-out.yaml @@ -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 index 000000000..5f575d709 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml @@ -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 index 000000000..5b6d4a525 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_cgnapt_udp_ixia_correlated_scale_out_template.yaml @@ -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 %} -- cgit 1.2.3-korg