diff options
264 files changed, 15024 insertions, 4387 deletions
diff --git a/ansible/gen_scale_out_test.yml b/ansible/gen_scale_out_test.yml new file mode 100644 index 000000000..a76ea0ac2 --- /dev/null +++ b/ansible/gen_scale_out_test.yml @@ -0,0 +1,26 @@ +# 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: + vnf_range: + - 2 + - 4 + - 10 + + + tasks: + - include: scale_out_test_templates.yml + with_items: "{{ vnf_range }}" + diff --git a/ansible/install_collectd.yml b/ansible/install_collectd.yml index 0824c1525..637c42d65 100644 --- a/ansible/install_collectd.yml +++ b/ansible/install_collectd.yml @@ -15,8 +15,11 @@ - hosts: all vars: clone_dir: /tmp/yardstick-clone + environment: "{{ proxy_env|default({}) }}" roles: + # needed for collectd plugins + - increase_open_file_limits # build shared DPDK for collectd only, required DPDK downloaded already - role: download_dpdk - install_dpdk_shared @@ -27,4 +30,3 @@ - install_pmu_tools - download_collectd - install_collectd - diff --git a/ansible/multi_port_baremetal_ixia_correlated_test.yaml b/ansible/multi_port_baremetal_ixia_correlated_test.yaml new file mode 100644 index 000000000..ba92b5cd3 --- /dev/null +++ b/ansible/multi_port_baremetal_ixia_correlated_test.yaml @@ -0,0 +1,133 @@ +# 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 + flow: + traffic_type: 4 + pkt_size: + uplink: {64B: 100} + downlink: {64B: 100} + count: 10 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + vnf_config: + lb_config: 'SW' + lb_count: 1 + worker_config: '1C/1T' + worker_threads: 1 + + # Environment variables + gen: + user: "" + password: "" + key_filename: ~ + tg_config: + ixchassis: "1.1.1.127" #ixia chassis ip + tcl_port: "8009" # tcl server port + lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0" + root_dir: "/opt/ixia/ixos-api/8.01.0.2/" + py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/" + py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi" + dut_result_dir: "/mnt/results" + version: "8.01.106.3" + pcis: + uplink: + - "2:5" #Card:port + - "2:3" #Card:port + downlink: + - "2:6" #Card:port + - "2:5" #Card:port + ip: + mgmt: + - '1.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:98:10:64:14:00' + - '00:ac:10:64:14:0' + downlink: + - '00:98:10:28:14:00' + - '00:ac:10:28:14:00' + + # Environment variables + gen_1: + user: "" + password: "" + key_filename: ~ + 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' + + vnf: + ip: "192.168.100.101/24" + 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.10/24' + - '172.16.100.10/24' + downlink: + - '152.16.40.10/24' + - '172.16.40.10/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' + + tasks: + - include: multi_port_baremetal_ixia_correlated_test_templates.yml + with_items: "{{ scale_out }}" + diff --git a/ansible/multi_port_baremetal_ixia_correlated_test_templates.yml b/ansible/multi_port_baremetal_ixia_correlated_test_templates.yml new file mode 100644 index 000000000..6f73d8c01 --- /dev/null +++ b/ansible/multi_port_baremetal_ixia_correlated_test_templates.yml @@ -0,0 +1,56 @@ +# Copyright (c) 2017 Intel Corporation. # +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- + +- set_fact: + num_vnfs: "{{ item }}" + +- debug: + var: num_vnfs + verbosity: 2 + +- template: + src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml + dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml + +- template: + src: ../etc/yardstick/nodes/standalone/ixia_template.yaml + dest: /etc/yardstick/nodes/ixia_{{ num_vnfs }}.yaml + +- template: + src: ../etc/yardstick/nodes/standalone/pod_bm_vnf.yaml + dest: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml + dest: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml + dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml + dest: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_{{num_vnfs}}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml + dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_{{num_vnfs}}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml diff --git a/ansible/multi_port_baremetal_ixia_test.yaml b/ansible/multi_port_baremetal_ixia_test.yaml new file mode 100644 index 000000000..52bc40b43 --- /dev/null +++ b/ansible/multi_port_baremetal_ixia_test.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. +--- +- hosts: localhost + connection: local + vars: + scale_out: + - 1 + - 2 + flow: + traffic_type: 4 + pkt_size: + uplink: {64B: 100} + downlink: {64B: 100} + count: 10 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + vnf_config: + lb_config: 'SW' + lb_count: 1 + worker_config: '1C/1T' + worker_threads: 1 + + # Environment variables + gen: + user: "" + password: "" + key_filename: ~ + tg_config: + ixchassis: "1.1.1.127" #ixia chassis ip + tcl_port: "8009" # tcl server port + lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0" + root_dir: "/opt/ixia/ixos-api/8.01.0.2/" + py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/" + py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi" + dut_result_dir: "/mnt/results" + version: "8.01.106.3" + pcis: + uplink: + - "2:5" #Card:port + - "2:3" #Card:port + downlink: + - "2:6" #Card:port + - "2:5" #Card:port + ip: + mgmt: + - '1.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:98:10:64:14:00' + - '00:ac:10:64:14:0' + downlink: + - '00:98:10:28:14:00' + - '00:ac:10:28:14:00' + + vnf: + ip: "192.168.100.101/24" + 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.10/24' + - '172.16.100.10/24' + downlink: + - '152.16.40.10/24' + - '172.16.40.10/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' + + tasks: + - include: multi_port_baremetal_ixia_test_templates.yml + with_items: "{{ scale_out }}" + diff --git a/ansible/multi_port_baremetal_ixia_test_templates.yml b/ansible/multi_port_baremetal_ixia_test_templates.yml new file mode 100644 index 000000000..f2e04a2d1 --- /dev/null +++ b/ansible/multi_port_baremetal_ixia_test_templates.yml @@ -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/ixia_template.yaml + dest: /etc/yardstick/nodes/ixia_{{ num_vnfs }}.yaml + +- template: + src: ../etc/yardstick/nodes/standalone/pod_bm_vnf.yaml + dest: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml + dest: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml + dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml + dest: ../samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml + dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port-ixia-{{ 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_baremetal_cgnapt_rfc2544_ixia_template.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port-ixia-{{ num_vnfs }}.yaml diff --git a/ansible/multi_port_baremetal_test.yaml b/ansible/multi_port_baremetal_test.yaml new file mode 100644 index 000000000..fb12b1c64 --- /dev/null +++ b/ansible/multi_port_baremetal_test.yaml @@ -0,0 +1,95 @@ +# 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 + 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' + + vnf: + ip: "192.168.100.101/24" + 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.10/24' + - '172.16.100.10/24' + downlink: + - '152.16.40.10/24' + - '172.16.40.10/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' + + tasks: + - include: multi_port_baremetal_test_templates.yml + with_items: "{{ scale_out }}" + diff --git a/ansible/multi_port_baremetal_test_templates.yml b/ansible/multi_port_baremetal_test_templates.yml new file mode 100644 index 000000000..4b905f8c7 --- /dev/null +++ b/ansible/multi_port_baremetal_test_templates.yml @@ -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_bm_vnf.yaml + dest: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml + dest: ../samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml + dest: ../samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/tc_baremetal_vfw_rfc2544_template.yaml + dest: ../samples/vnf_samples/nsut/acl/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml + dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port-{{ 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_baremetal_vfw_rfc2544_template.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/tc_baremetal_vfw_rfc2544_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port-{{ num_vnfs }}.yaml diff --git a/ansible/ovs_scale_out_test_ixia_correlated_templates.yml b/ansible/ovs_scale_out_test_ixia_correlated_templates.yml index ca5fe00ef..c26505342 100644 --- a/ansible/ovs_scale_out_test_ixia_correlated_templates.yml +++ b/ansible/ovs_scale_out_test_ixia_correlated_templates.yml @@ -21,7 +21,7 @@ - template: - src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-scale-out.yaml + src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml - template: @@ -49,10 +49,6 @@ dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml - template: - src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-ixia-scale-out.yaml - dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-{{ num_vnfs }}.yaml - -- template: src: ../samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_template.yaml dest: ../samples/vnf_samples/nsut/cgnapt/tc_ovs_cgnapt_udp_ixia_correlated_scale_out_{{num_vnfs}}.yaml diff --git a/ansible/ovs_scale_out_test_templates.yml b/ansible/ovs_scale_out_test_templates.yml index aadec6d62..cffa73342 100644 --- a/ansible/ovs_scale_out_test_templates.yml +++ b/ansible/ovs_scale_out_test_templates.yml @@ -25,7 +25,7 @@ - template: src: ../etc/yardstick/nodes/standalone/baremetal_trex.yaml - dest: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + dest: /etc/yardstick/nodes/baremetal_trex_{{ num_vnfs }}.yaml - template: src: ../etc/yardstick/nodes/standalone/pod_sriov.yaml diff --git a/ansible/roles/download_collectd/defaults/main.yml b/ansible/roles/download_collectd/defaults/main.yml index d4e91acc4..9beaeb897 100644 --- a/ansible/roles/download_collectd/defaults/main.yml +++ b/ansible/roles/download_collectd/defaults/main.yml @@ -1,4 +1,4 @@ --- collectd_url: "https://github.com/collectd/collectd.git" collectd_dest: "{{ clone_dest }}/collectd" -collectd_version: "47c86ace348a1d7a5352a83d10935209f89aa4f5" +collectd_version: "c870991a2d614e51c03c0da76e9aef997343551b" diff --git a/ansible/roles/download_intel_cmt_cat/defaults/main.yml b/ansible/roles/download_intel_cmt_cat/defaults/main.yml index d733e4114..0c26770b9 100644 --- a/ansible/roles/download_intel_cmt_cat/defaults/main.yml +++ b/ansible/roles/download_intel_cmt_cat/defaults/main.yml @@ -1,4 +1,4 @@ --- intel_cmt_cat_url: "https://github.com/01org/intel-cmt-cat.git" intel_cmt_cat_dest: "{{ clone_dest }}/intel-cmt-cat" -intel_cmt_cat_version: "master" +intel_cmt_cat_version: "v1.1.0" diff --git a/ansible/roles/download_pmu_tools/defaults/main.yml b/ansible/roles/download_pmu_tools/defaults/main.yml index 90dae66cf..3b164d1f9 100644 --- a/ansible/roles/download_pmu_tools/defaults/main.yml +++ b/ansible/roles/download_pmu_tools/defaults/main.yml @@ -1,5 +1,5 @@ --- pmu_tools_url: "https://github.com/andikleen/pmu-tools.git" pmu_tools_dest: "{{ clone_dest }}/pmu-tools" -pmu_tools_version: "master" +pmu_tools_version: "8a0417a90c3ec9a09264ae9364519f499e8975c1" perfmon_url: "https://download.01.org/perfmon/" diff --git a/ansible/roles/download_pmu_tools/files/event_download_local.py b/ansible/roles/download_pmu_tools/files/event_download_local.py index 882fc5046..8eda2cd0d 100755 --- a/ansible/roles/download_pmu_tools/files/event_download_local.py +++ b/ansible/roles/download_pmu_tools/files/event_download_local.py @@ -16,35 +16,46 @@ # event_download.py download for current cpu # event_download.py -a download all # event_download.py cpustr... Download for specific CPU +from __future__ import absolute_import +from __future__ import print_function import sys + import re -from urllib2 import urlopen, URLError import os import string from fnmatch import fnmatch from shutil import copyfile +try: + from urllib2 import URLError +except ImportError: + # python 3 + from urllib.error import URLError + + urlpath = 'https://download.01.org/perfmon' -localpath = 'download.01.org/perfmon' +localpath = 'pmu_local_mirror/download.01.org/perfmon' mapfile = 'mapfile.csv' modelpath = localpath + "/" + mapfile -NSB_JSON = '/opt/nsb_bin/pmu_event.json' +NSB_JSON = os.environ.get("PMU_EVENTS_PATH", "/tmp/pmu_event.json") + def get_cpustr(): - f = open('/proc/cpuinfo', 'r') - cpu = [None, None, None] - for j in f: - n = j.split() - if n[0] == 'vendor_id': - cpu[0] = n[2] - elif n[0] == 'model' and n[1] == ':': - cpu[2] = int(n[2]) - elif n[0] == 'cpu' and n[1] == 'family': - cpu[1] = int(n[3]) - if all(cpu): - break + with open('/proc/cpuinfo', 'r') as f: + cpu = [None, None, None] + for j in f: + n = j.split() + if n[0] == 'vendor_id': + cpu[0] = n[2] + elif n[0] == 'model' and n[1] == ':': + cpu[2] = int(n[2]) + elif n[0] == 'cpu' and n[1] == 'family': + cpu[1] = int(n[3]) + if all(cpu): + break return "%s-%d-%X" % (cpu[0], cpu[1], cpu[2]) + def sanitize(s, a): o = "" for j in s: @@ -52,13 +63,14 @@ def sanitize(s, a): o += j return o + def getdir(): try: d = os.getenv("XDG_CACHE_HOME") xd = d if not d: home = os.getenv("HOME") - d = "%s/.cache" % (home) + d = "%s/.cache" % home d += "/pmu-events" if not os.path.isdir(d): # try to handle the sudo case @@ -73,11 +85,13 @@ def getdir(): except OSError: raise Exception('Cannot access ' + d) + NUM_TRIES = 3 + def getfile(url, dir, fn): tries = 0 - print "Downloading", url, "to", fn + print("Downloading", url, "to", fn) while True: try: f = open(url) @@ -86,15 +100,17 @@ def getfile(url, dir, fn): tries += 1 if tries >= NUM_TRIES: raise - print "retrying download" + print("retrying download") continue break - o = open(os.path.join(dir, fn), "w") - o.write(data) - o.close() + with open(os.path.join(dir, fn), "w") as o: + o.write(data) f.close() + allowed_chars = string.ascii_letters + '_-.' + string.digits + + def download(match, key=None, link=True): found = 0 dir = getdir() @@ -105,14 +121,14 @@ def download(match, key=None, link=True): n = j.rstrip().split(",") if len(n) < 4: if len(n) > 0: - print "Cannot parse", n + print("Cannot parse", n) continue cpu, version, name, type = n if not fnmatch(cpu, match) or (key is not None and type not in key) or type.startswith("EventType"): continue cpu = sanitize(cpu, allowed_chars) url = localpath + name - fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars)) + fn = "%s-%s.json" % (cpu, sanitize(type, allowed_chars)) try: os.remove(os.path.join(dir, fn)) except OSError: @@ -128,34 +144,37 @@ def download(match, key=None, link=True): try: os.symlink(fn, os.path.join(dir, lname)) except OSError as e: - print >>sys.stderr, "Cannot link %s to %s:" % (name, lname), e + print("Cannot link %s to %s:" % (name, lname), e, file=sys.stderr) found += 1 models.close() getfile(localpath + "/readme.txt", dir, "readme.txt") except URLError as e: - print >>sys.stderr, "Cannot access event server:", e - print >>sys.stderr, "If you need a proxy to access the internet please set it with:" - print >>sys.stderr, "\texport https_proxy=http://proxyname..." - print >>sys.stderr, "If you are not connected to the internet please run this on a connected system:" - print >>sys.stderr, "\tevent_download.py '%s'" % (match) - print >>sys.stderr, "and then copy ~/.cache/pmu-events to the system under test" - print >>sys.stderr, "To get events for all possible CPUs use:" - print >>sys.stderr, "\tevent_download.py -a" + print("Cannot access event server:", e, file=sys.stderr) + print("If you need a proxy to access the internet please set it with:", file=sys.stderr) + print("\texport https_proxy=http://proxyname...", file=sys.stderr) + print("If you are not connected to the internet please run this on a connected system:", file=sys.stderr) + print("\tevent_download.py '%s'" % match, file=sys.stderr) + print("and then copy ~/.cache/pmu-events to the system under test", file=sys.stderr) + print("To get events for all possible CPUs use:", file=sys.stderr) + print("\tevent_download.py -a", file=sys.stderr) except OSError as e: - print >>sys.stderr, "Cannot write events file:", e + print("Cannot write events file:", e, file=sys.stderr) return found + def download_current(link=False): """Download JSON event list for current cpu. Returns >0 when a event list is found""" return download(get_cpustr(), link=link) + def eventlist_name(name=None, key="core"): if not name: name = get_cpustr() cache = getdir() return "%s/%s-%s.json" % (cache, name, key) + if __name__ == '__main__': # only import argparse when actually called from command line # this makes ocperf work on older python versions without it. @@ -164,18 +183,19 @@ if __name__ == '__main__': p.add_argument('--all', '-a', help='Download all available event files', action='store_true') p.add_argument('--verbose', '-v', help='Be verbose', action='store_true') p.add_argument('--mine', help='Print name of current CPU', action='store_true') - p.add_argument('--link', help='Create links with the original event file name', action='store_true', default=True) + p.add_argument('--link', help='Create links with the original event file name', + action='store_true', default=True) p.add_argument('cpus', help='CPU identifiers to download', nargs='*') args = p.parse_args() cpustr = get_cpustr() if args.verbose or args.mine: - print "My CPU", cpustr + print("My CPU", cpustr) if args.mine: sys.exit(0) d = getdir() if args.all: - found = download('*', link=args.link) + found = download('*', link=args.link) elif len(args.cpus) == 0: found = download_current(link=args.link) else: @@ -184,10 +204,10 @@ if __name__ == '__main__': found += download(j, link=args.link) if found == 0: - print >>sys.stderr, "Nothing found" + print("Nothing found", file=sys.stderr) el = eventlist_name() if os.path.exists(el): - print "my event list", el - copyfile(el,NSB_JSON) - print "File copied to ", NSB_JSON + print("my event list", el) + copyfile(el, NSB_JSON) + print("File copied to ", NSB_JSON) diff --git a/ansible/roles/download_pmu_tools/tasks/main.yml b/ansible/roles/download_pmu_tools/tasks/main.yml index e78cc72d6..59a63aa85 100644 --- a/ansible/roles/download_pmu_tools/tasks/main.yml +++ b/ansible/roles/download_pmu_tools/tasks/main.yml @@ -29,13 +29,15 @@ pmu_tools_path: "{{ pmu_tools_dest }}" - name: Create perfmon local mirror - command: "wget -mkEpnp {{ perfmon_url }} -P {{ pmu_tools_dest }}" + command: "wget -mkEpnp {{ perfmon_url }} -P {{ INSTALL_BIN_PATH }}/pmu_local_mirror" ignore_errors: yes + failed_when: false #some of the links while creating mirror are not found, results in failure + no_log: True - name: Copy local event download file copy: src: event_download_local.py - dest: "{{ pmu_tools_dest }}" + dest: "{{ INSTALL_BIN_PATH }}/event_download_local.py" owner: root group: root mode: 0755 diff --git a/ansible/roles/increase_open_file_limits/defaults/main.yml b/ansible/roles/increase_open_file_limits/defaults/main.yml new file mode 100644 index 000000000..02cb12461 --- /dev/null +++ b/ansible/roles/increase_open_file_limits/defaults/main.yml @@ -0,0 +1,15 @@ +# 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. +--- +open_file_limit: 500000 diff --git a/ansible/roles/increase_open_file_limits/tasks/main.yml b/ansible/roles/increase_open_file_limits/tasks/main.yml new file mode 100644 index 000000000..4ef5e6f23 --- /dev/null +++ b/ansible/roles/increase_open_file_limits/tasks/main.yml @@ -0,0 +1,20 @@ +# 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. +--- + - name: increase open file limits for control + pam_limits: "domain={{ item[0] }} limit_type={{ item[1] }} limit_item=nofile value={{ open_file_limit }}" + with_nested: + - [ '*', 'root' ] + - [ 'soft', 'hard' ] + diff --git a/ansible/roles/install_image_dependencies/defaults/main.yml b/ansible/roles/install_image_dependencies/defaults/main.yml index 1540806cc..362fa351b 100644 --- a/ansible/roles/install_image_dependencies/defaults/main.yml +++ b/ansible/roles/install_image_dependencies/defaults/main.yml @@ -22,6 +22,9 @@ install_dependencies: - unzip # for Trex - libpython2.7-dev + # for IxLoad + - libxft-dev + - libxss-dev RedHat: - bc - fio diff --git a/ansible/scale_out_test_templates.yml b/ansible/scale_out_test_templates.yml new file mode 100644 index 000000000..4213816fa --- /dev/null +++ b/ansible/scale_out_test_templates.yml @@ -0,0 +1,48 @@ +# 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: ../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/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_out.yaml + dest: ../samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/acl/acl-tg-topology-3node-scale-out.yaml + dest: ../samples/vnf_samples/nsut/acl/acl-tg-topology-3node-{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_out.yaml + dest: ../samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_out.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_{{ num_vnfs }}.yaml + +- template: + src: ../samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-scale-out.yaml + dest: ../samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-{{ num_vnfs }}.yaml diff --git a/ansible/sriov_scale_out_test_ixia_correlated_templates.yml b/ansible/sriov_scale_out_test_ixia_correlated_templates.yml index 2a6c352b4..626030712 100644 --- a/ansible/sriov_scale_out_test_ixia_correlated_templates.yml +++ b/ansible/sriov_scale_out_test_ixia_correlated_templates.yml @@ -21,7 +21,7 @@ - template: - src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-scale-out.yaml + src: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml dest: ../samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml - template: diff --git a/ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml b/ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml index e3c8c7ca1..516676576 100644 --- a/ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml +++ b/ansible/standalone_ovs_scale_out_ixia_correlated_test.yaml @@ -55,7 +55,7 @@ ixchassis: "1.1.1.127" #ixia chassis ip tcl_port: "8009" # tcl server port lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0" - ""_dir: "/opt/ixia/ixos-api/8.01.0.2/" + root_dir: "/opt/ixia/ixos-api/8.01.0.2/" py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/" py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi" dut_result_dir: "/mnt/results" @@ -87,7 +87,7 @@ # Environment variables gen_1: user: "" - password: ""! + password: "" key_filename: /""/.ssh/id_rsa pcis: uplink: diff --git a/ansible/standalone_ovs_scale_out_ixia_test.yaml b/ansible/standalone_ovs_scale_out_ixia_test.yaml index d8ee224ac..ff665377f 100644 --- a/ansible/standalone_ovs_scale_out_ixia_test.yaml +++ b/ansible/standalone_ovs_scale_out_ixia_test.yaml @@ -27,6 +27,8 @@ socket_0: 2048 socket_1: 2048 flavor: + user: root + password: "" ram: 4096 image: "/var/lib/libvirt/images/ubuntu.qcow2" extra_specs: @@ -56,7 +58,7 @@ ixchassis: "1.1.1.127" #ixia chassis ip tcl_port: "8009" # tcl server port lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0" - ""_dir: "/opt/ixia/ixos-api/8.01.0.2/" + root_dir: "/opt/ixia/ixos-api/8.01.0.2/" py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/" py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi" dut_result_dir: "/mnt/results" diff --git a/ansible/standalone_ovs_scale_out_test.yaml b/ansible/standalone_ovs_scale_out_test.yaml index 2a0246c2d..996fc0f50 100644 --- a/ansible/standalone_ovs_scale_out_test.yaml +++ b/ansible/standalone_ovs_scale_out_test.yaml @@ -51,9 +51,9 @@ # Environment variables gen: - user: root + user: "" password: "" - key_filename: /root/.ssh/id_rsa + key_filename: ~ pcis: uplink: - "0000:05:00.0" @@ -80,9 +80,9 @@ host: ip: "192.168.100.101/24" - user: root + user: "" password: "" - key_filename: /root/.ssh/id_rsa + key_filename: ~ vnf: pcis: diff --git a/ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml b/ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml index 084dcbf7e..45a4a498b 100644 --- a/ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml +++ b/ansible/standalone_sriov_scale_out_ixia_correlated_test.yaml @@ -47,7 +47,7 @@ ixchassis: "1.1.1.127" #ixia chassis ip tcl_port: "8009" # tcl server port lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0" - ""_dir: "/opt/ixia/ixos-api/8.01.0.2/" + root_dir: "/opt/ixia/ixos-api/8.01.0.2/" py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/" py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi" dut_result_dir: "/mnt/results" @@ -80,7 +80,7 @@ gen_1: user: "" password: "" - key_filename: /""/.ssh/id_rsa + key_filename: "~" pcis: uplink: - "0000:05:00.0" diff --git a/ansible/standalone_sriov_scale_out_ixia_test.yaml b/ansible/standalone_sriov_scale_out_ixia_test.yaml index 79ec0e68e..659dbef07 100644 --- a/ansible/standalone_sriov_scale_out_ixia_test.yaml +++ b/ansible/standalone_sriov_scale_out_ixia_test.yaml @@ -47,7 +47,7 @@ ixchassis: "1.1.1.127" #ixia chassis ip tcl_port: "8009" # tcl server port lib_path: "/opt/ixia/ixos-api/8.01.0.2/lib/ixTcl1.0" - ""_dir: "/opt/ixia/ixos-api/8.01.0.2/" + root_dir: "/opt/ixia/ixos-api/8.01.0.2/" py_bin_path: "/opt/ixia/ixload/8.01.106.3/bin/" py_lib_path: "/opt/ixia/ixnetwork/8.01.1029.14/lib/PythonApi" dut_result_dir: "/mnt/results" @@ -80,7 +80,7 @@ ip: "192.168.100.101/24" user: "" password: "" - key_filename: /""/.ssh/id_rsa + key_filename: "~" vnf: user: "" diff --git a/ansible/standalone_sriov_scale_out_test.yaml b/ansible/standalone_sriov_scale_out_test.yaml index e51e5617e..fe6989d54 100644 --- a/ansible/standalone_sriov_scale_out_test.yaml +++ b/ansible/standalone_sriov_scale_out_test.yaml @@ -19,7 +19,7 @@ - 2 flavor: user: root - password: ""! + password: "" ram: 4096 image: "/var/lib/libvirt/images/ubuntu.qcow2" extra_specs: diff --git a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml index 891ccd1dc..42a7b2d08 100644 --- a/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml +++ b/ansible/ubuntu_server_baremetal_deploy_samplevnfs.yml @@ -23,6 +23,8 @@ when: proxy_env is defined and proxy_env # can't update grub in chroot/docker - enable_hugepages_on_boot + # needed for collectd plugins + - increase_open_file_limits - install_image_dependencies - role: download_dpdk # dpdk_version: "17.02" diff --git a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml index 79249dd37..dff7f976a 100644 --- a/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml +++ b/ansible/ubuntu_server_cloudimg_modify_samplevnfs.yml @@ -31,6 +31,8 @@ when: proxy_env is defined and proxy_env # can't update grub in chroot/docker - enable_hugepages_on_boot + # needed for collectd plugins + - increase_open_file_limits - modify_cloud_config - install_image_dependencies - role: download_dpdk diff --git a/dashboard/Prox_BM_ACL_Test-2Port-1499777741771.json b/dashboard/Prox_BM_ACL-2Port-1507803762832.json index 67f8dba01..a0493b1dd 100644 --- a/dashboard/Prox_BM_ACL_Test-2Port-1499777741771.json +++ b/dashboard/Prox_BM_ACL-2Port-1507803762832.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_ACL_Test-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "ACL", - "BM", - "2Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "ACL VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -329,6 +341,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -351,6 +364,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -388,6 +402,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -408,9 +423,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -419,7 +450,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -443,18 +478,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -474,6 +505,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -496,6 +528,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -533,6 +566,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -553,9 +587,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -564,7 +614,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -586,29 +640,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -628,6 +681,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -650,6 +704,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -687,6 +742,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -707,6 +763,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -718,12 +790,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -742,18 +818,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -773,6 +845,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -795,6 +868,7 @@ } ], "measurement": "tc_prox_baremetal_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -813,48 +887,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_acl-2", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "TG Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -863,11 +916,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -885,9 +942,27 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "ACL", + "BM", + "2Port" + ], + "templating": { + "list": [] + }, "time": { "from": "now/w", "to": "now" @@ -917,15 +992,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 26, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_ACL-2Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_ACL_Test-4Port-1499777725160.json b/dashboard/Prox_BM_ACL-4Port-1507803770817.json index 949c454e9..eba2dee87 100644 --- a/dashboard/Prox_BM_ACL_Test-4Port-1499777725160.json +++ b/dashboard/Prox_BM_ACL-4Port-1507803770817.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_ACL_Test-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "ACL", - "BM", - "4Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_4Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_ACL_4Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,29 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -242,6 +235,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "ACL VNF stats", @@ -253,7 +262,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -280,7 +293,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -288,28 +300,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +342,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +365,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +403,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -426,6 +441,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -463,6 +479,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -483,9 +500,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -494,7 +527,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -518,18 +555,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -549,6 +582,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -571,6 +605,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -608,6 +643,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -645,6 +681,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -682,6 +719,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -702,9 +740,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -713,7 +767,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -735,28 +793,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -776,6 +834,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -798,6 +857,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -835,6 +895,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -855,6 +916,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -866,12 +943,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -890,18 +971,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -921,6 +998,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -943,6 +1021,7 @@ } ], "measurement": "tc_prox_baremetal_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,43 +1040,22 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_acl-4", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, @@ -1011,11 +1069,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -1033,12 +1095,30 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "ACL", + "BM", + "4Port" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-06-27T09:43:32.713Z", - "to": "2017-06-27T09:46:04.003Z" + "from": "2017-10-11T12:04:28.624Z", + "to": "2017-10-11T12:10:22.755Z" }, "timepicker": { "refresh_intervals": [ @@ -1065,15 +1145,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 18, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_ACL-4Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_BNG-4Port-1506596922499.json b/dashboard/Prox_BM_BNG-4Port-1507803777936.json index f48e931fe..adbfedc37 100644 --- a/dashboard/Prox_BM_BNG-4Port-1506596922499.json +++ b/dashboard/Prox_BM_BNG-4Port-1507803777936.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,37 +23,31 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_BNG-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "BM", - "BNG" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { @@ -61,7 +55,6 @@ "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "BNG VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,12 +525,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Packets Out", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,6 +580,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,12 +765,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Packets In", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,6 +832,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,6 +914,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_baremetal_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "bytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,16 +1093,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "BM", + "BNG" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-08-11T08:30:38.655Z", "to": "2017-08-11T08:33:45.419Z" @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 8, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_BNG-4Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_BNG-QoS-4Port-1506596922499.json b/dashboard/Prox_BM_BNG-QoS-4Port-1507804267386.json index 9c67dfe1e..f095c35fa 100644 --- a/dashboard/Prox_BM_BNG-QoS-4Port-1506596922499.json +++ b/dashboard/Prox_BM_BNG-QoS-4Port-1507804267386.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_BNG-QoS-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "BM", - "BNG QoS" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS. </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS </p>\n<p>This use case simulates a realistic and complex application. The number of users is 32K per port and the number of routes is 8K</p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "BNG QoS VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,12 +525,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Packets Out", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,6 +580,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,12 +765,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Packets In", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,6 +832,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,6 +914,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_baremetal_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "bytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,16 +1093,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "BM", + "BNG QoS" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-08-11T08:30:38.655Z", "to": "2017-08-11T08:33:45.419Z" @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 8, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_BNG-QoS-4Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L2FWD-2Port-1501492823086.json b/dashboard/Prox_BM_L2FWD-2Port-1507804495722.json index 62e3dbda7..e4b9f93e0 100644 --- a/dashboard/Prox_BM_L2FWD-2Port-1501492823086.json +++ b/dashboard/Prox_BM_L2FWD-2Port-1507804495722.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,44 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L2FWD-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "BM", - "2Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_2Port_BM_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_2Port_BM_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -146,6 +140,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -183,6 +178,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -220,6 +216,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -240,9 +237,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "L3Fwd VNF stats", + "title": "L2Fwd VNF stats", "tooltip": { "msResolution": true, "shared": true, @@ -251,7 +264,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +295,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +302,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,12 +343,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -349,6 +366,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -369,7 +387,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -386,6 +404,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -406,9 +425,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -417,7 +452,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -441,18 +480,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -472,12 +507,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -494,6 +530,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -514,7 +551,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -531,6 +568,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -551,9 +589,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -562,7 +616,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -584,29 +642,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -626,12 +683,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -648,6 +706,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -668,7 +727,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -685,6 +744,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -705,9 +765,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -716,12 +792,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -740,18 +820,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -771,6 +847,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -793,6 +870,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -813,6 +891,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -824,11 +918,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "bytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -846,19 +944,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "BM", + "2Port", + "L2Fwd" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-11T13:40:37.452Z", - "to": "2017-07-11T13:42:24.186Z" + "from": "2017-10-03T09:39:42.199Z", + "to": "2017-10-03T09:47:01.687Z" }, "timepicker": { "refresh_intervals": [ @@ -885,15 +1005,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 5, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L2FWD-2Port", + "version": 9 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L2FWD-4Port-1501498495048.json b/dashboard/Prox_BM_L2FWD-4Port-1507804504588.json index 0933d5031..0a00958bb 100644 --- a/dashboard/Prox_BM_L2FWD-4Port-1501498495048.json +++ b/dashboard/Prox_BM_L2FWD-4Port-1507804504588.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L2FWD-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "L2fwd", - "4Port", - "BM" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L2Fwd VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,7 +422,7 @@ "tags": [] }, { - "alias": "Tgen xe-2 Out packets", + "alias": "TG xe-2 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -444,7 +460,7 @@ "tags": [] }, { - "alias": "Tgen xe-3 Out packets", + "alias": "TG xe-3 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,7 +525,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,12 +580,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -589,7 +624,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -626,7 +662,7 @@ "tags": [] }, { - "alias": "Tgen xe-2 in packets", + "alias": "TG xe-2 in packets", "dsType": "influxdb", "groupBy": [ { @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -663,7 +700,7 @@ "tags": [] }, { - "alias": "Tgen xe-3 in packets", + "alias": "TG xe-3 in packets", "dsType": "influxdb", "groupBy": [ { @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,7 +765,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,12 +832,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -817,7 +876,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,9 +914,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,19 +1093,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "L2fwd", + "4Port", + "BM" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-31T10:48:35.874Z", - "to": "2017-07-31T10:50:34.033Z" + "from": "2017-10-02T08:41:16.579Z", + "to": "2017-10-02T08:58:57.509Z" }, "timepicker": { "refresh_intervals": [ @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 1, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L2FWD-4Port", + "version": 8 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1501760631065.json b/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1507803812868.json index 554006f7c..488d2f272 100644 --- a/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1501760631065.json +++ b/dashboard/Prox_BM_L2FWD_Multiflow-2Port-1507803812868.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L2FWD_Multiflow-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "BM", - "2Port", - "L2FWD_Multiflow" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_BM_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst ip addresses). The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_BM_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst ip addresses). The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L2Fwd Multiflow VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,9 +422,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -418,7 +449,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +477,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -473,12 +504,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -495,6 +527,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -515,7 +548,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -532,6 +565,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -552,9 +586,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -563,7 +613,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -585,29 +639,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -627,12 +680,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -649,6 +703,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -669,7 +724,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -686,6 +741,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -706,9 +762,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -717,12 +789,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -741,18 +817,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -772,6 +844,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -794,6 +867,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -814,6 +888,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -825,11 +915,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -847,19 +941,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "BM", + "2Port", + "L2FWD_Multiflow" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-08-03T10:00:17.289Z", - "to": "2017-08-03T10:02:23.481Z" + "from": "2017-09-29T13:57:22.710Z", + "to": "2017-09-29T14:04:48.839Z" }, "timepicker": { "refresh_intervals": [ @@ -886,15 +1002,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 5, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L2FWD_Multiflow-2Port", + "version": 8 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1501760650413.json b/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1507803820923.json index a431a66c2..7ed3f6883 100644 --- a/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1501760650413.json +++ b/dashboard/Prox_BM_L2FWD_Multiflow-4Port-1507803820923.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L2FWD_Multiflow-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "L2FWD_Multiflow", - "BM" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated) The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated) The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,29 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -242,6 +235,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "L2FWD Multiflow VNF stats", @@ -253,7 +262,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -280,7 +293,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -288,28 +300,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +342,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +365,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +403,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -426,6 +441,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -463,6 +479,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -483,9 +500,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -494,7 +527,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -518,18 +555,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -549,6 +582,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -571,6 +605,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -608,6 +643,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -645,6 +681,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -682,6 +719,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -702,9 +740,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -713,7 +767,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -735,28 +793,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -776,6 +834,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -798,6 +857,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -835,6 +895,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -855,6 +916,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -866,12 +943,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -890,18 +971,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -921,6 +998,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -943,6 +1021,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,48 +1040,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_l2fwd_multiflow-4", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -1011,11 +1069,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -1033,12 +1095,30 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "L2FWD_Multiflow", + "BM" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-08-03T10:26:14.359Z", - "to": "2017-08-03T10:28:43.436Z" + "from": "now/y", + "to": "now/y" }, "timepicker": { "refresh_intervals": [ @@ -1065,15 +1145,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 8, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L2FWD_Multiflow-4Port", + "version": 7 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-2Port-1500472590269.json b/dashboard/Prox_BM_L2FWD_Packet_Touch-2Port-1507803835253.json index 112b5cdc4..b2ba076cd 100644 --- a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-2Port-1500472590269.json +++ b/dashboard/Prox_BM_L2FWD_Packet_Touch-2Port-1507803835253.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,44 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L2FWD_Packet_Touch_Test-2Port", - "tags": [ - "NSB", - "Prox", - "BM", - "2Port", - "L2Fwd Packet Touch" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -240,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "VNF stats: Packet In, Forward and Dropped", @@ -251,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -406,6 +420,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port stats: Out packets", @@ -417,7 +447,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -441,18 +475,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -472,6 +502,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -551,6 +582,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -562,7 +609,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -584,29 +635,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -626,6 +676,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -648,6 +699,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -685,6 +737,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -705,6 +758,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -716,12 +785,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -740,18 +813,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -771,6 +840,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -793,6 +863,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -813,9 +884,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size", + "title": "Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -824,11 +911,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -846,9 +937,26 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "NSB", + "Prox", + "BM", + "2Port", + "L2Fwd Packet Touch" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-07-19T13:01:50.468Z", "to": "2017-07-19T13:04:44.745Z" @@ -878,15 +986,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 17, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L2FWD_Packet_Touch-2Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-4Port-1500472599088.json b/dashboard/Prox_BM_L2FWD_Packet_Touch-4Port-1507803851310.json index c39308224..10054310c 100644 --- a/dashboard/Prox_BM_L2FWD_Packet_Touch_Test-4Port-1500472599088.json +++ b/dashboard/Prox_BM_L2FWD_Packet_Touch-4Port-1507803851310.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,44 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L2FWD_Packet_Touch_Test-4Port", - "tags": [ - "NSB", - "Prox", - "BM", - "4Port", - "L2Fwd packet touch" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2Fwd_Packet_Touch_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -240,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "VNF stats: Packet In, Forward and Dropped", @@ -251,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -349,6 +363,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -386,6 +401,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -423,6 +439,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -460,6 +477,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -480,6 +498,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -491,7 +525,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -515,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -546,6 +580,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -699,6 +734,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -710,7 +761,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -732,29 +787,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -774,6 +828,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -796,6 +851,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -833,6 +889,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -853,6 +910,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -864,12 +937,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -888,18 +965,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -919,6 +992,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -941,6 +1015,7 @@ } ], "measurement": "tc_prox_baremetal_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,9 +1036,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size", + "title": "Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -972,11 +1063,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -994,19 +1089,40 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "NSB", + "Prox", + "BM", + "4Port", + "L2Fwd packet touch" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-19T13:49:40.514Z", - "to": "2017-07-19T13:51:37.781Z" + "from": "2017-09-29T13:38:49.432Z", + "to": "2017-09-29T13:46:53.369Z" }, "timepicker": { "refresh_intervals": [ @@ -1033,15 +1149,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 7, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L2FWD_Packet_Touch-4Port", + "version": 6 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L3FWD-2Port-1500900469978.json b/dashboard/Prox_BM_L3FWD-2Port-1507803870940.json index 45a8c818b..4d8d15b0c 100644 --- a/dashboard/Prox_BM_L3FWD-2Port-1500900469978.json +++ b/dashboard/Prox_BM_L3FWD-2Port-1507803870940.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,44 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L3FWD-2Port", - "tags": [ - "NSB", - "Prox", - "BM", - "L3Fwd", - "2Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_2Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_2Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -240,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "VNF stats: Packet In, Forward and Dropped", @@ -251,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -406,6 +420,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -417,7 +447,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -441,18 +475,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -472,6 +502,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -551,6 +582,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -562,7 +609,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -584,29 +635,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -626,6 +676,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -648,6 +699,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -685,6 +737,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -705,6 +758,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -716,12 +785,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -740,18 +813,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -771,6 +840,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -793,6 +863,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -813,9 +884,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size", + "title": "Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -824,11 +911,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -846,19 +937,40 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "NSB", + "Prox", + "BM", + "L3Fwd", + "2Port" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-24T12:42:38.308Z", - "to": "2017-07-24T12:45:12.874Z" + "from": "2017-10-02T11:24:07.295Z", + "to": "2017-10-02T11:26:12.649Z" }, "timepicker": { "refresh_intervals": [ @@ -885,15 +997,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 3, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L3FWD-2Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_L3FWD-4Port-1500900168552.json b/dashboard/Prox_BM_L3FWD-4Port-1507803878020.json index ec8abbef7..09184cb2d 100644 --- a/dashboard/Prox_BM_L3FWD-4Port-1500900168552.json +++ b/dashboard/Prox_BM_L3FWD-4Port-1507803878020.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,44 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_L3FWD-4Port", - "tags": [ - "NSB", - "Prox", - "BM", - "4Port", - "L3Fwd" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_4Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L3Fwd_4Port_Test</center> </a></h5>\n<center>\n<p>The application performs routing of packets with LPM based look-up method.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -240,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "VNF stats: Packet In, Forward and Dropped", @@ -251,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -480,6 +494,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -491,7 +521,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -515,18 +549,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -546,6 +576,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -699,6 +730,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -710,7 +757,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -732,29 +783,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -774,6 +824,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -796,6 +847,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -833,6 +885,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -853,6 +906,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -864,12 +933,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -888,18 +961,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -919,6 +988,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -941,6 +1011,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,9 +1032,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size", + "title": "Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -972,11 +1059,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -994,19 +1085,40 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "NSB", + "Prox", + "BM", + "4Port", + "L3Fwd" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-24T11:06:05.950Z", - "to": "2017-07-24T11:09:07.902Z" + "from": "2017-09-29T14:12:51.977Z", + "to": "2017-09-29T14:19:29.296Z" }, "timepicker": { "refresh_intervals": [ @@ -1033,15 +1145,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_L3FWD-4Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_LB_1to4-4Port-1501782362979.json b/dashboard/Prox_BM_LB_1to4-4Port-1507803887997.json index 7adbd0b66..ebf8aa7ff 100644 --- a/dashboard/Prox_BM_LB_1to4-4Port-1501782362979.json +++ b/dashboard/Prox_BM_LB_1to4-4Port-1507803887997.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_LB_1to4-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "BM", - "LB" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second with an accepted minimal packet loss for a specified packet size</p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,42 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n", - "editable": true, - "error": false, - "height": "40", - "id": 8, - "isNew": true, - "links": [], - "mode": "html", - "span": 12, - "title": "", - "type": "text" - }, - { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 10, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,7 +105,7 @@ "max": true, "min": true, "rightSide": false, - "show": false, + "show": true, "total": false, "values": true }, @@ -139,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -161,6 +141,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -198,6 +179,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -235,6 +217,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -255,6 +238,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "Load Balancer VNF stats", @@ -266,7 +265,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -288,28 +291,40 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n", + "editable": true, + "error": false, + "height": "40", + "id": 8, + "links": [], + "mode": "html", + "span": 12, + "title": "", + "type": "text" + }, + { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +345,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +368,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +406,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -426,6 +444,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -463,6 +482,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -483,9 +503,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -494,7 +530,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -518,18 +558,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -549,6 +585,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -571,6 +608,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -608,6 +646,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -645,6 +684,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -682,6 +722,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -702,9 +743,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -713,7 +770,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -735,28 +796,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -776,6 +837,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -798,6 +860,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -835,6 +898,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -855,6 +919,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -866,12 +946,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -890,18 +974,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -921,6 +1001,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -943,6 +1024,7 @@ } ], "measurement": "tc_prox_baremetal_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,48 +1043,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_lb-4", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "TG Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -1011,11 +1072,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -1033,12 +1098,30 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "BM", + "LB" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-08-03T17:29:12.741Z", - "to": "2017-08-03T17:30:59.111Z" + "from": "2017-10-10T13:42:45.059Z", + "to": "2017-10-10T13:48:35.750Z" }, "timepicker": { "refresh_intervals": [ @@ -1065,15 +1148,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_LB_1to4-4Port", + "version": 10 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_MPLS_tag_untag_Test-2Port-1500049478510.json b/dashboard/Prox_BM_MPLS_tagging-2Port-1507803918014.json index 5dbe09159..16012b92a 100644 --- a/dashboard/Prox_BM_MPLS_tag_untag_Test-2Port-1500049478510.json +++ b/dashboard/Prox_BM_MPLS_tagging-2Port-1507803918014.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_MPLS_tag_untag_Test-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "BM", - "MPLS", - "2Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tagging_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -147,6 +140,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -184,6 +178,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -221,6 +216,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -241,6 +237,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "MPLS VNF stats", @@ -252,7 +264,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +295,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +302,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +343,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +366,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +404,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,6 +425,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -418,7 +452,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +480,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -473,6 +507,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -495,6 +530,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -502,7 +538,7 @@ [ { "params": [ - "tg__0.xe0.in_packets" + "tg__0.xe1.in_packets" ], "type": "field" }, @@ -532,6 +568,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -552,6 +589,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -563,7 +616,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -585,29 +642,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -627,6 +683,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -649,6 +706,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -686,6 +744,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -706,6 +765,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -717,12 +792,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -741,18 +820,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -772,6 +847,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -794,6 +870,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -814,6 +891,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Packet size", @@ -825,11 +918,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -847,19 +944,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "BM", + "MPLS", + "2Port" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-14T10:36:36.944Z", - "to": "2017-07-14T10:39:35.738Z" + "from": "2017-09-28T15:52:05.857Z", + "to": "2017-09-28T16:12:48.623Z" }, "timepicker": { "refresh_intervals": [ @@ -886,15 +1005,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 2, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_MPLS_tagging-2Port", + "version": 8 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_MPLS_tag_untag_Test-4Port-1500049362613.json b/dashboard/Prox_BM_MPLS_tagging-4Port-1507803926523.json index 6e2f568a4..8dba84e0b 100644 --- a/dashboard/Prox_BM_MPLS_tag_untag_Test-4Port-1500049362613.json +++ b/dashboard/Prox_BM_MPLS_tagging-4Port-1507803926523.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_MPLS_tag_untag_Test-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "BM", - "4Port", - "MPLS" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tag_Untag_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_MPLS_Tagging_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "MPLS VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,6 +498,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -492,7 +525,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,6 +580,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -700,6 +734,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -711,7 +761,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -733,29 +787,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,6 +828,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -797,6 +851,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -834,6 +889,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,6 +910,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -865,12 +937,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +965,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +992,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1015,7 @@ } ], "measurement": "tc_prox_baremetal_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1036,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Packet size", @@ -973,11 +1063,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,19 +1089,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "BM", + "4Port", + "MPLS" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-10T18:44:50.858Z", - "to": "2017-07-10T18:52:56.422Z" + "from": "2017-09-28T16:20:28.692Z", + "to": "2017-09-28T16:22:45.584Z" }, "timepicker": { "refresh_intervals": [ @@ -1034,15 +1150,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 7, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_MPLS_tagging-4Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_Packet_Buffering_Test-1Port-1501146963774.json b/dashboard/Prox_BM_Packet_Buffering-1Port-1507803960476.json index 01fff32c3..64ee1c52c 100644 --- a/dashboard/Prox_BM_Packet_Buffering_Test-1Port-1501146963774.json +++ b/dashboard/Prox_BM_Packet_Buffering-1Port-1507803960476.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_BM_Packet_Buffering_Test-1Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "BM", - "Buffering", - "1Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>The KPI in this test is the maximum number of packets that can be forwarded\n given the requirement that the latency of each packet is at least\n 125 millisecond</p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>This test measures the impact of the condition when packets get buffered, thus they stay in memory for the extended period of time.</p>\n<p>The KPI in this test is the maximum number of packets that can be forwarded given the requirement that the latency of each packet is at least 125 millisecond</p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet Buffering VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -407,6 +420,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port stats: Out vs In packets", @@ -418,7 +447,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +475,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 9, - "isNew": true, + "grid": {}, + "id": 2, "legend": { "alignAsTable": true, "avg": true, @@ -473,12 +502,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Min Latency", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -495,6 +525,7 @@ } ], "measurement": "tc_prox_baremetal_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -502,7 +533,7 @@ [ { "params": [ - "tg__0.LatencyMin.2" + "tg__0.Throughput" ], "type": "field" }, @@ -515,7 +546,7 @@ "tags": [] }, { - "alias": "Avg Latency", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -532,6 +563,7 @@ } ], "measurement": "tc_prox_baremetal_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -539,7 +571,7 @@ [ { "params": [ - "tg__0.LatencyAvg.2" + "tg__0.RxThroughput" ], "type": "field" }, @@ -550,48 +582,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 }, { - "alias": "Max Latency", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_buffering-1", - "policy": "default", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.LatencyMax.2" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 } ], "timeFrom": null, "timeShift": null, - "title": "TG Latency stats", + "title": "TG Throughput Stats", "tooltip": { "msResolution": true, "shared": true, @@ -600,12 +611,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Latency", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -622,29 +637,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, - "id": 2, - "isNew": true, + "grid": {}, + "id": 5, "legend": { "alignAsTable": true, "avg": true, @@ -664,12 +678,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "TG TX Throughput", + "alias": "TG Packet Size", "dsType": "influxdb", "groupBy": [ { @@ -686,6 +701,7 @@ } ], "measurement": "tc_prox_baremetal_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -693,44 +709,7 @@ [ { "params": [ - "tg__0.Throughput" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "TG RX Throughput", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_buffering-1", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.RxThroughput" + "tg__0.PktSize" ], "type": "field" }, @@ -743,112 +722,20 @@ "tags": [] } ], - "timeFrom": null, - "timeShift": null, - "title": "TG Throughput Stats", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ + "thresholds": [ { - "format": "pps", - "label": "Throughput", - "logBase": 1, - "max": null, - "min": null, - "show": true + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 }, { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": "${DS_YARDSTICK}", - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 5, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "TG Packet Size", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_baremetal_buffering-1", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.PktSize" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 } ], "timeFrom": null, @@ -862,11 +749,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -884,19 +775,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "BM", + "Buffering", + "1Port" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-14T15:56:09.546Z", - "to": "2017-07-14T15:59:17.008Z" + "from": "2017-10-10T16:10:20.580Z", + "to": "2017-10-10T16:16:35.111Z" }, "timepicker": { "refresh_intervals": [ @@ -923,15 +836,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 8, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_BM_Packet_Buffering-1Port", + "version": 7 }
\ No newline at end of file diff --git a/dashboard/Prox_BM_vPE-4Port-1507195330973.json b/dashboard/Prox_BM_vPE-4Port-1507804058631.json index 0802e7c28..52afcaed3 100644 --- a/dashboard/Prox_BM_vPE-4Port-1507195330973.json +++ b/dashboard/Prox_BM_vPE-4Port-1507804058631.json @@ -51,7 +51,7 @@ "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n<p>The KPI is the number of packets per second for a specified packet size (min packet size is 68 byte) with an accepted minimal packet loss</p>\n</center>", "editable": true, "error": false, "id": 3, @@ -519,7 +519,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -537,7 +537,7 @@ "yaxes": [ { "format": "short", - "label": "Packets Out", + "label": "Packets ", "logBase": 1, "max": null, "min": null, @@ -759,7 +759,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -777,7 +777,7 @@ "yaxes": [ { "format": "short", - "label": "Packets In", + "label": "Packets ", "logBase": 1, "max": null, "min": null, @@ -1129,8 +1129,8 @@ "list": [] }, "time": { - "from": "2017-10-04T10:48:59.715Z", - "to": "2017-10-04T10:56:46.895Z" + "from": "2017-10-09T11:05:30.701Z", + "to": "2017-10-09T11:11:21.952Z" }, "timepicker": { "refresh_intervals": [ @@ -1159,5 +1159,5 @@ }, "timezone": "browser", "title": "Prox_BM_vPE-4Port", - "version": 6 + "version": 10 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_ACL_Test-2Port-1499778177265.json b/dashboard/Prox_Heat_ACL-2Port-1507804110005.json index 112cb8e4a..417285524 100644 --- a/dashboard/Prox_Heat_ACL_Test-2Port-1499778177265.json +++ b/dashboard/Prox_Heat_ACL-2Port-1507804110005.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_ACL_Test-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "ACL", - "Heat", - "2Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_ACL_Heat_Test-2Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-2Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,29 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -242,6 +235,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "ACL VNF stats", @@ -253,7 +262,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -280,7 +293,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -288,28 +300,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +342,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +365,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +403,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -409,9 +424,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -420,7 +451,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -444,18 +479,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -475,6 +506,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -497,6 +529,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -534,6 +567,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -554,9 +588,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -565,7 +615,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -587,28 +641,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -628,6 +682,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -650,6 +705,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -687,6 +743,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -707,6 +764,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -718,12 +791,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -742,18 +819,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -773,6 +846,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -795,6 +869,7 @@ } ], "measurement": "tc_prox_heat_context_acl-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -813,48 +888,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "policy": "default", - "dsType": "influxdb", - "resultFormat": "time_series", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "tg__0.DropPackets" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "refId": "B", - "measurement": "tc_prox_heat_context_acl-2", - "alias": "TG Dropped Packets" + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "TG Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -863,11 +917,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -885,12 +943,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" + }, + { + "collapse": false, + "height": 250, + "panels": [], + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Dashboard Row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "ACL", + "Heat", + "2Port" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-07T15:33:56.340Z", - "to": "2017-07-07T15:36:11.941Z" + "from": "2017-10-11T15:30:57.312Z", + "to": "2017-10-11T15:38:33.455Z" }, "timepicker": { "refresh_intervals": [ @@ -917,15 +1004,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 7, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_ACL-2Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_ACL_Test-4Port-1499778040281.json b/dashboard/Prox_Heat_ACL-4Port-1507804119688.json index be45cc1bc..c093c5732 100644 --- a/dashboard/Prox_Heat_ACL_Test-4Port-1499778040281.json +++ b/dashboard/Prox_Heat_ACL-4Port-1507804119688.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_ACL_Test-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "ACL", - "Heat", - "4Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-4Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_ACL_Test-4Port</center> </a></h5>\n<center>\n<p>This test allows to measure how well the SUT can exploit structures in the list of ACL rules. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,29 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -242,6 +235,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "ACL VNF stats", @@ -253,7 +262,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -280,7 +293,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -288,28 +300,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +342,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +365,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +403,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -426,6 +441,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -463,6 +479,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -483,9 +500,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -494,7 +527,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -518,18 +555,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -549,6 +582,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -571,6 +605,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -608,6 +643,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -645,6 +681,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -682,6 +719,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -702,9 +740,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -713,7 +767,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -735,28 +793,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -776,6 +834,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -798,6 +857,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -835,6 +895,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -855,6 +916,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -866,12 +943,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -890,18 +971,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -921,6 +998,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -943,6 +1021,7 @@ } ], "measurement": "tc_prox_heat_context_acl-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,48 +1040,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_heat_context_acl-4", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "TG Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -1011,11 +1069,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -1033,9 +1095,27 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "ACL", + "Heat", + "4Port" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-07-07T15:00:35.628Z", "to": "2017-07-07T17:54:24.315Z" @@ -1065,15 +1145,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 12, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_ACL-4Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_BNG-4Port-1506596971791.json b/dashboard/Prox_Heat_BNG-4Port-1507804128983.json index f51eb60e5..447b7d67c 100644 --- a/dashboard/Prox_Heat_BNG-4Port-1506596971791.json +++ b/dashboard/Prox_Heat_BNG-4Port-1507804128983.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,37 +23,31 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_BNG-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "BNG", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { @@ -61,7 +55,6 @@ "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "BNG VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,7 +525,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,6 +580,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,7 +765,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,6 +832,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,6 +914,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_heat_context_bng-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,16 +1093,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "BNG", + "Heat" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-09-12T15:44:08.523Z", "to": "2017-09-12T15:49:33.638Z" @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_BNG-4Port", + "version": 3 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_BNG-QoS-4Port-1506596971791.json b/dashboard/Prox_Heat_BNG-QoS-4Port-1507804566403.json index 3a6fa7c3a..aeaa6edd5 100644 --- a/dashboard/Prox_Heat_BNG-QoS-4Port-1506596971791.json +++ b/dashboard/Prox_Heat_BNG-QoS-4Port-1507804566403.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_BNG-QoS-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "BNG QoS", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS. </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_BNG-QoS_4Port_Test</center> </a></h5>\n<center>\n<p>The BNG+QoS workload converts packets from QinQ to GRE tunnels, handles routing, adds/removes MPLS tags and performs QoS </p>\n<p>This use case simulates a realistic and complex application. The number of users is 32K per port and the number of routes is 8K</p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "BNG QoS VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,12 +525,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Packets Out", + "label": "Packets ", "logBase": 1, "max": null, "min": null, @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,6 +580,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,12 +765,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Packets In", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,6 +832,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,6 +914,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_heat_context_bng_qos-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,19 +1093,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "BNG QoS", + "Heat" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-09-12T15:44:08.523Z", - "to": "2017-09-12T15:49:33.638Z" + "from": "2017-10-04T14:48:46.365Z", + "to": "2017-10-04T15:52:41.999Z" }, "timepicker": { "refresh_intervals": [ @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_BNG-QoS-4Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L2FWD-2Port-1501497403194.json b/dashboard/Prox_Heat_L2FWD-2Port-1507804575099.json index fd1eaaafe..fa9a2f321 100644 --- a/dashboard/Prox_Heat_L2FWD-2Port-1501497403194.json +++ b/dashboard/Prox_Heat_L2FWD-2Port-1507804575099.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L2FWD-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "2Port", - "Heat", - "L2fwd" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L2Fwd VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,9 +422,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -418,7 +449,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +477,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -473,6 +504,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -495,6 +527,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -532,6 +565,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -552,9 +586,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -563,7 +613,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -585,29 +639,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -615,6 +668,7 @@ "max": true, "min": true, "show": true, + "sortDesc": true, "total": false, "values": true }, @@ -627,6 +681,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -649,6 +704,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -686,6 +742,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -706,6 +763,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Tgen Tx vs Rx Throughput", @@ -717,12 +790,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -741,18 +818,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -772,6 +845,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -794,6 +868,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -814,6 +889,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -825,11 +916,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -847,19 +942,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "2Port", + "Heat", + "L2fwd" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-31T09:13:44.495Z", - "to": "2017-07-31T09:16:49.248Z" + "from": "2017-10-03T09:54:49.531Z", + "to": "2017-10-03T10:00:54.659Z" }, "timepicker": { "refresh_intervals": [ @@ -886,15 +1003,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 3, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L2FWD-2Port", + "version": 7 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L2FWD-4Port-1501497978548.json b/dashboard/Prox_Heat_L2FWD-4Port-1507804590601.json index 009fb08ed..761402dac 100644 --- a/dashboard/Prox_Heat_L2FWD-4Port-1501497978548.json +++ b/dashboard/Prox_Heat_L2FWD-4Port-1507804590601.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L2FWD-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "Heat", - "L2fwd", - "4Port" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application does Port forwarding without touching packets. It will take packets in from one port and forward them unmodified to another port </p>\n<p>The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L2Fwd VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,7 +422,7 @@ "tags": [] }, { - "alias": "Tgen xe-2 Out packets", + "alias": "TG xe-2 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -444,7 +460,7 @@ "tags": [] }, { - "alias": "Tgen xe-3 Out packets", + "alias": "TG xe-3 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,7 +525,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,12 +580,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -589,7 +624,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -626,7 +662,7 @@ "tags": [] }, { - "alias": "Tgen xe-2 in packets", + "alias": "TG xe-2 in packets", "dsType": "influxdb", "groupBy": [ { @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -663,7 +700,7 @@ "tags": [] }, { - "alias": "Tgen xe-3 in packets", + "alias": "TG xe-3 in packets", "dsType": "influxdb", "groupBy": [ { @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,7 +765,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,12 +832,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -817,7 +876,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,9 +914,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,19 +1093,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "Heat", + "L2fwd", + "4Port" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-31T10:37:09.211Z", - "to": "2017-07-31T10:39:16.625Z" + "from": "2017-10-09T15:07:30.493Z", + "to": "2017-10-09T15:12:46.910Z" }, "timepicker": { "refresh_intervals": [ @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 2, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L2FWD-4Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1501760607998.json b/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1507804713380.json index 557c5c2e7..84b93e7f5 100644 --- a/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1501760607998.json +++ b/dashboard/Prox_Heat_L2FWD_Multiflow-2Port-1507804713380.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L2FWD_Multiflow-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "2Port", - "Heat", - "L2FWD_Multiflow" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_L2FWD_Multiflow_2Port_Heat_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst ip addresses). The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_Multiflow_2Port_Test</center> </a></h5>\n<center>\n<p>This test allows to measures L2FWD with multiple flows (randomly generated src/dst ip addresses). The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L2Fwd Multiflow VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,9 +422,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -418,7 +449,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +477,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -473,12 +504,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -495,6 +527,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -515,7 +548,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -532,6 +565,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -552,9 +586,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -563,7 +613,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -585,29 +639,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -627,12 +680,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -649,6 +703,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -669,7 +724,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -686,6 +741,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -706,9 +762,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -717,12 +789,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -741,18 +817,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -772,6 +844,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -794,6 +867,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -814,6 +888,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -825,11 +915,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -847,16 +941,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "2Port", + "Heat", + "L2FWD_Multiflow" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-08-03T11:34:41.442Z", "to": "2017-08-03T11:36:40.434Z" @@ -886,15 +1002,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 3, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L2FWD_Multiflow-2Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1501761305237.json b/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1507804730174.json index b48dea039..ae1bf3146 100644 --- a/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1501761305237.json +++ b/dashboard/Prox_Heat_L2FWD_Multiflow-4Port-1507804730174.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L2FWD_Multiflow-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "L2FWD_Multiflow", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_BM_L2FWD_Multiflow-4Port</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated) The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2FWD_Multiflow_4Port_Test</center> </a></h5>\n<center>\n<p>This test measures L2FWD with multiple flows. (src/dst ip address are randomly generated) The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,29 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -242,6 +235,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "L2FWD Multiflow VNF stats", @@ -253,7 +262,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -280,7 +293,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -288,28 +300,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +342,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +365,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +403,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -426,6 +441,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -463,6 +479,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -483,9 +500,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -494,7 +527,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -518,18 +555,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -549,6 +582,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -571,6 +605,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -608,6 +643,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -645,6 +681,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -682,6 +719,7 @@ } ], "measurement": "tc_prox_baremetal_l3fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -702,9 +740,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -713,7 +767,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -735,28 +793,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -776,6 +834,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -798,6 +857,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -835,6 +895,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -855,6 +916,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -866,12 +943,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -890,18 +971,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -921,6 +998,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -943,6 +1021,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,48 +1040,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_heat_context_l2fwd_multiflow-4", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "TG Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -1011,11 +1069,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -1033,9 +1095,27 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "L2FWD_Multiflow", + "Heat" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-08-03T11:46:53.873Z", "to": "2017-08-03T11:48:46.478Z" @@ -1065,15 +1145,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 2, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L2FWD_Multiflow-4Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-2Port-1501090481325.json b/dashboard/Prox_Heat_L2FWD_Packet_Touch-2Port-1507804789380.json index 85e487115..5886074e9 100644 --- a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-2Port-1501090481325.json +++ b/dashboard/Prox_Heat_L2FWD_Packet_Touch-2Port-1507804789380.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,44 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L2FWD_Packet_Touch_Test-2Port", - "tags": [ - "NSB", - "Prox", - "2Port", - "L2Fwd Packet Touch", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L2Fwd_Packet_Touch_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -240,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "VNF stats: Packet In, Forward and Dropped", @@ -251,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -406,6 +420,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port stats: Out packets", @@ -417,7 +447,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -441,18 +475,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -472,6 +502,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -551,6 +582,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -562,7 +609,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -584,29 +635,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -626,6 +676,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -648,6 +699,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -685,6 +737,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -705,6 +758,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -716,12 +785,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -740,18 +813,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -771,6 +840,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -793,6 +863,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_pktTouch-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -813,6 +884,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Packet size", @@ -824,11 +911,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "bytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -846,12 +937,29 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "NSB", + "Prox", + "2Port", + "L2Fwd Packet Touch", + "Heat" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-25T14:36:56.312Z", - "to": "2017-07-25T14:47:31.476Z" + "from": "2017-10-03T10:14:05.964Z", + "to": "2017-10-03T10:20:38.843Z" }, "timepicker": { "refresh_intervals": [ @@ -878,15 +986,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 2, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L2FWD_Packet_Touch-2Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-4Port-1501090461715.json b/dashboard/Prox_Heat_L2FWD_Packet_Touch-4Port-1507804802428.json index 8b9a0cc90..44d85ef63 100644 --- a/dashboard/Prox_Heat_L2FWD_Packet_Touch_Test-4Port-1501090461715.json +++ b/dashboard/Prox_Heat_L2FWD_Packet_Touch-4Port-1507804802428.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,36 +23,31 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L2FWD_Packet_Touch_Test-4Port", - "tags": [ - "NSB", - "Prox", - "4Port", - "L2Fwd packet touch", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { @@ -60,7 +55,6 @@ "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -73,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -81,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -124,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -240,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "VNF stats: Packet In, Forward and Dropped", @@ -251,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -278,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -286,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -327,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -480,6 +494,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -491,7 +521,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -515,18 +549,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -546,6 +576,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -699,6 +730,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -710,7 +757,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -732,29 +783,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -774,6 +824,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -796,6 +847,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -833,6 +885,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -853,6 +906,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -864,12 +933,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -888,18 +961,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -919,6 +988,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -941,6 +1011,7 @@ } ], "measurement": "tc_prox_heat_context_l2fwd_pktTouch-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,6 +1032,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Packet size", @@ -972,11 +1059,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -994,19 +1085,40 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "NSB", + "Prox", + "4Port", + "L2Fwd packet touch", + "Heat" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-26T17:27:26.963Z", - "to": "2017-07-26T17:30:56.567Z" + "from": "now/y", + "to": "now/y" }, "timepicker": { "refresh_intervals": [ @@ -1033,15 +1145,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 1, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L2FWD_Packet_Touch-4Port", + "version": 3 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L3FWD-2Port-1501683503340.json b/dashboard/Prox_Heat_L3FWD-2Port-1507804811708.json index 611ae5f32..cb341f36e 100644 --- a/dashboard/Prox_Heat_L3FWD-2Port-1501683503340.json +++ b/dashboard/Prox_Heat_L3FWD-2Port-1507804811708.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L3FWD-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "L3Fwd", - "2Port", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L3Fwd VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,9 +422,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -418,7 +449,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +477,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -473,12 +504,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -495,6 +527,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -515,7 +548,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -532,6 +565,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -552,9 +586,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -563,7 +613,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -585,29 +639,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -627,12 +680,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -649,6 +703,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -669,7 +724,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -686,6 +741,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -706,9 +762,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -717,12 +789,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -741,18 +817,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -772,6 +844,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -794,6 +867,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -814,6 +888,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -825,11 +915,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -847,16 +941,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "L3Fwd", + "2Port", + "Heat" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-07-28T17:04:13.512Z", "to": "2017-07-28T17:13:15.023Z" @@ -886,15 +1002,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L3FWD-2Port", + "version": 3 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_L3FWD-4Port-1501683487964.json b/dashboard/Prox_Heat_L3FWD-4Port-1507804824268.json index 66aa9e722..f31801932 100644 --- a/dashboard/Prox_Heat_L3FWD-4Port-1501683487964.json +++ b/dashboard/Prox_Heat_L3FWD-4Port-1507804824268.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_L3FWD-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "L3Fwd", - "4Port", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_L3FWD_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, update src and dst MACs and forward them to another port.\nThe KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "L3Fwd VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 Out packets", + "alias": "TG xe-1 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,7 +422,7 @@ "tags": [] }, { - "alias": "Tgen xe-2 Out packets", + "alias": "TG xe-2 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -424,6 +439,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -444,7 +460,7 @@ "tags": [] }, { - "alias": "Tgen xe-3 Out packets", + "alias": "TG xe-3 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -461,6 +477,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -481,9 +498,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -492,7 +525,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -516,18 +553,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,12 +580,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 in packets", + "alias": "TG xe-0 in packets", "dsType": "influxdb", "groupBy": [ { @@ -569,6 +603,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -589,7 +624,7 @@ "tags": [] }, { - "alias": "Tgen xe-1 in packets", + "alias": "TG xe-1 in packets", "dsType": "influxdb", "groupBy": [ { @@ -606,6 +641,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -626,7 +662,7 @@ "tags": [] }, { - "alias": "Tgen xe-2 in packets", + "alias": "TG xe-2 in packets", "dsType": "influxdb", "groupBy": [ { @@ -643,6 +679,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -663,7 +700,7 @@ "tags": [] }, { - "alias": "Tgen xe-3 in packets", + "alias": "TG xe-3 in packets", "dsType": "influxdb", "groupBy": [ { @@ -680,6 +717,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -700,9 +738,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -711,7 +765,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -733,29 +791,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,12 +832,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen TX Throughput", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -797,6 +855,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -817,7 +876,7 @@ "tags": [] }, { - "alias": "Tgen RX Throughput", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -834,6 +893,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,9 +914,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, - "title": "Tgen Tx vs Rx Throughput", + "title": "TG Tx vs Rx Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -865,12 +941,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +969,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +996,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1019,7 @@ } ], "measurement": "tc_prox_heat_context_l3fwd-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1040,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet size", @@ -973,11 +1067,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,16 +1093,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "L3Fwd", + "4Port", + "Heat" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-08-02T13:52:27.313Z", "to": "2017-08-02T13:54:35.713Z" @@ -1034,15 +1154,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 3, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_L3FWD-4Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_LB_1to4-4Port-1505826034525.json b/dashboard/Prox_Heat_LB_1to4-4Port-1507804834019.json index 261b959b8..05f62571b 100644 --- a/dashboard/Prox_Heat_LB_1to4-4Port-1505826034525.json +++ b/dashboard/Prox_Heat_LB_1to4-4Port-1507804834019.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,46 +23,39 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_LB_1to4-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "LB", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "25px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for 64 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_LB_1to4Port</center> </a></h5>\n<center>\n<p>This transmits random packets on 1 port, and received them on 4 ports. The KPI is the number of packets per second for a specified packet size with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "height": "25", "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -75,7 +68,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -83,42 +75,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n", - "editable": true, - "error": false, - "height": "40", - "id": 8, - "isNew": true, - "links": [], - "mode": "html", - "span": 12, - "title": "", - "type": "text" - }, - { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 10, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -126,7 +105,7 @@ "max": true, "min": true, "rightSide": false, - "show": false, + "show": true, "total": false, "values": true }, @@ -139,6 +118,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -161,6 +141,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -198,6 +179,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -235,6 +217,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -255,6 +238,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "Load Balancer VNF stats", @@ -266,7 +265,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -288,28 +291,40 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 22px '#31A7D3'\"><center>Prox Load Balancer Traffic Gen stats</center> </a></h5>\n", + "editable": true, + "error": false, + "height": "40", + "id": 8, + "links": [], + "mode": "html", + "span": 12, + "title": "", + "type": "text" + }, + { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -330,6 +345,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -352,6 +368,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -389,6 +406,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -426,6 +444,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -463,6 +482,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -483,9 +503,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -494,7 +530,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -518,18 +558,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -549,6 +585,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -571,6 +608,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -608,6 +646,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -645,6 +684,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "C", "resultFormat": "time_series", @@ -682,6 +722,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "D", "resultFormat": "time_series", @@ -702,9 +743,25 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -713,7 +770,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -735,28 +796,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -776,6 +837,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -798,6 +860,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -835,6 +898,7 @@ } ], "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -855,6 +919,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Tx vs Rx Throughput", @@ -866,12 +946,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -890,18 +974,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2.5, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2.5, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -921,6 +1001,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,7 +1023,8 @@ "type": "fill" } ], - "measurement": "tc_prox_baremetal_lb-4", + "measurement": "tc_prox_heat_context_lb-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -961,48 +1043,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2.5 }, { - "alias": "TG Dropped Packets", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_heat_context_lb-4", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.DropPackets" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2.5 } ], "timeFrom": null, "timeShift": null, - "title": "TG Packet size and Drop Packets", + "title": "TG Packet size", "tooltip": { "msResolution": true, "shared": true, @@ -1011,11 +1072,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -1033,12 +1098,30 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "LB", + "Heat" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-09-19T12:39:56.933Z", - "to": "2017-09-19T12:46:07.167Z" + "from": "2017-10-10T13:21:20.290Z", + "to": "2017-10-10T13:33:42.920Z" }, "timepicker": { "refresh_intervals": [ @@ -1065,15 +1148,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_LB_1to4-4Port", + "version": 7 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_MPLS_tag_untag_Test-2Port-1501089144407.json b/dashboard/Prox_Heat_MPLS_tagging-2Port-1507804851105.json index 679b4b45f..8571ad4f5 100644 --- a/dashboard/Prox_Heat_MPLS_tag_untag_Test-2Port-1501089144407.json +++ b/dashboard/Prox_Heat_MPLS_tagging-2Port-1507804851105.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_MPLS_tag_untag_Test-2Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "MPLS", - "2Port", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_2Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "MPLS VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -407,6 +420,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -418,7 +447,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +475,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -473,6 +502,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -552,6 +582,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -563,7 +609,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -585,29 +635,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -627,6 +676,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -649,6 +699,7 @@ } ], "measurement": "tc_prox_heat_context_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -686,6 +737,7 @@ } ], "measurement": "tc_prox_heat_context_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -706,6 +758,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -717,12 +785,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -741,18 +813,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -772,6 +840,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -794,6 +863,7 @@ } ], "measurement": "tc_prox_heat_context_mpls_tagging-2", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -814,6 +884,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Packet size", @@ -825,11 +911,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -847,16 +937,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "MPLS", + "2Port", + "Heat" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-07-26T16:44:35.417Z", "to": "2017-07-26T16:48:07.816Z" @@ -886,15 +998,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 1, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_MPLS_tagging-2Port", + "version": 5 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_MPLS_tag_untag_Test-4Port-1501089128664.json b/dashboard/Prox_Heat_MPLS_tagging-4Port-1507804858785.json index 727aa9760..16ff81e7b 100644 --- a/dashboard/Prox_Heat_MPLS_tag_untag_Test-4Port-1501089128664.json +++ b/dashboard/Prox_Heat_MPLS_tagging-4Port-1507804858785.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_MPLS_tag_untag_Test-4Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "4Port", - "MPLS", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tag_Untag_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for 68 byte packets with an accepted minimal packet loss </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_MPLS_Tagging_4Port_Test</center> </a></h5>\n<center>\n<p>The application will take packets in from one port, add an MPLS tag and forward them to another port. While forwarding packets in other direction MPLS tags will be removed.</p>\n<p>The KPI is the number of packets per second for a specified packet size ( min packet size is 68 byte) with an accepted minimal packet loss </p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "MPLS VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,6 +340,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -481,6 +494,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: Out packets", @@ -492,7 +521,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -516,18 +549,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 9, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -547,6 +576,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -700,6 +730,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port Stats: In packets", @@ -711,7 +757,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -733,29 +783,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, + "grid": {}, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -775,6 +824,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -797,6 +847,7 @@ } ], "measurement": "tc_prox_heat_context_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -834,6 +885,7 @@ } ], "measurement": "tc_prox_heat_context_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -854,6 +906,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Throughput Stats", @@ -865,12 +933,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "pps", - "label": "Throughput", + "format": "short", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -889,18 +961,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 5, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -920,6 +988,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, @@ -942,6 +1011,7 @@ } ], "measurement": "tc_prox_heat_context_mpls_tagging-4", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -962,6 +1032,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Packet size", @@ -973,11 +1059,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -995,16 +1085,38 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "4Port", + "MPLS", + "Heat" + ], + "templating": { + "list": [] + }, "time": { "from": "2017-07-26T17:04:06.296Z", "to": "2017-07-26T17:06:02.094Z" @@ -1034,15 +1146,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 2, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_MPLS_tagging-4Port", + "version": 3 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_Packet_Buffering_Test-1Port-1501092616937.json b/dashboard/Prox_Heat_Packet_Buffering-1Port-1507804872923.json index 2a93af192..76aa0f58f 100644 --- a/dashboard/Prox_Heat_Packet_Buffering_Test-1Port-1501092616937.json +++ b/dashboard/Prox_Heat_Packet_Buffering-1Port-1507804872923.json @@ -11,10 +11,10 @@ ], "__requires": [ { - "type": "panel", - "id": "text", - "name": "Text", - "version": "" + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "4.4.3" }, { "type": "panel", @@ -23,45 +23,38 @@ "version": "" }, { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "3.1.1" - }, - { "type": "datasource", "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "text", + "name": "Text", + "version": "" } ], - "id": null, - "title": "Prox_Heat_Packet_Buffering_Test-1Port", - "tags": [ - "yardstick", - "NSB", - "Prox", - "Buffering", - "1Port", - "Heat" - ], - "style": "dark", - "timezone": "browser", + "annotations": { + "list": [] + }, "editable": true, + "gnetId": null, + "graphTooltip": 0, "hideControls": false, - "sharedCrosshair": false, + "id": null, + "links": [], + "refresh": false, "rows": [ { "collapse": false, - "editable": true, "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>The KPI in this test is the maximum number of packets that can be forwarded\n given the requirement that the latency of each packet is at least\n 125 millisecond</p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_Buffering_1Port_Test</center> </a></h5>\n<center>\n<p>This test measures the impact of the condition when packets get buffered, thus they stay in memory for the extended period of time.</p>\n<p>The KPI in this test is the maximum number of packets that can be forwarded given the requirement that the latency of each packet is at least 125 millisecond</p>\n</center>", "editable": true, "error": false, "id": 3, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -74,7 +67,6 @@ "error": false, "height": "40", "id": 7, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -82,29 +74,29 @@ "type": "text" } ], - "title": "Row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "Row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "300px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "height": "300", "id": 4, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -125,6 +117,7 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 12, "stack": false, "steppedLine": false, @@ -241,6 +234,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "Packet Buffering VNF stats", @@ -252,7 +261,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -279,7 +292,6 @@ "error": false, "height": "40", "id": 8, - "isNew": true, "links": [], "mode": "html", "span": 12, @@ -287,28 +299,28 @@ "type": "text" } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, + "grid": {}, "id": 6, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -328,12 +340,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Tgen xe-0 Out packets", + "alias": "TG xe-0 Out packets", "dsType": "influxdb", "groupBy": [ { @@ -350,6 +363,7 @@ } ], "measurement": "tc_prox_heat_context_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -370,7 +384,7 @@ "tags": [] }, { - "alias": "Tgen xe-0 In packets", + "alias": "TG xe-0 In packets", "dsType": "influxdb", "groupBy": [ { @@ -387,6 +401,7 @@ } ], "measurement": "tc_prox_heat_context_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -407,6 +422,22 @@ "tags": [] } ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 + }, + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 + } + ], "timeFrom": null, "timeShift": null, "title": "TG Port stats: Out vs In packets", @@ -418,7 +449,11 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { @@ -442,18 +477,14 @@ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 9, - "isNew": true, + "grid": {}, + "id": 2, "legend": { "alignAsTable": true, "avg": true, @@ -473,12 +504,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Min Latency", + "alias": "TG TX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -495,6 +527,7 @@ } ], "measurement": "tc_prox_heat_context_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -502,7 +535,7 @@ [ { "params": [ - "tg__0.LatencyMin.2" + "tg__0.Throughput" ], "type": "field" }, @@ -515,7 +548,7 @@ "tags": [] }, { - "alias": "Avg Latency", + "alias": "TG RX Throughput", "dsType": "influxdb", "groupBy": [ { @@ -532,6 +565,7 @@ } ], "measurement": "tc_prox_heat_context_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "B", "resultFormat": "time_series", @@ -539,7 +573,7 @@ [ { "params": [ - "tg__0.LatencyAvg.2" + "tg__0.RxThroughput" ], "type": "field" }, @@ -550,48 +584,27 @@ ] ], "tags": [] + } + ], + "thresholds": [ + { + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 }, { - "alias": "Max Latency", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_heat_context_buffering-1", - "policy": "default", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.LatencyMax.2" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 } ], "timeFrom": null, "timeShift": null, - "title": "TG Latency stats", + "title": "TG TX vs RX Throughput", "tooltip": { "msResolution": true, "shared": true, @@ -600,12 +613,16 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { "format": "short", - "label": "Latency", + "label": "Throughput in MPPS", "logBase": 1, "max": null, "min": null, @@ -622,29 +639,28 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [ { "aliasColors": {}, "bars": false, + "dashLength": 10, + "dashes": false, "datasource": "${DS_YARDSTICK}", "editable": true, "error": false, "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)", - "thresholdLine": false - }, - "id": 2, - "isNew": true, + "grid": {}, + "id": 5, "legend": { "alignAsTable": true, "avg": true, @@ -664,12 +680,13 @@ "points": false, "renderer": "flot", "seriesOverrides": [], + "spaceLength": 10, "span": 6, "stack": false, "steppedLine": false, "targets": [ { - "alias": "TG TX Throughput", + "alias": "TG Packet Size", "dsType": "influxdb", "groupBy": [ { @@ -686,6 +703,7 @@ } ], "measurement": "tc_prox_heat_context_buffering-1", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -693,44 +711,7 @@ [ { "params": [ - "tg__0.Throughput" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "TG RX Throughput", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_heat_context_buffering-1", - "policy": "default", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.RxThroughput" + "tg__0.PktSize" ], "type": "field" }, @@ -743,112 +724,20 @@ "tags": [] } ], - "timeFrom": null, - "timeShift": null, - "title": "TG Throughput Stats", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ + "thresholds": [ { - "format": "pps", - "label": "Throughput", - "logBase": 1, - "max": null, - "min": null, - "show": true + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(216, 200, 27, 0.27)", + "op": "gt", + "value": 2 }, { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": "${DS_YARDSTICK}", - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": 2, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": 2, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 5, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "TG Packet Size", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "tc_prox_heat_context_buffering-1", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "tg__0.PktSize" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "colorMode": "custom", + "fill": true, + "fillColor": "rgba(234, 112, 112, 0.22)", + "op": "gt", + "value": 2 } ], "timeFrom": null, @@ -862,11 +751,15 @@ }, "type": "graph", "xaxis": { - "show": true + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] }, "yaxes": [ { - "format": "short", + "format": "decbytes", "label": "Packet Size", "logBase": 1, "max": null, @@ -884,19 +777,41 @@ ] } ], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" }, { "collapse": false, - "editable": true, "height": "250px", "panels": [], - "title": "New row" + "repeat": null, + "repeatIteration": null, + "repeatRowId": null, + "showTitle": false, + "title": "New row", + "titleSize": "h6" } ], + "schemaVersion": 14, + "style": "dark", + "tags": [ + "yardstick", + "NSB", + "Prox", + "Buffering", + "1Port", + "Heat" + ], + "templating": { + "list": [] + }, "time": { - "from": "2017-07-26T18:07:01.703Z", - "to": "2017-07-26T18:09:21.972Z" + "from": "2017-10-10T16:20:59.131Z", + "to": "2017-10-10T16:28:03.341Z" }, "timepicker": { "refresh_intervals": [ @@ -923,15 +838,7 @@ "30d" ] }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": false, - "schemaVersion": 12, - "version": 4, - "links": [], - "gnetId": null + "timezone": "browser", + "title": "Prox_Heat_Packet_Buffering-1Port", + "version": 4 }
\ No newline at end of file diff --git a/dashboard/Prox_Heat_vPE-4Port-1507195265889.json b/dashboard/Prox_Heat_vPE-4Port-1507804883050.json index f34673acd..8ee91b4fc 100644 --- a/dashboard/Prox_Heat_vPE-4Port-1507195265889.json +++ b/dashboard/Prox_Heat_vPE-4Port-1507804883050.json @@ -51,7 +51,7 @@ "height": "100px", "panels": [ { - "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n</center>", + "content": "<h5 style=\"font-family:Verdana\"> <a style=\"color:#31A7D3\"><a style=\"font: 32px '#31A7D3'\"><center>OPNFV_Yardstick_NSB_PROX_Heat_vPE_4Port_Test</center> </a></h5>\n<center>\n<p>The vPE handles packet processing, routing, QinQ encapsulation, flows, ACL rules, adds/removes MPLS tags and performs QoS </p>\n<p>The KPI is the number of packets per second for a specified packet size (min packet size is 68 byte) with an accepted minimal packet loss</p>\n</center>", "editable": true, "error": false, "id": 3, @@ -519,7 +519,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "TG out packets", + "title": "TG Port Stats: Out packets", "tooltip": { "msResolution": true, "shared": true, @@ -537,7 +537,7 @@ "yaxes": [ { "format": "short", - "label": "Packets Out", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -759,7 +759,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "TG In packets", + "title": "TG Port Stats: In packets", "tooltip": { "msResolution": true, "shared": true, @@ -777,7 +777,7 @@ "yaxes": [ { "format": "short", - "label": "Packets In", + "label": "Packets", "logBase": 1, "max": null, "min": null, @@ -1129,8 +1129,8 @@ "list": [] }, "time": { - "from": "2017-10-04T11:02:07.286Z", - "to": "2017-10-04T11:10:20.389Z" + "from": "2017-10-09T10:53:53.915Z", + "to": "2017-10-09T11:00:04.248Z" }, "timepicker": { "refresh_intervals": [ @@ -1159,5 +1159,5 @@ }, "timezone": "browser", "title": "Prox_Heat_vPE-4Port", - "version": 8 + "version": 12 }
\ No newline at end of file diff --git a/dashboard/opnfv_yardstick_tc037.json b/dashboard/opnfv_yardstick_tc037.json index 366210503..85f7908b6 100644 --- a/dashboard/opnfv_yardstick_tc037.json +++ b/dashboard/opnfv_yardstick_tc037.json @@ -846,7 +846,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "Latency - Ping", + "title": "Latency - Ping, 999999 rtt indicates ping error", "tooltip": { "shared": true, "sort": 0, diff --git a/dashboard/opnfv_yardstick_tc038.json b/dashboard/opnfv_yardstick_tc038.json index bf068d5a9..65b97d626 100644 --- a/dashboard/opnfv_yardstick_tc038.json +++ b/dashboard/opnfv_yardstick_tc038.json @@ -566,7 +566,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "Latency - Ping", + "title": "Latency - Ping, 999999 rtt indicates ping error", "tooltip": { "shared": true, "sort": 0, diff --git a/dashboard/opnfv_yardstick_tc070.json b/dashboard/opnfv_yardstick_tc070.json index 152ecca24..c57d4194e 100644 --- a/dashboard/opnfv_yardstick_tc070.json +++ b/dashboard/opnfv_yardstick_tc070.json @@ -914,7 +914,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "Latency - Ping", + "title": "Latency - Ping, 999999 rtt indicates ping error", "tooltip": { "shared": true, "sort": 0, diff --git a/dashboard/opnfv_yardstick_tc071.json b/dashboard/opnfv_yardstick_tc071.json index defd6fada..009e0a173 100644 --- a/dashboard/opnfv_yardstick_tc071.json +++ b/dashboard/opnfv_yardstick_tc071.json @@ -994,7 +994,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "Latency - Ping", + "title": "Latency - Ping, 999999 rtt indicates ping error", "tooltip": { "shared": true, "sort": 0, diff --git a/dashboard/opnfv_yardstick_tc072.json b/dashboard/opnfv_yardstick_tc072.json index 2d330a05f..b8e9fa356 100644 --- a/dashboard/opnfv_yardstick_tc072.json +++ b/dashboard/opnfv_yardstick_tc072.json @@ -723,7 +723,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "Latency - Ping", + "title": "Latency - Ping, 999999 rtt indicates ping error", "tooltip": { "shared": true, "sort": 0, diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst index fc3ca155d..92a18f6ee 100644 --- a/docs/testing/developer/devguide/index.rst +++ b/docs/testing/developer/devguide/index.rst @@ -5,9 +5,9 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) OPNFV, Ericsson AB and others. -********************************* -OPNFV Yardstick developer guide -********************************* +************************* +Yardstick Developer Guide +************************* .. toctree:: :maxdepth: 4 diff --git a/docs/testing/user/userguide/04-installation.rst b/docs/testing/user/userguide/04-installation.rst index cb4f31434..b40e1143e 100644 --- a/docs/testing/user/userguide/04-installation.rst +++ b/docs/testing/user/userguide/04-installation.rst @@ -82,7 +82,7 @@ following docker command:: Run the Docker image to get a Yardstick container:: - docker run -itd --privileged -v /var/run/docker.sock:/var/run/docker.sock -p 8888:5000 -e INSTALLER_IP=192.168.200.2 -e INSTALLER_TYPE=compass --name yardstick opnfv/yardstick:stable + docker run -itd --privileged -v /var/run/docker.sock:/var/run/docker.sock -p 8888:5000 --name yardstick opnfv/yardstick:stable Note: @@ -101,21 +101,6 @@ Note: | | Yardstick container, this | | | parameter is needed. | +----------------------------------------------+------------------------------+ -| -e INSTALLER_IP=192.168.200.2 | If you want to use yardstick | -| | env prepare command(or | -| -e INSTALLER_TYPE=compass | related API) to load the | -| | images that Yardstick needs, | -| | these parameters should be | -| | provided. | -| | The INSTALLER_IP and | -| | INSTALLER_TYPE are depending | -| | on your OpenStack installer. | -| | Currently Apex, Compass, | -| | Fuel and Joid are supported. | -| | If you use other installers, | -| | such as devstack, these | -| | parameters can be ignores. | -+----------------------------------------------+------------------------------+ | -p 8888:5000 | If you want to call | | | Yardstick API out of | | | Yardstick container, this | @@ -149,11 +134,11 @@ In the Yardstick container, the Yardstick repository is located in the ``/home/o yardstick env prepare -**NOTE**: The above command works for four OPNFV installers -- **Apex**, **Compass**, **Fuel** and **Joid**. -For Non-OPNFV installer OpenStack environment, the above command can also be used to configure the environment. -But before running the above command in a Non-OPNFV installer environment, it is necessary to create the /etc/yardstick/openstack.creds file and -save OpenStack environment variables in it. For details of the required OpenStack environment variables please refer to -section **Export OpenStack environment variables** +**NOTE**: Since Euphrates release, the above command will not able to automatically configure the /etc/yardstick/openstack.creds file. +So before running the above command, it is necessary to create the /etc/yardstick/openstack.creds file and save OpenStack environment variables into it manually. +If you have the openstack credential file saved outside the Yardstcik Docker container, you can do this easily by mapping the credential file into Yardstick container + using '-v /path/to/credential_file:/etc/yardstick/openstack.creds' when running the Yardstick container. +For details of the required OpenStack environment variables please refer to section **Export OpenStack environment variables** The env prepare command may take up to 6-8 minutes to finish building yardstick-image and other environment preparation. Meanwhile if you wish to @@ -647,4 +632,5 @@ yaml file and add test cases, constraint or task arguments if necessary. Proxy Support (**Todo**) ----------------------------
\ No newline at end of file +--------------------------- + diff --git a/docs/testing/user/userguide/15-list-of-tcs.rst b/docs/testing/user/userguide/15-list-of-tcs.rst index 1b5806cd9..b62bf6390 100644 --- a/docs/testing/user/userguide/15-list-of-tcs.rst +++ b/docs/testing/user/userguide/15-list-of-tcs.rst @@ -50,8 +50,14 @@ Generic NFVI Test Case Descriptions opnfv_yardstick_tc071.rst opnfv_yardstick_tc072.rst opnfv_yardstick_tc073.rst + opnfv_yardstick_tc074.rst opnfv_yardstick_tc075.rst opnfv_yardstick_tc076.rst + opnfv_yardstick_tc078.rst + opnfv_yardstick_tc079.rst + opnfv_yardstick_tc080.rst + opnfv_yardstick_tc081.rst + opnfv_yardstick_tc083.rst OPNFV Feature Test Cases ======================== diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst index 3b55b7f9b..707e12b56 100644 --- a/docs/testing/user/userguide/index.rst +++ b/docs/testing/user/userguide/index.rst @@ -5,9 +5,9 @@ .. http://creativecommons.org/licenses/by/4.0 .. (c) OPNFV, Ericsson AB and others. -=========================================== -Performance Testing User Guide (Yardstick) -=========================================== +******************** +Yardstick User Guide +******************** .. toctree:: :maxdepth: 4 diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc002.rst b/docs/testing/user/userguide/opnfv_yardstick_tc002.rst index c98780fd5..bf2466fb2 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc002.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc002.rst @@ -106,8 +106,8 @@ Yardstick Test Case Description TC002 | | | +--------------+--------------------------------------------------------------+ |step 2 | Yardstick is connected with the server VM by using ssh. | -| | 'ping_benchmark' bash script is copyied from Jump Host to | -| | the server VM via the ssh tunnel. | +| | 'ping_benchmark' bash script is copied from Jump Host to the | +| | server VM via the ssh tunnel. | | | | +--------------+--------------------------------------------------------------+ |step 3 | Ping is invoked. Ping packets are sent from server VM to | diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc044.rst b/docs/testing/user/userguide/opnfv_yardstick_tc044.rst index 2be8517a1..8db45e1d4 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc044.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc044.rst @@ -7,7 +7,7 @@ Yardstick Test Case Description TC044 ************************************* -.. _man-pages: http://manpages.ubuntu.com/manpages/trusty/en/man1/free.1.html +.. _man-pages: http://manpages.ubuntu.com/manpages/xenial/en/man1/free.1.html +-----------------------------------------------------------------------------+ |Memory Utilization | diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc078.rst b/docs/testing/user/userguide/opnfv_yardstick_tc078.rst index 560d55e07..b5a6545ba 100644 --- a/docs/testing/user/userguide/opnfv_yardstick_tc078.rst +++ b/docs/testing/user/userguide/opnfv_yardstick_tc078.rst @@ -114,7 +114,8 @@ Yardstick Test Case Description TC078 |step 3 | Yardstick is connected with the target server by using ssh. | | | If custom runspec config file is used, this file is copyied | | | from yardstick to the target server via the ssh tunnel. | ---------------+---------------------------------------------------------------+ +| | | ++--------------+--------------------------------------------------------------+ |step 4 | SPEC CPU2006 benchmark is invoked and SPEC CPU 2006 metrics | | | are generated. | | | | diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc080.rst b/docs/testing/user/userguide/opnfv_yardstick_tc080.rst new file mode 100644 index 000000000..05eca502e --- /dev/null +++ b/docs/testing/user/userguide/opnfv_yardstick_tc080.rst @@ -0,0 +1,117 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Huawei Technologies Co.,Ltd and others. + +************************************* +Yardstick Test Case Description TC080 +************************************* + +.. _Ping: https://linux.die.net/man/8/ping + ++-----------------------------------------------------------------------------+ +|Network Latency | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC080_NETWORK_LATENCY_BETWEEN_CONTAINER | +| | | ++--------------+--------------------------------------------------------------+ +|metric | RTT (Round Trip Time) | +| | | ++--------------+--------------------------------------------------------------+ +|test purpose | The purpose of TC080 is to do a basic verification that | +| | network latency is within acceptable boundaries when packets | +| | travel between containers located in two different | +| | Kubernetes pods. | +| | | +| | The purpose is also to be able to spot the trends. | +| | Test results, graphs and similar shall be stored for | +| | comparison reasons and product evolution understanding | +| | between different OPNFV versions and/or configurations. | +| | | ++--------------+--------------------------------------------------------------+ +|test tool | ping | +| | | +| | Ping is a computer network administration software utility | +| | used to test the reachability of a host on an Internet | +| | Protocol (IP) network. It measures the round-trip time for | +| | packet sent from the originating host to a destination | +| | computer that are echoed back to the source. | +| | | +| | Ping is normally part of any Linux distribution, hence it | +| | doesn't need to be installed. It is also part of the | +| | Yardstick Docker image. | +| | | ++--------------+--------------------------------------------------------------+ +|test topology | Ping packets (ICMP protocol's mandatory ECHO_REQUEST | +| | datagram) are sent from host container to target container | +| | to elicit ICMP ECHO_RESPONSE. | +| | | ++--------------+--------------------------------------------------------------+ +|configuration | file: opnfv_yardstick_tc080.yaml | +| | | +| | Packet size 200 bytes. Test duration 60 seconds. | +| | SLA RTT is set to maximum 10 ms. | +| | | ++--------------+--------------------------------------------------------------+ +|applicability | This test case can be configured with different: | +| | | +| | * packet sizes; | +| | * burst sizes; | +| | * ping intervals; | +| | * test durations; | +| | * test iterations. | +| | | +| | Default values exist. | +| | | +| | SLA is optional. The SLA in this test case serves as an | +| | example. Considerably lower RTT is expected, and also normal | +| | to achieve in balanced L2 environments. However, to cover | +| | most configurations, both bare metal and fully virtualized | +| | ones, this value should be possible to achieve and | +| | acceptable for black box testing. Many real time | +| | applications start to suffer badly if the RTT time is higher | +| | than this. Some may suffer bad also close to this RTT, while | +| | others may not suffer at all. It is a compromise that may | +| | have to be tuned for different configuration purposes. | +| | | ++--------------+--------------------------------------------------------------+ +|usability | This test case should be run in Kunernetes environment. | +| | | ++--------------+--------------------------------------------------------------+ +|references | Ping_ | +| | | +| | ETSI-NFV-TST001 | +| | | ++--------------+--------------------------------------------------------------+ +|pre-test | The test case Docker image (openretriever/yardstick) needs | +|conditions | to be pulled into Kubernetes environment. | +| | | +| | No further requirements have been identified. | +| | | ++--------------+--------------------------------------------------------------+ +|test sequence | description and expected result | +| | | ++--------------+--------------------------------------------------------------+ +|step 1 | Two containers are booted, as server and client. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | Yardstick is connected with the server container by using | +| | ssh. 'ping_benchmark' bash script is copied from Jump Host | +| | to the server container via the ssh tunnel. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | Ping is invoked. Ping packets are sent from server container | +| | to client container. RTT results are calculated and checked | +| | against the SLA. Logs are produced and stored. | +| | | +| | Result: Logs are stored. | +| | | ++--------------+--------------------------------------------------------------+ +|step 4 | Two containers are deleted. | +| | | ++--------------+--------------------------------------------------------------+ +|test verdict | Test should not PASS if any RTT is above the optional SLA | +| | value, or if there is a test case execution problem. | +| | | ++--------------+--------------------------------------------------------------+ diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc081.rst b/docs/testing/user/userguide/opnfv_yardstick_tc081.rst new file mode 100644 index 000000000..90af8a382 --- /dev/null +++ b/docs/testing/user/userguide/opnfv_yardstick_tc081.rst @@ -0,0 +1,122 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International +.. License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) OPNFV, Huawei Technologies Co.,Ltd and others. + +************************************* +Yardstick Test Case Description TC080 +************************************* + +.. _cirros-image: https://download.cirros-cloud.net +.. _Ping: https://linux.die.net/man/8/ping + ++-----------------------------------------------------------------------------+ +|Network Latency | +| | ++--------------+--------------------------------------------------------------+ +|test case id | OPNFV_YARDSTICK_TC081_NETWORK_LATENCY_BETWEEN_CONTAINER_AND_ | +| | VM | +| | | ++--------------+--------------------------------------------------------------+ +|metric | RTT (Round Trip Time) | +| | | ++--------------+--------------------------------------------------------------+ +|test purpose | The purpose of TC080 is to do a basic verification that | +| | network latency is within acceptable boundaries when packets | +| | travel between a containers and a VM. | +| | | +| | The purpose is also to be able to spot the trends. | +| | Test results, graphs and similar shall be stored for | +| | comparison reasons and product evolution understanding | +| | between different OPNFV versions and/or configurations. | +| | | ++--------------+--------------------------------------------------------------+ +|test tool | ping | +| | | +| | Ping is a computer network administration software utility | +| | used to test the reachability of a host on an Internet | +| | Protocol (IP) network. It measures the round-trip time for | +| | packet sent from the originating host to a destination | +| | computer that are echoed back to the source. | +| | | +| | Ping is normally part of any Linux distribution, hence it | +| | doesn't need to be installed. It is also part of the | +| | Yardstick Docker image. (For example also a Cirros image can | +| | be downloaded from cirros-image_, it includes ping) | +| | | ++--------------+--------------------------------------------------------------+ +|test topology | Ping packets (ICMP protocol's mandatory ECHO_REQUEST | +| | datagram) are sent from host container to target vm to | +| | elicit ICMP ECHO_RESPONSE. | +| | | ++--------------+--------------------------------------------------------------+ +|configuration | file: opnfv_yardstick_tc081.yaml | +| | | +| | Packet size 200 bytes. Test duration 60 seconds. | +| | SLA RTT is set to maximum 10 ms. | +| | | ++--------------+--------------------------------------------------------------+ +|applicability | This test case can be configured with different: | +| | | +| | * packet sizes; | +| | * burst sizes; | +| | * ping intervals; | +| | * test durations; | +| | * test iterations. | +| | | +| | Default values exist. | +| | | +| | SLA is optional. The SLA in this test case serves as an | +| | example. Considerably lower RTT is expected, and also normal | +| | to achieve in balanced L2 environments. However, to cover | +| | most configurations, both bare metal and fully virtualized | +| | ones, this value should be possible to achieve and | +| | acceptable for black box testing. Many real time | +| | applications start to suffer badly if the RTT time is higher | +| | than this. Some may suffer bad also close to this RTT, while | +| | others may not suffer at all. It is a compromise that may | +| | have to be tuned for different configuration purposes. | +| | | ++--------------+--------------------------------------------------------------+ +|usability | This test case should be run in Kunernetes environment. | +| | | ++--------------+--------------------------------------------------------------+ +|references | Ping_ | +| | | +| | ETSI-NFV-TST001 | +| | | ++--------------+--------------------------------------------------------------+ +|pre-test | The test case Docker image (openretriever/yardstick) needs | +|conditions | to be pulled into Kubernetes environment. | +| | The VM image (cirros-image) needs to be installed into | +| | Glance with ping included in it. | +| | | +| | No further requirements have been identified. | +| | | ++--------------+--------------------------------------------------------------+ +|test sequence | description and expected result | +| | | ++--------------+--------------------------------------------------------------+ +|step 1 | A containers is booted, as server and a VM is booted as | +| | client. | +| | | ++--------------+--------------------------------------------------------------+ +|step 2 | Yardstick is connected with the server container by using | +| | ssh. 'ping_benchmark' bash script is copied from Jump Host | +| | to the server container via the ssh tunnel. | +| | | ++--------------+--------------------------------------------------------------+ +|step 3 | Ping is invoked. Ping packets are sent from server container | +| | to client VM. RTT results are calculated and checked against | +| | the SLA. Logs are produced and stored. | +| | | +| | Result: Logs are stored. | +| | | ++--------------+--------------------------------------------------------------+ +|step 4 | The container and VM are deleted. | +| | | ++--------------+--------------------------------------------------------------+ +|test verdict | Test should not PASS if any RTT is above the optional SLA | +| | value, or if there is a test case execution problem. | +| | | ++--------------+--------------------------------------------------------------+ diff --git a/etc/yardstick/nodes/pod.yaml.collectd.sample b/etc/yardstick/nodes/pod.yaml.collectd.sample index 6ebf9e295..aae677ce6 100644 --- a/etc/yardstick/nodes/pod.yaml.collectd.sample +++ b/etc/yardstick/nodes/pod.yaml.collectd.sample @@ -21,5 +21,9 @@ nodes: password: r00t collectd: interval: 5 - plugins: - ovs_stats: {} +# plugins: +# intel_rdt: {} +# virt: {} +# ovs_stats: +# ovs_socket_path: /var/run/openvswitch/db.sock +# intel_pmu: {} diff --git a/etc/yardstick/nodes/standalone/baremetal_trex.yaml b/etc/yardstick/nodes/standalone/baremetal_trex.yaml index 508fb88d3..d41b8989f 100644 --- a/etc/yardstick/nodes/standalone/baremetal_trex.yaml +++ b/etc/yardstick/nodes/standalone/baremetal_trex.yaml @@ -21,17 +21,17 @@ nodes: password: {{gen.password}} key_filename: {{gen.key_filename}} interfaces: -{% for num in range(item.num_vnfs|int) %} +{% for num in range(num_vnfs|int) %} xe{{num * 2}}: # logical name from topology.yaml and vnfd.yaml - vpci: "{{gen.pcis.private[num]}}" + vpci: "{{gen.pcis.uplink[num]}}" dpdk_port_num: {{num * 2}} - local_ip: "{{gen.ip.private[num] | ipaddr('address')}}" - netmask: "{{gen.ip.private[num] | ipaddr('netmask')}}" - local_mac: "{{gen.mac.private[num]}}" + local_ip: "{{gen.ip.uplink[num] | ipaddr('address')}}" + netmask: "{{gen.ip.uplink[num] | ipaddr('netmask')}}" + local_mac: "{{gen.mac.uplink[num]}}" xe{{(num * 2) + 1}}: # logical name from topology.yaml and vnfd.yaml - vpci: "{{gen.pcis.public[num]}}" + vpci: "{{gen.pcis.downlink[num]}}" dpdk_port_num: {{(num * 2) + 1}} - local_ip: "{{gen.ip.public[num] | ipaddr('address') }}" - netmask: "{{gen.ip.private[num] | ipaddr('netmask')}}" - local_mac: "{{gen.mac.public[num]}}" + local_ip: "{{gen.ip.downlink[num] | ipaddr('address') }}" + netmask: "{{gen.ip.uplink[num] | ipaddr('netmask')}}" + local_mac: "{{gen.mac.downlink[num]}}" {% endfor %} diff --git a/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml new file mode 100644 index 000000000..b724cb09b --- /dev/null +++ b/etc/yardstick/nodes/standalone/pod_bm_vnf.yaml @@ -0,0 +1,37 @@ +# 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: vnf__0 + role: vnf__0 + ip: {{vnf.ip.mgmt[0]| ipaddr('address')}} + user: {{vnf.user}} + password: {{vnf.password}} + key_filename: {{vnf.key_filename}} + interfaces: +{% for num in range(num_vnfs|int) %} + xe{{num * 2}}: # logical name from topology.yaml and vnfd.yaml + vpci: "{{vnf.pcis.uplink[num]}}" + dpdk_port_num: {{num * 2}} + local_ip: "{{vnf.ip.uplink[num] | ipaddr('address')}}" + netmask: "{{vnf.ip.uplink[num] | ipaddr('netmask')}}" + local_mac: "{{vnf.mac.uplink[num]}}" + xe{{(num * 2) + 1}}: # logical name from topology.yaml and vnfd.yaml + vpci: "{{vnf.pcis.downlink[num]}}" + dpdk_port_num: {{(num * 2) + 1}} + local_ip: "{{vnf.ip.downlink[num] | ipaddr('address') }}" + netmask: "{{vnf.ip.uplink[num] | ipaddr('netmask')}}" + local_mac: "{{vnf.mac.downlink[num]}}" +{% endfor %} diff --git a/install.sh b/install.sh index 49a8bd085..dfad3a51a 100755 --- a/install.sh +++ b/install.sh @@ -79,7 +79,9 @@ apt-get update && apt-get install -y \ uwsgi-plugin-python \ supervisor \ python-pip \ - vim + vim \ + libxft-dev \ + libxss-dev if [[ "${DOCKER_ARCH}" != "aarch64" ]]; then apt-get install -y libc6:arm64 diff --git a/nsb_setup.sh b/nsb_setup.sh index 1c27af7db..28d31967f 100755 --- a/nsb_setup.sh +++ b/nsb_setup.sh @@ -25,8 +25,8 @@ done pip install ansible==2.3.2 shade==1.17.0 docker-py==1.10.6 if [ $# -eq 1 ]; then - extra_args="-e openrc_file=$1" - OPENRC=$1 + OPENRC=$(readlink -f -- "$1") + extra_args="-e openrc_file=${OPENRC}" source "${OPENRC}" CONTROLLER_IP=$(echo ${OS_AUTH_URL} | sed -ne "s/http:\/\/\(.*\):.*/\1/p") export no_proxy="localhost,127.0.0.1,${CONTROLLER_IP},$no_proxy" diff --git a/opnfv_os-odl-fdio_dvr-noha_daily.yaml b/opnfv_os-odl-fdio_dvr-noha_daily.yaml new file mode 100644 index 000000000..cd00b4c0c --- /dev/null +++ b/opnfv_os-odl-fdio_dvr-noha_daily.yaml @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-odl-fdio-dvr-noha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-odl-fdio-dvr-noha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-10.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-10.yaml new file mode 100644 index 000000000..5c7a6141d --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-10.yaml @@ -0,0 +1,260 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: 10-vnf-correlated + name: 10-vnf-correlated + short-name: 10-vnf-correlated + description: 10-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '3' + vnfd-id-ref: vnf__1 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '4' + vnfd-id-ref: vnf__2 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '5' + vnfd-id-ref: vnf__3 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '6' + vnfd-id-ref: vnf__4 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '7' + vnfd-id-ref: vnf__5 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '8' + vnfd-id-ref: vnf__6 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '9' + vnfd-id-ref: vnf__7 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '10' + vnfd-id-ref: vnf__8 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '11' + vnfd-id-ref: vnf__9 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + + vld: + - id: uplink_0 + name: "tg__0 to vnf__0 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__0 + - id: downlink_0 + name: "vnf__0 to tg__1 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__1 + - id: uplink_1 + name: "tg__0 to vnf__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__1 + - id: downlink_1 + name: "vnf__1 to tg__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__1 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__1 + - id: uplink_2 + name: "tg__0 to vnf__2 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__2 + - id: downlink_2 + name: "vnf__2 to tg__1 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__2 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__1 + - id: uplink_3 + name: "tg__0 to vnf__3 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__3 + - id: downlink_3 + name: "vnf__3 to tg__1 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__3 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__1 + - id: uplink_4 + name: "tg__0 to vnf__4 link 4" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe4 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '6' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__4 + - id: downlink_4 + name: "vnf__4 to tg__1 link 4" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '6' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__4 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe4 + vnfd-id-ref: tg__1 + - id: uplink_5 + name: "tg__0 to vnf__5 link 5" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe5 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '7' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__5 + - id: downlink_5 + name: "vnf__5 to tg__1 link 5" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '7' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__5 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe5 + vnfd-id-ref: tg__1 + - id: uplink_6 + name: "tg__0 to vnf__6 link 6" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe6 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '8' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__6 + - id: downlink_6 + name: "vnf__6 to tg__1 link 6" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '8' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__6 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe6 + vnfd-id-ref: tg__1 + - id: uplink_7 + name: "tg__0 to vnf__7 link 7" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe7 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '9' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__7 + - id: downlink_7 + name: "vnf__7 to tg__1 link 7" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '9' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__7 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe7 + vnfd-id-ref: tg__1 + - id: uplink_8 + name: "tg__0 to vnf__8 link 8" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe8 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '10' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__8 + - id: downlink_8 + name: "vnf__8 to tg__1 link 8" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '10' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__8 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe8 + vnfd-id-ref: tg__1 + - id: uplink_9 + name: "tg__0 to vnf__9 link 9" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe9 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '11' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__9 + - id: downlink_9 + name: "vnf__9 to tg__1 link 9" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '11' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__9 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe9 + vnfd-id-ref: tg__1 + diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-2.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-2.yaml new file mode 100644 index 000000000..a9870dc09 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-2.yaml @@ -0,0 +1,76 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: 2-vnf-correlated + name: 2-vnf-correlated + short-name: 2-vnf-correlated + description: 2-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '3' + vnfd-id-ref: vnf__1 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + + vld: + - id: uplink_0 + name: "tg__0 to vnf__0 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__0 + - id: downlink_0 + name: "vnf__0 to tg__1 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__1 + - id: uplink_1 + name: "tg__0 to vnf__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__1 + - id: downlink_1 + name: "vnf__1 to tg__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__1 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__1 + diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-4.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-4.yaml new file mode 100644 index 000000000..89a067a40 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-4.yaml @@ -0,0 +1,122 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: 4-vnf-correlated + name: 4-vnf-correlated + short-name: 4-vnf-correlated + description: 4-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '3' + vnfd-id-ref: vnf__1 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '4' + vnfd-id-ref: vnf__2 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + - member-vnf-index: '5' + vnfd-id-ref: vnf__3 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + + vld: + - id: uplink_0 + name: "tg__0 to vnf__0 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__0 + - id: downlink_0 + name: "vnf__0 to tg__1 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__1 + - id: uplink_1 + name: "tg__0 to vnf__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__1 + - id: downlink_1 + name: "vnf__1 to tg__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__1 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__1 + - id: uplink_2 + name: "tg__0 to vnf__2 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__2 + - id: downlink_2 + name: "vnf__2 to tg__1 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__2 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__1 + - id: uplink_3 + name: "tg__0 to vnf__3 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__3 + - id: downlink_3 + name: "vnf__3 to tg__1 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__3 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__1 + diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-scale-out.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-scale-out.yaml new file mode 100644 index 000000000..c06777923 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-3node-scale-out.yaml @@ -0,0 +1,57 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: {{ num_vnfs }}-vnf-correlated + name: {{ num_vnfs }}-vnf-correlated + short-name: {{ num_vnfs }}-vnf-correlated + description: {{ num_vnfs }}-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type +{% for vnf_num in range(num_vnfs|int) %} + - member-vnf-index: '{{ vnf_num + 2 }}' + vnfd-id-ref: vnf__{{ vnf_num }} + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type +{% endfor %} + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__{{ vnf_num }} link {{ vnf_num }}" + 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 }}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '{{ vnf_num + 2}}' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__{{ vnf_num }} + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ vnf_num }} + vnfd-id-ref: tg__1 +{% endfor %} + diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml new file mode 100644 index 000000000..667d23e80 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-correlated-multi-port.yaml @@ -0,0 +1,54 @@ +# 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 + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: 2 + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - 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: 2 + vnfd-connection-point-ref: xe{{vnf_num * 2 + 1}} + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ vnf_num }} + vnfd-id-ref: tg__1 +{% endfor %} diff --git a/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml new file mode 100644 index 000000000..00bf28231 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-ixia-multi-port.yaml @@ -0,0 +1,51 @@ +# 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/ixia_rfc2544_tpl.yaml + - member-vnf-index: '1' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: '1' + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - id: downlink_{{ vnf_num }} + name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}} + vnfd-id-ref: vnf__0 + - 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/acl-tg-topology-multi-port.yaml b/samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml new file mode 100644 index 000000000..18ae4aee9 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/acl-tg-topology-multi-port.yaml @@ -0,0 +1,51 @@ +# 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 + - member-vnf-index: '1' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/acl_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: '1' + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - id: downlink_{{ vnf_num }} + name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}} + vnfd-id-ref: vnf__0 + - 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/acl.cfg b/samples/vnf_samples/nsut/acl/acl.cfg index fd3c51ee8..06da405db 100644 --- a/samples/vnf_samples/nsut/acl/acl.cfg +++ b/samples/vnf_samples/nsut/acl/acl.cfg @@ -20,8 +20,6 @@ type = ARPICMP core = 1 pktq_in = SWQ4 pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 -arp_route_tbl = (c0102814,fffff000,1,c0102814) (c0106414,fffff000,0,c0106414) -nd_route_tbl = (0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414) pktq_in_prv = RXQ0.0 prv_to_pub_map = (0,1) [PIPELINE2] diff --git a/samples/vnf_samples/nsut/acl/acl_config/acl_config b/samples/vnf_samples/nsut/acl/acl_config/acl_config deleted file mode 100644 index 52b6a5002..000000000 --- a/samples/vnf_samples/nsut/acl/acl_config/acl_config +++ /dev/null @@ -1,61 +0,0 @@ -; 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. - -[PIPELINE0] -type = MASTER -core = s{socket}c0 -[PIPELINE1] -type = ARPICMP -core = s{socket}c1 -pktq_in = SWQ2 -pktq_out = SWQ7 -# debug output -# ({port1_dst_ip},{port1_netmask},1,{port1_dst_ip}) ({port0_dst_ip},{port0_netmask},0,{port0_dst_ip}) -arp_route_tbl = ({port0_dst_ip_hex},{port0_netmask_hex},0,{port0_dst_ip_hex}) ({port1_dst_ip_hex},{port1_netmask_hex},1,{port1_dst_ip_hex}) -#ports_mac_list = port0_local_mac port1_local_mac -ports_mac_list = {port0_local_mac} {port1_local_mac} -pktq_in_prv = RXQ0.0 RXQ1.0 -prv_to_pub_map = (0,1) -prv_que_handler = (0) - -[PIPELINE2] -type = TXRX -core = s{socket}c2 -pktq_in = RXQ0.0 RXQ1.0 -pktq_out = SWQ0 SWQ1 SWQ2 -pipeline_txrx_type = RXRX -dest_if_offset=176 -[PIPELINE3] -type = LOADB -core = s{socket}c3 -pktq_in = SWQ0 SWQ1 -pktq_out = SWQ3 SWQ4 -outport_offset = 136 -phyport_offset = 204 -n_vnf_threads = 1 -prv_que_handler = (0) -[PIPELINE4] -type = ACL -core = s{socket}c4 -pktq_in = SWQ3 SWQ4 -pktq_out = SWQ5 SWQ6 -n_flows = 1000000 -pkt_type = ipv4 -traffic_type = 4 -[PIPELINE5] -type = TXRX -core = s{socket}c5 -pktq_in = SWQ5 SWQ6 SWQ7 -pktq_out = TXQ0.0 TXQ1.0 -pipeline_txrx_type = TXTX diff --git a/samples/vnf_samples/nsut/acl/acl_config/acl_script b/samples/vnf_samples/nsut/acl/acl_config/acl_script deleted file mode 100644 index 4d7553609..000000000 --- a/samples/vnf_samples/nsut/acl/acl_config/acl_script +++ /dev/null @@ -1,53 +0,0 @@ -# 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. - -link 0 down -link 0 config {port0_local_ip} {port0_prefixlen} -link 0 up -link 1 down -link 1 config {port1_local_ip} {port1_prefixlen} -link 1 up - -p action add 0 accept -p action add 0 fwd 0 -p action add 0 count - -p action add 1 accept -p action add 1 fwd 1 -p action add 1 count - -#p acl add 1 0.0.0.0 0 0.0.0.0 0 0 65535 0 65535 0 0 0 -#p acl add 1 0.0.0.0 0 0.0.0.0 0 0 65535 0 65535 0 0 1 - -# action rule matches dest port -p acl add 1 {port1_local_network} {port1_prefix} 0.0.0.0 0 0 65535 0 65535 0 0 0 -p acl add 1 0.0.0.0 0 {port1_local_network} {port1_prefix} 0 65535 0 65535 0 0 1 - -p acl add 1 {port0_local_network} {port0_prefix} 0.0.0.0 0 0 65535 0 65535 0 0 1 -p acl add 1 0.0.0.0 0 {port0_local_network} {port0_prefix} 0 65535 0 65535 0 0 0 - -p acl add 1 {port0_local_network} {port0_prefix} {port1_local_network} {port1_prefix} 0 65535 0 65535 0 0 1 -p acl add 1 {port1_local_network} {port1_prefix} {port0_local_network} {port0_prefix} 0 65535 0 65535 0 0 0 - -# gateway is the remote port -p 1 arpadd 0 {port0_gateway} {port0_local_mac} -p 1 arpadd 0 {port0_local_ip} {port0_local_mac} -p 1 arpadd 0 {port0_dst_ip} {port0_dst_mac} -p 1 arpadd 1 {port1_gateway} {port1_local_mac} -p 1 arpadd 1 {port1_local_ip} {port1_local_mac} -p 1 arpadd 1 {port1_dst_ip} {port1_dst_mac} - -p acl applyruleset - -#p acl dbg 1 diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml new file mode 100644 index 000000000..17b918ce0 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_ixia_template.yaml @@ -0,0 +1,55 @@ +# 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-ixia-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + 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 }} + vnf__0: + 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}}} + ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + - name: yardstick + type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml new file mode 100644 index 000000000..1333b2721 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_rfc2544_template.yaml @@ -0,0 +1,54 @@ +# 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 + vnf__0: vnf__0.yardstick + 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 }} + vnf__0: + 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}}} + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + - name: yardstick + type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml new file mode 100644 index 000000000..fe7be9aba --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_acl_udp_ixia_correlated_multi_port_template.yaml @@ -0,0 +1,57 @@ +# Copyright (c) 2016-2017 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +schema: yardstick:task:0.1 +scenarios: + - type: NSPerf + traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml + topology: acl-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + tg__1: tg__1.yardstick + vnf__0: vnf__0.yardstick + options: + framesize: + uplink: {{ flow.pkt_size.uplink }} + downlink: {{ flow.pkt_size.downlink }} + flow: + src_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__0': 'xe{{ vnf_num }}'} +{% endfor %} + dst_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__1': 'xe{{ vnf_num }}'} +{% endfor %} + count: {{ flow.count }} + traffic_type: {{ flow.traffic_type }} + rfc2544: + allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }} + vnf__0: + 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}}} + ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg + + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml + - type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml + name: yardstick diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml index 31ee32b7b..6c9f53507 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 2da7d6675..bd99fdd3b 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml index 088ef5474..706ffb992 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 3e1345a17..cb50d7da1 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml index 9753812ac..334e36e95 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml @@ -24,8 +24,8 @@ scenarios: tg__1: trafficgen_2.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__1': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml index 5bd0f175b..bc68632cf 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml @@ -24,8 +24,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml index 3e1345a17..cb50d7da1 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_ipv4_worstcaserules_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml index 1cf37ca26..ad9fe90b8 100644 --- a/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 7643e6251..78cb0fe44 100644 --- a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_10.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_10.yaml new file mode 100644 index 000000000..5b28d5675 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_10.yaml @@ -0,0 +1,370 @@ +# 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-10.yaml + topology: acl-tg-topology-3node-10.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + vnf__2: vnf_2.yardstick + vnf__3: vnf_3.yardstick + vnf__4: vnf_4.yardstick + vnf__5: vnf_5.yardstick + vnf__6: vnf_6.yardstick + vnf__7: vnf_7.yardstick + vnf__8: vnf_8.yardstick + vnf__9: vnf_9.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + - {'tg__0': 'xe2'} + - {'tg__0': 'xe3'} + - {'tg__0': 'xe4'} + - {'tg__0': 'xe5'} + - {'tg__0': 'xe6'} + - {'tg__0': 'xe7'} + - {'tg__0': 'xe8'} + - {'tg__0': 'xe9'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + - {'tg__1': 'xe2'} + - {'tg__1': 'xe3'} + - {'tg__1': 'xe4'} + - {'tg__1': 'xe5'} + - {'tg__1': 'xe6'} + - {'tg__1': 'xe7'} + - {'tg__1': 'xe8'} + - {'tg__1': 'xe9'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__1: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__2: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__3: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__4: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__5: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__6: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__7: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__8: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__9: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + uplink_2: + - xe2 + uplink_3: + - xe3 + uplink_4: + - xe4 + uplink_5: + - xe5 + uplink_6: + - xe6 + uplink_7: + - xe7 + uplink_8: + - xe8 + uplink_9: + - xe9 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + downlink_2: + - xe2 + downlink_3: + - xe3 + downlink_4: + - xe4 + downlink_5: + - xe5 + downlink_6: + - xe6 + downlink_7: + - xe7 + downlink_8: + - xe8 + downlink_9: + - xe9 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + vnf_2: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_2: + - xe0 + downlink_2: + - xe1 + vnf_3: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_3: + - xe0 + downlink_3: + - xe1 + vnf_4: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_4: + - xe0 + downlink_4: + - xe1 + vnf_5: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_5: + - xe0 + downlink_5: + - xe1 + vnf_6: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_6: + - xe0 + downlink_6: + - xe1 + vnf_7: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_7: + - xe0 + downlink_7: + - xe1 + vnf_8: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_8: + - xe0 + downlink_8: + - xe1 + vnf_9: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_9: + - xe0 + downlink_9: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_2: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_2: + cidr: '10.3.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_3: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_3: + cidr: '10.4.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_4: + cidr: '10.5.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_4: + cidr: '10.5.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_5: + cidr: '10.6.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_5: + cidr: '10.6.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_6: + cidr: '10.7.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_6: + cidr: '10.7.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_7: + cidr: '10.8.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_7: + cidr: '10.8.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_8: + cidr: '10.9.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_8: + cidr: '10.9.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_9: + cidr: '10.10.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_9: + cidr: '10.10.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_2.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_2.yaml new file mode 100644 index 000000000..ef76405fe --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_2.yaml @@ -0,0 +1,130 @@ +# 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-2.yaml + topology: acl-tg-topology-3node-2.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__1: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_4.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_4.yaml new file mode 100644 index 000000000..edf9611c8 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_4.yaml @@ -0,0 +1,190 @@ +# 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-4.yaml + topology: acl-tg-topology-3node-4.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + vnf__2: vnf_2.yardstick + vnf__3: vnf_3.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + - {'tg__0': 'xe2'} + - {'tg__0': 'xe3'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + - {'tg__1': 'xe2'} + - {'tg__1': 'xe3'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__1: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__2: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__3: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + uplink_2: + - xe2 + uplink_3: + - xe3 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + downlink_2: + - xe2 + downlink_3: + - xe3 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + vnf_2: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_2: + - xe0 + downlink_2: + - xe1 + vnf_3: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_3: + - xe0 + downlink_3: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_2: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_2: + cidr: '10.3.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_3: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_3: + cidr: '10.4.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_out.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_out.yaml new file mode 100644 index 000000000..4da95a1ca --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_traffic_scale_out.yaml @@ -0,0 +1,116 @@ +# 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-3node-{{ 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: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__0': 'xe{{ vnf_num }}'} +{% endfor %} + dst_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__1': 'xe{{ vnf_num }}'} +{% endfor %} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true +{% for vnf_num in range(num_vnfs|int) %} + vnf__{{ vnf_num }}: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} +{% endfor %} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt +{% for vnf_num in range(num_vnfs|int) %} + uplink_{{ vnf_num }}: + - xe{{ vnf_num }} +{% endfor %} + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt +{% for vnf_num in range(num_vnfs|int) %} + downlink_{{ vnf_num }}: + - xe{{ vnf_num }} +{% endfor %} +{% for vnf_num in range(num_vnfs|int) %} + vnf_{{ vnf_num }}: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_{{ vnf_num }}: + - xe0 + downlink_{{ vnf_num }}: + - xe1 +{% endfor %} + networks: + mgmt: + cidr: '10.0.1.0/24' +{% for vnf_num in range(num_vnfs|int) %} + uplink_{{ vnf_num }}: + cidr: '10.{{ vnf_num + 1 }}.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_{{ vnf_num }}: + cidr: '10.{{ vnf_num + 1 }}.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' +{% endfor %} diff --git a/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml new file mode 100644 index 000000000..2d84802f8 --- /dev/null +++ b/samples/vnf_samples/nsut/acl/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml @@ -0,0 +1,98 @@ +# 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 mem = mem or 20480 %} +{% set vcpus = vcpus or 10 %} + +schema: yardstick:task:0.1 +scenarios: +- type: NSPerf + traffic_profile: ../../traffic_profiles/ipv4_throughput.yaml + topology: acl-tg-topology.yaml + nodes: + tg__0: tg_0.yardstick + vnf__0: vnf_0.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: [{'tg__0': 'xe0'}] + dst_ip: [{'tg__0': 'xe1'}] + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + vnf__0: + rules: acl_1rule.yaml + # with 1 worker_thread we need 5 or so extra cores + vnf_config: {lb_config: 'HW', lb_count: 1, worker_config: '1C/1T', worker_threads: {{ vcpus - 5 if vcpus - 5 > 1 else 1 }}} + nfvi_enable: True + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: {{ vcpus }} + ram: {{ mem }} + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: {{ vcpus }} + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + + diff --git a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml index f4dca8a79..015c20eca 100644 --- a/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml +++ b/samples/vnf_samples/nsut/acl/tc_heat_trex_external_rfc2544_ipv4_1rule_1flow_64B_packetsize.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml index 8e1c43f88..5f5d0869d 100644 --- a/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml +++ b/samples/vnf_samples/nsut/acl/tc_ovs_acl_udp_ixia_correlated_scale_out_template.yaml @@ -17,7 +17,7 @@ schema: yardstick:task:0.1 scenarios: - type: NSPerf traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml - topology: acl-tg-topology-scale-out-{{ num_vnfs }}.yaml + topology: acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml nodes: tg__0: tg__0.yardstick tg__1: tg__1.yardstick diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 047a118b3..469eddfc0 100644 --- a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 2921f4912..134b15fb0 100644 --- a/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml index d06c2ec96..024507bc6 100644 --- a/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml +++ b/samples/vnf_samples/nsut/acl/tc_sriov_acl_udp_ixia_correlated_scale_out_template.yaml @@ -17,7 +17,7 @@ schema: yardstick:task:0.1 scenarios: - type: NSPerf traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml - topology: acl-tg-topology-ixia-scale-out-{{ num_vnfs }}.yaml + topology: acl-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml nodes: tg__0: tg__0.yardstick tg__1: tg__1.yardstick diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 13d1ab183..a9eb9066b 100644 --- a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 58e6fbda0..8b3241620 100644 --- a/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/acl/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml new file mode 100644 index 000000000..cf64d96ba --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-correlated-multi-port.yaml @@ -0,0 +1,54 @@ +# 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 + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: 2 + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - 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: 2 + vnfd-connection-point-ref: xe{{vnf_num * 2 + 1}} + vnfd-id-ref: vnf__0 + - 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/cgnapt-tg-topology-ixia-multi-port.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml new file mode 100644 index 000000000..91d257fd4 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-ixia-multi-port.yaml @@ -0,0 +1,51 @@ +# 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/ixia_rfc2544_tpl.yaml + - member-vnf-index: '1' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: '1' + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - id: downlink_{{ vnf_num }} + name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}} + vnfd-id-ref: vnf__0 + - 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/cgnapt-tg-topology-multi-port.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml new file mode 100644 index 000000000..b96cd38d4 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-tg-topology-multi-port.yaml @@ -0,0 +1,51 @@ +# 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 + - member-vnf-index: '1' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: '1' + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - id: downlink_{{ vnf_num }} + name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}} + vnfd-id-ref: vnf__0 + - 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/cgnapt-vnf-topology-3node-10.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-10.yaml new file mode 100644 index 000000000..3b45d4dad --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-10.yaml @@ -0,0 +1,260 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: 10-vnf-correlated + name: 10-vnf-correlated + short-name: 10-vnf-correlated + description: 10-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '3' + vnfd-id-ref: vnf__1 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '4' + vnfd-id-ref: vnf__2 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '5' + vnfd-id-ref: vnf__3 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '6' + vnfd-id-ref: vnf__4 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '7' + vnfd-id-ref: vnf__5 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '8' + vnfd-id-ref: vnf__6 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '9' + vnfd-id-ref: vnf__7 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '10' + vnfd-id-ref: vnf__8 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '11' + vnfd-id-ref: vnf__9 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + + vld: + - id: uplink_0 + name: "tg__0 to vnf__0 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__0 + - id: downlink_0 + name: "vnf__0 to tg__1 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__1 + - id: uplink_1 + name: "tg__0 to vnf__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__1 + - id: downlink_1 + name: "vnf__1 to tg__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__1 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__1 + - id: uplink_2 + name: "tg__0 to vnf__2 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__2 + - id: downlink_2 + name: "vnf__2 to tg__1 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__2 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__1 + - id: uplink_3 + name: "tg__0 to vnf__3 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__3 + - id: downlink_3 + name: "vnf__3 to tg__1 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__3 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__1 + - id: uplink_4 + name: "tg__0 to vnf__4 link 4" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe4 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '6' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__4 + - id: downlink_4 + name: "vnf__4 to tg__1 link 4" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '6' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__4 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe4 + vnfd-id-ref: tg__1 + - id: uplink_5 + name: "tg__0 to vnf__5 link 5" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe5 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '7' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__5 + - id: downlink_5 + name: "vnf__5 to tg__1 link 5" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '7' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__5 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe5 + vnfd-id-ref: tg__1 + - id: uplink_6 + name: "tg__0 to vnf__6 link 6" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe6 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '8' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__6 + - id: downlink_6 + name: "vnf__6 to tg__1 link 6" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '8' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__6 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe6 + vnfd-id-ref: tg__1 + - id: uplink_7 + name: "tg__0 to vnf__7 link 7" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe7 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '9' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__7 + - id: downlink_7 + name: "vnf__7 to tg__1 link 7" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '9' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__7 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe7 + vnfd-id-ref: tg__1 + - id: uplink_8 + name: "tg__0 to vnf__8 link 8" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe8 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '10' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__8 + - id: downlink_8 + name: "vnf__8 to tg__1 link 8" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '10' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__8 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe8 + vnfd-id-ref: tg__1 + - id: uplink_9 + name: "tg__0 to vnf__9 link 9" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe9 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '11' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__9 + - id: downlink_9 + name: "vnf__9 to tg__1 link 9" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '11' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__9 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe9 + vnfd-id-ref: tg__1 + diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-2.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-2.yaml new file mode 100644 index 000000000..a289e9830 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-2.yaml @@ -0,0 +1,76 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: 2-vnf-correlated + name: 2-vnf-correlated + short-name: 2-vnf-correlated + description: 2-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '3' + vnfd-id-ref: vnf__1 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + + vld: + - id: uplink_0 + name: "tg__0 to vnf__0 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__0 + - id: downlink_0 + name: "vnf__0 to tg__1 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__1 + - id: uplink_1 + name: "tg__0 to vnf__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__1 + - id: downlink_1 + name: "vnf__1 to tg__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__1 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__1 + diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-4.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-4.yaml new file mode 100644 index 000000000..bf6431f8d --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-4.yaml @@ -0,0 +1,122 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: 4-vnf-correlated + name: 4-vnf-correlated + short-name: 4-vnf-correlated + description: 4-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - member-vnf-index: '1' + vnfd-id-ref: tg__1 + VNF model: ../../vnf_descriptors/udp_replay_vnf.yaml #VNF type + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '3' + vnfd-id-ref: vnf__1 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '4' + vnfd-id-ref: vnf__2 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + - member-vnf-index: '5' + vnfd-id-ref: vnf__3 + VNF model: ../../vnf_descriptors/cgnapt_vnf.yaml #VNF type + + vld: + - id: uplink_0 + name: "tg__0 to vnf__0 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__0 + - id: downlink_0 + name: "vnf__0 to tg__1 link 0" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '2' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__0 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: tg__1 + - id: uplink_1 + name: "tg__0 to vnf__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__1 + - id: downlink_1 + name: "vnf__1 to tg__1 link 1" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '3' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__1 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: tg__1 + - id: uplink_2 + name: "tg__0 to vnf__2 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__2 + - id: downlink_2 + name: "vnf__2 to tg__1 link 2" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '4' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__2 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe2 + vnfd-id-ref: tg__1 + - id: uplink_3 + name: "tg__0 to vnf__3 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '0' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__0 + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe0 + vnfd-id-ref: vnf__3 + - id: downlink_3 + name: "vnf__3 to tg__1 link 3" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '5' + vnfd-connection-point-ref: xe1 + vnfd-id-ref: vnf__3 + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe3 + vnfd-id-ref: tg__1 + diff --git a/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-scale-out.yaml b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-scale-out.yaml new file mode 100644 index 000000000..6a99e4ea0 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/cgnapt-vnf-topology-3node-scale-out.yaml @@ -0,0 +1,57 @@ +# 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. +--- +nsd:nsd-catalog: + nsd: + - id: {{ num_vnfs }}-vnf-correlated + name: {{ num_vnfs }}-vnf-correlated + short-name: {{ num_vnfs }}-vnf-correlated + description: {{ num_vnfs }}-vnf-correlated + constituent-vnfd: + - member-vnf-index: '0' + vnfd-id-ref: tg__0 + VNF model: ../../vnf_descriptors/tg_rfc2544_tpl.yaml #VNF type + - 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 }}" + 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 }}" + 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/cgnat.cfg b/samples/vnf_samples/nsut/cgnapt/cgnat.cfg index 8b16f57f6..27169f8dc 100644 --- a/samples/vnf_samples/nsut/cgnapt/cgnat.cfg +++ b/samples/vnf_samples/nsut/cgnapt/cgnat.cfg @@ -21,15 +21,7 @@ core = 1 pktq_in = SWQ4 pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 -; ARP route table entries (ip, mask, if_port, nh) hex values with no 0x -arp_route_tbl = (c0102814,fffff000,1,c0102814) (c0106414,fffff000,0,c0106414) -;arp_route_tbl = (c0122814,fffff000,3,c0122814) (c0126414,fffff000,1,c0126414) -; Link MAC addresses in order aa:bb:cc:dd:ee:ff separated by space -nd_route_tbl = (0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414) -; -; Hex values with no leading 0x, MACs in ascending port order starting @P0 -;ports_mac_list = 00:05:CA:30:21:F0 00:05:CA:30:21:F1 ;00:05:CA:30:21:F2 00:05:CA:30:21:F3 -; + ; egress (private interface) info pktq_in_prv = RXQ0.0 ; @@ -39,6 +31,7 @@ prv_to_pub_map = (0,1) [PIPELINE2] type = TIMER core = 2 +timer_dyn_timeout = 1000000 n_flows = 1048576 [PIPELINE3] type = TXRX @@ -73,8 +66,8 @@ hash_offset = 200;72 ; timer_period = 100 max_clients_per_ip = 65535 -max_port_per_client = 10 -public_ip_port_range = 98103214:(1, 65535) +max_port_per_client = 100 +public_ip_port_range = 04040000:(1, 65535) vnf_set = (3,4,5) pkt_type = ipv4 cgnapt_meta_offset = 128 diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml new file mode 100644 index 000000000..3a1c1cb12 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_ixia_template.yaml @@ -0,0 +1,55 @@ +# 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: cgnapt-tg-topology-ixia-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + 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 }} + vnf__0: + 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}}} + ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + - name: yardstick + type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml new file mode 100644 index 000000000..81000a7a5 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_rfc2544_template.yaml @@ -0,0 +1,54 @@ +# 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: cgnapt-tg-topology-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + 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 }} + vnf__0: + 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}}} + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + - name: yardstick + type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml new file mode 100644 index 000000000..879911f62 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_cgnapt_udp_ixia_correlated_multi_port_template.yaml @@ -0,0 +1,57 @@ +# Copyright (c) 2016-2017 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +schema: yardstick:task:0.1 +scenarios: + - type: NSPerf + traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml + topology: cgnapt-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + tg__1: tg__1.yardstick + vnf__0: vnf__0.yardstick + options: + framesize: + uplink: {{ flow.pkt_size.uplink }} + downlink: {{ flow.pkt_size.downlink }} + flow: + src_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__0': 'xe{{ vnf_num }}'} +{% endfor %} + dst_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__1': 'xe{{ vnf_num }}'} +{% endfor %} + count: {{ flow.count }} + traffic_type: {{ flow.traffic_type }} + rfc2544: + allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }} + vnf__0: + 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}}} + ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg + + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml + - type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml + name: yardstick diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml index d5fda5804..6bfca0d7a 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml @@ -23,8 +23,10 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} + flow: + public_ip: ["152.16.40.10"] traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml index 0f1ddd606..a56321396 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml index cd74655d5..71f6d1dc8 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia_scale_up.yaml @@ -24,12 +24,12 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] - publicip: ["152.16.40.10"] + public_ip: ["152.16.40.10"] count: 1000 traffic_type: 4 rfc2544: diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml index 3390cf022..042c4ddee 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml @@ -23,12 +23,12 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] - publicip: ["152.16.40.10"] + public_ip: ["152.16.40.10"] count: 1 traffic_type: 4 rfc2544: diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml index 424422dd2..1461c9601 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml @@ -24,11 +24,12 @@ scenarios: tg__1: trafficgen_2.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__1': 'xe0'}] + public_ip: ['152.16.40.10'] count: 1 traffic_type: 4 rfc2544: diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml index 3736715ac..3c5d12abb 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_scale_up.yaml @@ -24,12 +24,12 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] - publicip: ["152.16.40.10"] + public_ip: ["152.16.40.10"] count: 1 traffic_type: 4 rfc2544: diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml index 0fbd402ac..91a703877 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_64B_trex.yaml @@ -23,12 +23,12 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] - publicip: ["152.16.40.10"] + public_ip: ["152.16.40.10"] count: 1 traffic_type: 4 rfc2544: diff --git a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml index e400b1750..c51729790 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_baremetal_rfc2544_with_latency_ipv4_1flow_dynamic_cgnapt_ixia.yaml @@ -24,8 +24,8 @@ scenarios: tg__1: trafficgen_2.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__1': 'xe0'}] diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml index c64bb1bcd..ba5180a82 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_external_rfc2544_ipv4_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml index 4f1d8579c..b38d4be6c 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_10.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_10.yaml new file mode 100644 index 000000000..ac0a83b34 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_10.yaml @@ -0,0 +1,370 @@ +# 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-10.yaml + topology: cgnapt-vnf-topology-3node-10.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + vnf__2: vnf_2.yardstick + vnf__3: vnf_3.yardstick + vnf__4: vnf_4.yardstick + vnf__5: vnf_5.yardstick + vnf__6: vnf_6.yardstick + vnf__7: vnf_7.yardstick + vnf__8: vnf_8.yardstick + vnf__9: vnf_9.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + - {'tg__0': 'xe2'} + - {'tg__0': 'xe3'} + - {'tg__0': 'xe4'} + - {'tg__0': 'xe5'} + - {'tg__0': 'xe6'} + - {'tg__0': 'xe7'} + - {'tg__0': 'xe8'} + - {'tg__0': 'xe9'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + - {'tg__1': 'xe2'} + - {'tg__1': 'xe3'} + - {'tg__1': 'xe4'} + - {'tg__1': 'xe5'} + - {'tg__1': 'xe6'} + - {'tg__1': 'xe7'} + - {'tg__1': 'xe8'} + - {'tg__1': 'xe9'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__1: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__2: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__3: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__4: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__5: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__6: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__7: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__8: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__9: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + uplink_2: + - xe2 + uplink_3: + - xe3 + uplink_4: + - xe4 + uplink_5: + - xe5 + uplink_6: + - xe6 + uplink_7: + - xe7 + uplink_8: + - xe8 + uplink_9: + - xe9 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + downlink_2: + - xe2 + downlink_3: + - xe3 + downlink_4: + - xe4 + downlink_5: + - xe5 + downlink_6: + - xe6 + downlink_7: + - xe7 + downlink_8: + - xe8 + downlink_9: + - xe9 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + vnf_2: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_2: + - xe0 + downlink_2: + - xe1 + vnf_3: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_3: + - xe0 + downlink_3: + - xe1 + vnf_4: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_4: + - xe0 + downlink_4: + - xe1 + vnf_5: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_5: + - xe0 + downlink_5: + - xe1 + vnf_6: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_6: + - xe0 + downlink_6: + - xe1 + vnf_7: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_7: + - xe0 + downlink_7: + - xe1 + vnf_8: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_8: + - xe0 + downlink_8: + - xe1 + vnf_9: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_9: + - xe0 + downlink_9: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_2: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_2: + cidr: '10.3.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_3: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_3: + cidr: '10.4.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_4: + cidr: '10.5.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_4: + cidr: '10.5.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_5: + cidr: '10.6.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_5: + cidr: '10.6.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_6: + cidr: '10.7.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_6: + cidr: '10.7.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_7: + cidr: '10.8.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_7: + cidr: '10.8.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_8: + cidr: '10.9.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_8: + cidr: '10.9.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_9: + cidr: '10.10.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_9: + cidr: '10.10.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_2.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_2.yaml new file mode 100644 index 000000000..894fcceef --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_2.yaml @@ -0,0 +1,130 @@ +# 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-2.yaml + topology: cgnapt-vnf-topology-3node-2.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__1: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_4.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_4.yaml new file mode 100644 index 000000000..ffdec998e --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_4.yaml @@ -0,0 +1,190 @@ +# 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-4.yaml + topology: cgnapt-vnf-topology-3node-4.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + vnf__2: vnf_2.yardstick + vnf__3: vnf_3.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + - {'tg__0': 'xe2'} + - {'tg__0': 'xe3'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + - {'tg__1': 'xe2'} + - {'tg__1': 'xe3'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__1: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__2: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + vnf__3: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + uplink_2: + - xe2 + uplink_3: + - xe3 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + downlink_2: + - xe2 + downlink_3: + - xe3 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + vnf_2: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_2: + - xe0 + downlink_2: + - xe1 + vnf_3: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_3: + - xe0 + downlink_3: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_2: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_2: + cidr: '10.3.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_3: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_3: + cidr: '10.4.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_out.yaml b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_out.yaml new file mode 100644 index 000000000..5c884f2e0 --- /dev/null +++ b/samples/vnf_samples/nsut/cgnapt/tc_heat_rfc2544_ipv4_1flow_64B_trex_correlated_scale_out.yaml @@ -0,0 +1,116 @@ +# 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-vnf-topology-3node-{{ 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: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__0': 'xe{{ vnf_num }}'} +{% endfor %} + dst_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__1': 'xe{{ vnf_num }}'} +{% endfor %} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true +{% for vnf_num in range(num_vnfs|int) %} + vnf__{{ vnf_num }}: + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + napt: 'dynamic' +{% endfor %} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 10240 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt +{% for vnf_num in range(num_vnfs|int) %} + uplink_{{ vnf_num }}: + - xe{{ vnf_num }} +{% endfor %} + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt +{% for vnf_num in range(num_vnfs|int) %} + downlink_{{ vnf_num }}: + - xe{{ vnf_num }} +{% endfor %} +{% for vnf_num in range(num_vnfs|int) %} + vnf_{{ vnf_num }}: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_{{ vnf_num }}: + - xe0 + downlink_{{ vnf_num }}: + - xe1 +{% endfor %} + networks: + mgmt: + cidr: '10.0.1.0/24' +{% for vnf_num in range(num_vnfs|int) %} + uplink_{{ vnf_num }}: + cidr: '10.{{ vnf_num + 1 }}.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_{{ vnf_num }}: + cidr: '10.{{ vnf_num + 1 }}.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' +{% 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 index 5f575d709..e2002abc0 100644 --- 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 @@ -16,8 +16,8 @@ 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 + traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml + topology: cgnapt-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml nodes: tg__0: tg__0.yardstick tg__1: tg__1.yardstick diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 20e362844..1d8be5f74 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml index 66c818680..52becd3c6 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] 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 index 5b6d4a525..7f6e76cc2 100644 --- 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 @@ -16,8 +16,8 @@ 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 + traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml + topology: cgnapt-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml nodes: tg__0: tg__0.yardstick tg__1: tg__1.yardstick diff --git a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 46ff8478b..f0d996d51 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml index 7561a1089..ec517bbef 100644 --- a/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml +++ b/samples/vnf_samples/nsut/cgnapt/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg b/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg index 49cf29ca5..bcfdb5028 100644 --- a/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg +++ b/samples/vnf_samples/nsut/prox/configs/gen_acl-4.cfg @@ -115,7 +115,7 @@ rand_offset=42 name=p2 task=0 mode=gen -tx port=p1 +tx port=p2 bps=625000000 ; Ethernet + QinQ + IP + UDP pkt inline=${sut_mac2} 70 00 00 00 00 02 ${qinq_tag_inline} 00 01 81 00 00 01 08 00 45 00 00 1c 00 01 00 00 40 11 f7 7d c0 a8 01 01 c0 a8 01 01 00 35 00 35 00 08 7c 21 FFFFFFFF diff --git a/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml index 78e92ce74..313581ba2 100644 --- a/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/udp_replay/tc_baremetal_rfc2544_ipv4_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml index 9dff81f7d..bea9c8261 100644 --- a/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml +++ b/samples/vnf_samples/nsut/udp_replay/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml index 05f3ac08d..0867d6b51 100644 --- a/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml +++ b/samples/vnf_samples/nsut/udp_replay/tc_sriov_rfc2544_ipv4_1rule_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml index 5b2dae20f..89dcbc6b1 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency_4port.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency_4port.yaml index c1578884b..a62e447bf 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency_4port.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_http_ixload_1b_Requests-65000_Concurrency_4port.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} traffic_type: 4 rfc2544: allowed_drop_rate: 0.0001 - 0.0001 diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index b6eb5c191..6c9cb9d03 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_4port.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_4port.yaml index 89842bee9..56afdf426 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_4port.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_4port.yaml @@ -24,8 +24,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}] dst_ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml index 161a27678..0aea82247 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_ixia_scale_up.yaml @@ -24,8 +24,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 249511418..a3082eeea 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {128B: 100} + downlink: {128B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml index 8ec063657..30f44d082 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}] dst_ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml index e58130ab6..0c4119cf6 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_corelated_traffic.yaml @@ -24,8 +24,8 @@ scenarios: tg__1: trafficgen_2.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__1': 'xe0'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml index 8b21c27f0..caafe9161 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_ipv4_1rule_1flow_64B_trex_scale_up.yaml @@ -24,8 +24,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml index 1e2c8e53f..d71b985b8 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml index 38ed9282a..d51a1e983 100644 --- a/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_rfc2544_with_latency_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_ixia_template.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_ixia_template.yaml new file mode 100644 index 000000000..f442c71d0 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_ixia_template.yaml @@ -0,0 +1,55 @@ +# 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-ixia-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + 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 }} + vnf__0: + 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}}} + ixia_profile: ../../traffic_profiles/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + - name: yardstick + type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml new file mode 100644 index 000000000..6604e6451 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_rfc2544_template.yaml @@ -0,0 +1,54 @@ +# 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-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + vnf__0: vnf__0.yardstick + 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 }} + vnf__0: + 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}}} + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/baremetal_trex_{{num_vnfs}}.yaml + - name: yardstick + type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml diff --git a/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml new file mode 100644 index 000000000..d00fe1dcf --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_baremetal_vfw_udp_ixia_correlated_multi_port_template.yaml @@ -0,0 +1,57 @@ +# Copyright (c) 2016-2017 Intel Corporation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +--- +schema: yardstick:task:0.1 +scenarios: + - type: NSPerf + traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml + topology: vfw-tg-topology-ixia-correlated-multi-port-{{ num_vnfs }}.yaml + nodes: + tg__0: tg__0.yardstick + tg__1: tg__1.yardstick + vnf__0: vnf__0.yardstick + options: + framesize: + uplink: {{ flow.pkt_size.uplink }} + downlink: {{ flow.pkt_size.downlink }} + flow: + src_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__0': 'xe{{ vnf_num }}'} +{% endfor %} + dst_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__1': 'xe{{ vnf_num }}'} +{% endfor %} + count: {{ flow.count }} + traffic_type: {{ flow.traffic_type }} + rfc2544: + allowed_drop_rate: {{ flow.rfc2544.allowed_drop_rate }} + vnf__0: + 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}}} + ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{ num_vnfs }}_port.ixncfg + + runner: + type: Iteration + iterations: 10 + interval: 35 +contexts: + - name: yardstick + type: Node + file: /etc/yardstick/nodes/ixia_correlated_{{num_vnfs}}.yaml + - type: Node + file: /etc/yardstick/nodes/pod_bm_vnf_{{num_vnfs}}.yaml + name: yardstick diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 729027c0f..8f09b1283 100644 --- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 6fde741ec..502436ced 100644 --- a/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_heat_external_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index d9c24068e..2799a7ee9 100644 --- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml index 972a6ab37..980efe433 100644 --- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_4port.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf_0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}, {'tg__0': 'xe2'}] dst_ip: [{'tg__0': 'xe1'}, {'tg__0': 'xe3'}] @@ -66,22 +66,22 @@ context: networks: mgmt: cidr: '10.0.1.0/24' - private_0: + uplink_0: cidr: '10.1.0.0/24' gateway_ip: 'null' port_security_enabled: False enable_dhcp: 'false' - public_0: + downlink_0: cidr: '10.1.1.0/24' gateway_ip: 'null' port_security_enabled: False enable_dhcp: 'false' - private_1: + uplink_1: cidr: '10.2.0.0/24' gateway_ip: 'null' port_security_enabled: False enable_dhcp: 'false' - public_1: + downlink_1: cidr: '10.2.1.0/24' gateway_ip: 'null' port_security_enabled: False diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_computeKPI.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_computeKPI.yaml index 0903f6e94..b0972c53f 100644 --- a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_computeKPI.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_computeKPI.yaml @@ -26,8 +26,8 @@ scenarios: cpt__0: compute_0.compute_nodes options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_10.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_10.yaml new file mode 100644 index 000000000..cf60ba1f9 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_10.yaml @@ -0,0 +1,371 @@ +# 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-10.yaml + topology: vfw-tg-topology-3node-10.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + vnf__2: vnf_2.yardstick + vnf__3: vnf_3.yardstick + vnf__4: vnf_4.yardstick + vnf__5: vnf_5.yardstick + vnf__6: vnf_6.yardstick + vnf__7: vnf_7.yardstick + vnf__8: vnf_8.yardstick + vnf__9: vnf_9.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + - {'tg__0': 'xe2'} + - {'tg__0': 'xe3'} + - {'tg__0': 'xe4'} + - {'tg__0': 'xe5'} + - {'tg__0': 'xe6'} + - {'tg__0': 'xe7'} + - {'tg__0': 'xe8'} + - {'tg__0': 'xe9'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + - {'tg__1': 'xe2'} + - {'tg__1': 'xe3'} + - {'tg__1': 'xe4'} + - {'tg__1': 'xe5'} + - {'tg__1': 'xe6'} + - {'tg__1': 'xe7'} + - {'tg__1': 'xe8'} + - {'tg__1': 'xe9'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__1: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__2: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__3: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__4: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__5: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__6: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__7: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__8: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__9: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + # put node context first, so we don't HEAT deploy if node has errors + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 20480 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + uplink_2: + - xe2 + uplink_3: + - xe3 + uplink_4: + - xe4 + uplink_5: + - xe5 + uplink_6: + - xe6 + uplink_7: + - xe7 + uplink_8: + - xe8 + uplink_9: + - xe9 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + downlink_2: + - xe2 + downlink_3: + - xe3 + downlink_4: + - xe4 + downlink_5: + - xe5 + downlink_6: + - xe6 + downlink_7: + - xe7 + downlink_8: + - xe8 + downlink_9: + - xe9 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + vnf_2: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_2: + - xe0 + downlink_2: + - xe1 + vnf_3: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_3: + - xe0 + downlink_3: + - xe1 + vnf_4: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_4: + - xe0 + downlink_4: + - xe1 + vnf_5: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_5: + - xe0 + downlink_5: + - xe1 + vnf_6: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_6: + - xe0 + downlink_6: + - xe1 + vnf_7: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_7: + - xe0 + downlink_7: + - xe1 + vnf_8: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_8: + - xe0 + downlink_8: + - xe1 + vnf_9: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_9: + - xe0 + downlink_9: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_2: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_2: + cidr: '10.3.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_3: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_3: + cidr: '10.4.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_4: + cidr: '10.5.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_4: + cidr: '10.5.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_5: + cidr: '10.6.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_5: + cidr: '10.6.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_6: + cidr: '10.7.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_6: + cidr: '10.7.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_7: + cidr: '10.8.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_7: + cidr: '10.8.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_8: + cidr: '10.9.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_8: + cidr: '10.9.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_9: + cidr: '10.10.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_9: + cidr: '10.10.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_2.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_2.yaml new file mode 100644 index 000000000..bfda0bb7f --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_2.yaml @@ -0,0 +1,131 @@ +# 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-2.yaml + topology: vfw-tg-topology-3node-2.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__1: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + # put node context first, so we don't HEAT deploy if node has errors + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 20480 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_4.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_4.yaml new file mode 100644 index 000000000..64633eb77 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_4.yaml @@ -0,0 +1,191 @@ +# 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-4.yaml + topology: vfw-tg-topology-3node-4.yaml + nodes: + tg__0: tg_0.yardstick + tg__1: tg_1.yardstick + vnf__0: vnf_0.yardstick + vnf__1: vnf_1.yardstick + vnf__2: vnf_2.yardstick + vnf__3: vnf_3.yardstick + options: + framesize: + uplink: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: + - {'tg__0': 'xe0'} + - {'tg__0': 'xe1'} + - {'tg__0': 'xe2'} + - {'tg__0': 'xe3'} + dst_ip: + - {'tg__1': 'xe0'} + - {'tg__1': 'xe1'} + - {'tg__1': 'xe2'} + - {'tg__1': 'xe3'} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true + vnf__0: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__1: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__2: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + vnf__3: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + # put node context first, so we don't HEAT deploy if node has errors + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 20480 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + uplink_1: + - xe1 + uplink_2: + - xe2 + uplink_3: + - xe3 + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + downlink_0: + - xe0 + downlink_1: + - xe1 + downlink_2: + - xe2 + downlink_3: + - xe3 + vnf_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_0: + - xe0 + downlink_0: + - xe1 + vnf_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_1: + - xe0 + downlink_1: + - xe1 + vnf_2: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_2: + - xe0 + downlink_2: + - xe1 + vnf_3: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_3: + - xe0 + downlink_3: + - xe1 + networks: + mgmt: + cidr: '10.0.1.0/24' + uplink_0: + cidr: '10.1.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_0: + cidr: '10.1.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_1: + cidr: '10.2.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_1: + cidr: '10.2.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_2: + cidr: '10.3.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_2: + cidr: '10.3.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + uplink_3: + cidr: '10.4.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_3: + cidr: '10.4.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' diff --git a/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_out.yaml b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_out.yaml new file mode 100644 index 000000000..767ecbc1c --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/tc_heat_rfc2544_ipv4_1rule_1flow_64B_trex_correlated_scale_out.yaml @@ -0,0 +1,117 @@ +# 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-3node-{{ 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: {64B: 100} + downlink: {64B: 100} + flow: + src_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__0': 'xe{{ vnf_num }}'} +{% endfor %} + dst_ip: +{% for vnf_num in range(num_vnfs|int) %} + - {'tg__1': 'xe{{ vnf_num }}'} +{% endfor %} + count: 1 + traffic_type: 4 + rfc2544: + allowed_drop_rate: 0.0001 - 0.0001 + correlated_traffic: true +{% for vnf_num in range(num_vnfs|int) %} + vnf__{{ vnf_num }}: + rules: acl_1rule.yaml + vnf_config: {lb_config: 'SW', lb_count: 1, worker_config: '1C/1T', worker_threads: 1} +{% endfor %} + runner: + type: Iteration + iterations: 10 + interval: 35 +context: + # put node context first, so we don't HEAT deploy if node has errors + name: yardstick + image: yardstick-samplevnfs + flavor: + vcpus: 10 + ram: 20480 + disk: 6 + extra_specs: + hw:cpu_sockets: 1 + hw:cpu_cores: 10 + hw:cpu_threads: 1 + user: ubuntu + placement_groups: + pgrp1: + policy: "availability" + servers: + tg_0: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt +{% for vnf_num in range(num_vnfs|int) %} + uplink_{{ vnf_num }}: + - xe{{ vnf_num }} +{% endfor %} + tg_1: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt +{% for vnf_num in range(num_vnfs|int) %} + downlink_{{ vnf_num }}: + - xe{{ vnf_num }} +{% endfor %} +{% for vnf_num in range(num_vnfs|int) %} + vnf_{{ vnf_num }}: + floating_ip: true + placement: "pgrp1" + network_ports: + mgmt: + - mgmt + uplink_{{ vnf_num }}: + - xe0 + downlink_{{ vnf_num }}: + - xe1 +{% endfor %} + networks: + mgmt: + cidr: '10.0.1.0/24' +{% for vnf_num in range(num_vnfs|int) %} + uplink_{{ vnf_num }}: + cidr: '10.{{ vnf_num + 1 }}.0.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' + downlink_{{ vnf_num }}: + cidr: '10.{{ vnf_num + 1 }}.1.0/24' + gateway_ip: 'null' + port_security_enabled: False + enable_dhcp: 'false' +{% endfor %} diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index 9cd64218a..a77d9003c 100644 --- a/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index 9aff2399e..6b9ccb111 100644 --- a/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_ovs_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml index a82cece07..3606a5585 100644 --- a/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_correlated_scale_out_template.yaml @@ -17,7 +17,7 @@ schema: yardstick:task:0.1 scenarios: - type: NSPerf traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml - topology: vfw-tg-topology-scale-out-{{ num_vnfs }}.yaml + topology: vfw-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml nodes: tg__0: tg__0.yardstick tg__1: tg__1.yardstick diff --git a/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_scale_out_template.yaml index 10e8e20cd..c263a7688 100644 --- a/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_scale_out_template.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_ovs_vfw_udp_ixia_scale_out_template.yaml @@ -45,6 +45,7 @@ scenarios: rules: acl_1rule.yaml vnf_config: {lb_config: '{{flow.vnf_config.lb_config}}', lb_count: {{flow.vnf_config.lb_count}} , worker_config: '{{flow.vnf_config.worker_config}}', worker_threads: {{flow.vnf_config.worker_threads}}} {% endfor %} + ixia_profile: ../../traffic_profiles/ixia/ixia_ipv4_profile_{{num_vnfs * 2}}_port.ixncfg runner: type: Iteration iterations: 10 diff --git a/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml index bcad66691..458471a28 100644 --- a/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml b/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml index c43e2bdfb..0f1560183 100644 --- a/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_sriov_rfc2544_ipv4_1rule_1flow_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml b/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml index efa51a459..d7016964a 100644 --- a/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml +++ b/samples/vnf_samples/nsut/vfw/tc_sriov_vfw_udp_ixia_correlated_scale_out_template.yaml @@ -17,7 +17,7 @@ schema: yardstick:task:0.1 scenarios: - type: NSPerf traffic_profile: ../../traffic_profiles/ipv4_throughput-ixia-{{ num_vnfs }}.yaml - topology: vfw-tg-topology-ixia-scale-out-{{ num_vnfs }}.yaml + topology: vfw-tg-topology-ixia-correlated-scale-out-{{ num_vnfs }}.yaml nodes: tg__0: tg__0.yardstick tg__1: tg__1.yardstick diff --git a/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml new file mode 100644 index 000000000..2d950b305 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-correlated-multi-port.yaml @@ -0,0 +1,54 @@ +# 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 + - member-vnf-index: '2' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/vfw_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: 2 + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - 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: 2 + vnfd-connection-point-ref: xe{{vnf_num * 2 + 1}} + vnfd-id-ref: vnf__0 + - 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/vfw/vfw-tg-topology-ixia-multi-port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml new file mode 100644 index 000000000..6e2d360b9 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-ixia-multi-port.yaml @@ -0,0 +1,51 @@ +# 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/ixia_rfc2544_tpl.yaml + - member-vnf-index: '1' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/vfw_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: '1' + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - id: downlink_{{ vnf_num }} + name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}} + vnfd-id-ref: vnf__0 + - 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/vfw/vfw-tg-topology-multi-port.yaml b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml new file mode 100644 index 000000000..b5ad71c92 --- /dev/null +++ b/samples/vnf_samples/nsut/vfw/vfw-tg-topology-multi-port.yaml @@ -0,0 +1,51 @@ +# 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 + - member-vnf-index: '1' + vnfd-id-ref: vnf__0 + VNF model: ../../vnf_descriptors/vfw_vnf.yaml #VNF type + + vld: +{% for vnf_num in range(num_vnfs|int) %} + - id: uplink_{{ vnf_num }} + name: "tg__0 to vnf__0 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: '1' + vnfd-connection-point-ref: xe{{ vnf_num * 2}} + vnfd-id-ref: vnf__0 + - id: downlink_{{ vnf_num }} + name: "vnf__0 to tg__0 link {{ (vnf_num * 2) + 1}}" + type: ELAN + vnfd-connection-point-ref: + - member-vnf-index-ref: '1' + vnfd-connection-point-ref: xe{{ (vnf_num * 2) + 1}} + vnfd-id-ref: vnf__0 + - 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/vfw/vfw.cfg b/samples/vnf_samples/nsut/vfw/vfw.cfg index 8bab8d047..c0b11419c 100644 --- a/samples/vnf_samples/nsut/vfw/vfw.cfg +++ b/samples/vnf_samples/nsut/vfw/vfw.cfg @@ -20,8 +20,6 @@ type = ARPICMP core = 1 pktq_in = SWQ4 pktq_out = TXQ0.0 TXQ1.0 TXQ2.0 TXQ3.0 -arp_route_tbl = (c0102814,fffff000,1,c0102814) (c0106414,fffff000,0,c0106414) -nd_route_tbl = (0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414) pktq_in_prv = RXQ0.0 prv_to_pub_map = (0,1) [PIPELINE2] diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml index 1914f1a09..04668d38f 100644 --- a/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_http_ipv4_ixload.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml index 42c0de85a..4f8395b53 100644 --- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_1518B.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {1518B: 100} - public: {1518B: 100} + uplink: {1518B: 100} + downlink: {1518B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml index ffb2b41ac..271cb8978 100644 --- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml index 0d732a8de..d55540afb 100644 --- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml index b04f6aa97..a552730a5 100644 --- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_64B_trex_corelated_traffic.yaml @@ -24,8 +24,8 @@ scenarios: tg__1: trafficgen_2.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__1': 'xe0'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml index 8bdf39e38..47b9a6f2e 100644 --- a/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_baremetal_rfc2544_ipv4_1flow_IMIX.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf.yardstick options: framesize: - private: {64B: 5, 128B: 11, 256B: 16, 373B: 10, 570B: 35, 1400B: 10, 1500B: 13} - public: {64B: 5, 128B: 3, 256B: 4, 373B: 6, 570B: 8, 1400B: 36, 1500B: 38} + uplink: {64B: 5, 128B: 11, 256B: 16, 373B: 10, 570B: 35, 1400B: 10, 1500B: 13} + downlink: {64B: 5, 128B: 3, 256B: 4, 373B: 6, 570B: 8, 1400B: 36, 1500B: 38} flow: src_ip: [{'tg__0': 'xe0'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_ixia.yaml b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_ixia.yaml index b72bf9af3..5293b5270 100644 --- a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_ixia.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_ixia.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml index 37f3c1069..2382e0292 100644 --- a/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml +++ b/samples/vnf_samples/nsut/vpe/tc_ovs_rfc2544_ipv4_1rule_64B_trex.yaml @@ -23,8 +23,8 @@ scenarios: vnf__0: vnf__0.yardstick options: framesize: - private: {64B: 100} - public: {64B: 100} + uplink: {64B: 100} + downlink: {64B: 100} flow: src_ip: [{'tg__0': 'xe0'}] dst_ip: [{'tg__0': 'xe1'}] diff --git a/samples/vnf_samples/traffic_profiles/example.yaml b/samples/vnf_samples/traffic_profiles/example.yaml index 443fb88cf..7c6a8cb38 100644 --- a/samples/vnf_samples/traffic_profiles/example.yaml +++ b/samples/vnf_samples/traffic_profiles/example.yaml @@ -24,7 +24,7 @@ traffic_profile: flow_number: {{ flow.number }} #This decides how many frames should be generated. Each frame should have a random of the field # that specifies a range (e.g. ipv4 address, port) -private: +uplink: - ipv4_1: outer_l2: framesize: @@ -139,7 +139,7 @@ private: srcport: {{ get(flow.inner_srcport, "3002") }} dstport: {{ get(flow.inner_dstport, "3001") }} -public: +downlink: - ipv4_2: outer_l2: framesize: diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-10.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-10.yaml new file mode 100644 index 000000000..f862abdb7 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-10.yaml @@ -0,0 +1,558 @@ +# 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) + + +uplink_0: + ipv4: + id: 1 + 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_0', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_0: + ipv4: + id: 2 + 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_0', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + ipv4: + id: 3 + 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_1', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + ipv4: + id: 4 + 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_1', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_2: + ipv4: + id: 5 + 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_2', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_2', '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_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_2', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_2: + ipv4: + id: 6 + 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_2', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_2', '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_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_2', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_3: + ipv4: + id: 7 + 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_3', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_3', '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_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_3', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_3: + ipv4: + id: 8 + 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_3', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_3', '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_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_3', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_4: + ipv4: + id: 9 + 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_4', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_4', '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_4', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_4', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_4: + ipv4: + id: 10 + 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_4', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_4', '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_4', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_4', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_5: + ipv4: + id: 11 + 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_5', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_5', '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_5', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_5', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_5: + ipv4: + id: 12 + 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_5', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_5', '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_5', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_5', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_6: + ipv4: + id: 13 + 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_6', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_6', '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_6', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_6', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_6: + ipv4: + id: 14 + 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_6', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_6', '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_6', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_6', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_7: + ipv4: + id: 15 + 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_7', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_7', '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_7', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_7', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_7: + ipv4: + id: 16 + 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_7', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_7', '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_7', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_7', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_8: + ipv4: + id: 17 + 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_8', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_8', '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_8', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_8', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_8: + ipv4: + id: 18 + 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_8', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_8', '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_8', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_8', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_9: + ipv4: + id: 19 + 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_9', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_9', '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_9', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_9', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_9: + ipv4: + id: 20 + 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_9', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_9', '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_9', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_9', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-2.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-2.yaml new file mode 100644 index 000000000..328e76fb6 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-2.yaml @@ -0,0 +1,150 @@ +# 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) + + +uplink_0: + ipv4: + id: 1 + 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_0', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_0: + ipv4: + id: 2 + 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_0', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + ipv4: + id: 3 + 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_1', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + ipv4: + id: 4 + 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_1', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-4.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-4.yaml new file mode 100644 index 000000000..c03b28d60 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-4.yaml @@ -0,0 +1,252 @@ +# 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) + + +uplink_0: + ipv4: + id: 1 + 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_0', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_0: + ipv4: + id: 2 + 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_0', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + ipv4: + id: 3 + 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_1', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + ipv4: + id: 4 + 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_1', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_2: + ipv4: + id: 5 + 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_2', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_2', '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_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_2', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_2: + ipv4: + id: 6 + 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_2', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_2', '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_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_2', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_3: + ipv4: + id: 7 + 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_3', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_3', '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_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_3', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_3: + ipv4: + id: 8 + 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_3', '90.90.1.1-90.90.255.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_3', '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_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_3', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" 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 index 215433b54..75927d40d 100644 --- a/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-cgnapt-scale-out.yaml @@ -50,6 +50,7 @@ traffic_profile: [% for vnf_num in range(num_vnfs|int) %] uplink_[[ vnf_num ]]: ipv4: + id: [[vnf_num * 2 + 1]] outer_l2: framesize: 64B: "{{ get(imix, 'imix.uplink.64B', '0') }}" @@ -74,6 +75,7 @@ uplink_[[ vnf_num ]]: count: "{{get(flow, 'flow.count', '1') }}" downlink_[[ vnf_num ]]: ipv4: + id: [[vnf_num * 2 + 2]] outer_l2: framesize: 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml new file mode 100644 index 000000000..500163205 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-ixia-correlated-scale-out.yaml @@ -0,0 +1,76 @@ +#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: IXIARFC2544Profile # 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: + id: [[vnf_num + 1]] + 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') }}" +[% 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 index 821c3c830..73c41099f 100644 --- a/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput-scale-out.yaml @@ -50,6 +50,7 @@ traffic_profile: [% for vnf_num in range(num_vnfs|int) %] uplink_[[ vnf_num ]]: ipv4: + id: [[vnf_num * 2 + 1]] outer_l2: framesize: 64B: "{{ get(imix, 'imix.uplink.64B', '0') }}" @@ -74,6 +75,7 @@ uplink_[[ vnf_num ]]: count: "{{get(flow, 'flow.count', '1') }}" downlink_[[ vnf_num ]]: ipv4: + id: [[vnf_num * 2 + 2]] outer_l2: framesize: 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}" @@ -85,6 +87,7 @@ downlink_[[ vnf_num ]]: 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') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml index 7d51122f4..4e72fde1a 100644 --- a/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput.yaml @@ -47,6 +47,7 @@ traffic_profile: uplink_0: ipv4: + id: 1 outer_l2: framesize: 64B: "{{get(imix, 'imix.uplink.64B', '0') }}" @@ -72,6 +73,7 @@ uplink_0: count: "{{get(flow, 'flow.count', '1') }}" downlink_0: ipv4: + id: 2 outer_l2: framesize: 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}" @@ -95,3 +97,55 @@ downlink_0: srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}" dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + ipv4: + id: 3 + 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_1', '10.0.2.1-10.0.2.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '10.0.3.1-10.0.3.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.src_port_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + ipv4: + id: 4 + 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_1', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.src_ip_1', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-10.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-10.yaml new file mode 100644 index 000000000..80d0872d5 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-10.yaml @@ -0,0 +1,538 @@ +# 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) + + +uplink_0: + 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_0', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_0: + 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_0', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_0', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + 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_1', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + 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_1', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_1', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_2: + 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_2', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_2', '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_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_2', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_2: + 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_2', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_2', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_2', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_3: + 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_3', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_3', '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_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_3', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_3: + 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_3', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_3', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_3', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_4: + 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_4', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_4', '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_4', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_4', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_4: + 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_4', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_4', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_4', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_4', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_5: + 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_5', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_5', '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_5', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_5', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_5: + 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_5', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_5', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_5', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_5', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_6: + 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_6', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_6', '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_6', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_6', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_6: + 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_6', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_6', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_6', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_6', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_7: + 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_7', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_7', '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_7', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_7', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_7: + 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_7', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_7', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_7', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_7', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_8: + 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_8', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_8', '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_8', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_8', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_8: + 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_8', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_8', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_8', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_8', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_9: + 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_9', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_9', '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_9', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_9', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_9: + 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_9', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_9', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_9', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_9', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-2.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-2.yaml new file mode 100644 index 000000000..d6c9164a0 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-2.yaml @@ -0,0 +1,146 @@ +# 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) + + +uplink_0: + 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_0', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_0: + 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_0', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_0', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + 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_1', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + 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_1', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_1', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-4.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-4.yaml new file mode 100644 index 000000000..55610b048 --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-4.yaml @@ -0,0 +1,244 @@ +# 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) + + +uplink_0: + 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_0', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_0', '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_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_0', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_0: + 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_0', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_0', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_1: + 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_1', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_1', '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_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_1', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_1: + 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_1', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_1', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_1', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_1', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_2: + 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_2', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_2', '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_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_2', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_2: + 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_2', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_2', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_2', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_2', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +uplink_3: + 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_3', '1.1.1.1-1.1.255.255') }}" + dstip4: "{{get(flow, 'flow.dst_ip_3', '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_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.dst_port_3', '2001') }}" + count: "{{get(flow, 'flow.count', '1') }}" +downlink_3: + 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_3', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_3', '10.0.2.1-10.0.2.255') }}" + count: "{{get(flow, 'flow.count', '1') }}" + ttl: 32 + dscp: 0 + outer_l4: + srcport: "{{get(flow, 'flow.dst_port_3', '1234-4321') }}" + dstport: "{{get(flow, 'flow.src_port_3', '2001-4001') }}" + count: "{{get(flow, 'flow.count', '1') }}" 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 index 000000000..d455bccea --- /dev/null +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt-scale-out.yaml @@ -0,0 +1,100 @@ +#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') }}" + 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 ]]', '10.0.3.1-10.0.3.255') }}" + dstip4: "{{get(flow, 'flow.downlink_[[ vnf_num ]]', '10.0.2.1-10.0.2.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_cgnapt.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml index 60a78a0c6..61cbd4e4e 100644 --- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_cgnapt.yaml @@ -47,6 +47,7 @@ traffic_profile: uplink_0: ipv4: + id: 1 outer_l2: framesize: 64B: "{{get(imix, 'imix.uplink.64B', '0') }}" @@ -72,6 +73,7 @@ uplink_0: count: "{{get(flow, 'flow.count', '1') }}" downlink_0: ipv4: + id: 2 outer_l2: framesize: 64B: "{{ get(imix, 'imix.downlink.64B', '0') }}" @@ -92,6 +94,6 @@ downlink_0: ttl: 32 dscp: 0 outer_l4: - srcport: "{{get(flow, 'flow.dst_port_0', '1234-4321') }}" - dstport: "{{get(flow, 'flow.src_port_0', '2001-4001') }}" + srcport: "{{get(flow, 'flow.dst_port_0', '1-65535') }}" + dstport: "{{get(flow, 'flow.src_port_0', '1-65535') }}" count: "{{get(flow, 'flow.count', '1') }}" diff --git a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml index 8bac32404..20bc6568d 100644 --- a/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml +++ b/samples/vnf_samples/traffic_profiles/ipv4_throughput_vpe.yaml @@ -47,6 +47,7 @@ traffic_profile: uplink_0: ipv4: + id: 1 outer_l2: framesize: 64B: "{{ get(imix, 'imix.uplink.64B', '0') }}" @@ -83,6 +84,7 @@ uplink_0: count: "{{get(flow, 'flow.count', '1') }}" downlink_0: ipv4: + id: 2 outer_l2: framesize: 64B: "{{ get(imix, 'imix.uplink.imix_small', '0') }}" diff --git a/samples/vnf_samples/traffic_profiles/prox_lb.yaml b/samples/vnf_samples/traffic_profiles/prox_lb.yaml index 1461bc399..85675ba9f 100644 --- a/samples/vnf_samples/traffic_profiles/prox_lb.yaml +++ b/samples/vnf_samples/traffic_profiles/prox_lb.yaml @@ -19,7 +19,7 @@ description: Load Balancer 1-to-4 port traffic_profile: traffic_type: ProxBinSearchProfile - tolerated_loss: 80.0 + tolerated_loss: 0.001 test_precision: 0.01 packet_sizes: [64] duration: 5 diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index f3e7a49e3..d1174825f 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -209,10 +209,10 @@ EOF - local scenario_status="SUCCESS" + local scenario_status="PASS" if [ $failed -gt 0 ]; then - scenario_status="FAILED" + scenario_status="FAIL" fi report "${scenario_status}" "${start_date}" "${stop_date}" diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml index 81b42dc4d..fe244e81c 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc006.yaml @@ -13,7 +13,8 @@ description: > Yardstick TC006 config file; Measure volume storage IOPS, throughput and latency using fio with job file. -{% set directory = directory or "/FIO_Test" %} +{% set job_file_config = job_file_config or '["[random-writers]", ioengine=libaio, rw=randwrite, size=128m, bs=32k, direct=0, size=64m, numjobs=4]' %} +{% set directory = directory or '/FIO_Test' %} {% set volume_size = volume_size or 200 %} {% set provider = provider or none %} {% set physical_network = physical_network or 'physnet1' %} @@ -25,7 +26,10 @@ scenarios: - type: Fio options: - job_file: "job_file.ini" + # input the content of a fio job file directly + job_file_config: {{ job_file_config }} + # or input the job file name + #job_file: "job_file.ini" directory: {{ directory }} host: fio.yardstick-TC006 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml index b2077d59e..ee36c6c82 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc011.yaml @@ -13,7 +13,7 @@ description: > Yardstick TC011 config file; Measure packet delay variation (jitter) using iperf3. -{% set udp = udp or "udp" %} +{% set protocol = protocol or "udp" %} {% set bandwidth = bandwidth or "20m" %} {% set length = length or "8K" %} {% set window = window or 29200 %} @@ -25,7 +25,7 @@ scenarios: - type: Iperf3 options: - udp: {{udp}} + protocol: {{protocol}} bandwidth: {{bandwidth}} length: {{length}} window: {{window}} diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml index 046d51731..852424d8e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml @@ -13,6 +13,7 @@ description: > Sample test case for the HA of controller node Openstack service. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -21,7 +22,7 @@ scenarios: attackers: - fault_type: "kill-process" process_name: "nova-api" - host: node1 + host: {{attack_host}} wait_time: 10 monitors: @@ -33,14 +34,14 @@ scenarios: max_outage_time: 5 - monitor_type: "process" process_name: "nova-api" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: max_recover_time: 30 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml index b14fc4554..ea4fc3b24 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml @@ -13,16 +13,16 @@ description: > Yardstick TC043 config file; Measure latency between NFVI nodes using ping. -{% set host = host or "node1.LF" %} -{% set target = target or "node2.LF" %} +{% set host = host or "node1" %} +{% set target = target or "node2" %} {% set file = file or '/etc/yardstick/pod.yaml' %} scenarios: - type: Ping options: packetsize: 100 - host: {{host}} - target: {{target}} + host: {{host}}.LF + target: {{target}}.LF runner: type: Duration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml index dfe44ed12..f9d9dde48 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml @@ -13,6 +13,7 @@ description: > Test case for TC045 :Control node Openstack service down - neutron server. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -21,7 +22,7 @@ scenarios: attackers: - fault_type: "kill-process" process_name: "neutron-server" - host: node1 + host: {{attack_host}} monitors: - monitor_type: "openstack-cmd" @@ -32,14 +33,14 @@ scenarios: max_outage_time: 5 - monitor_type: "process" process_name: "neutron-server" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: max_recover_time: 30 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml index 1d553268c..129489968 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml @@ -13,6 +13,7 @@ description: > Test case for TC046 :Control node Openstack service down - keystone. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -21,7 +22,7 @@ scenarios: attackers: - fault_type: "kill-process" process_name: "keystone" - host: node1 + host: {{attack_host}} monitors: - monitor_type: "openstack-cmd" @@ -32,14 +33,14 @@ scenarios: max_outage_time: 5 - monitor_type: "process" process_name: "keystone" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: max_recover_time: 30 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml index 33bc5cd5f..4a0b65b8d 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml @@ -13,6 +13,7 @@ description: > Test case for TC047 :Control node Openstack service down - glance api. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -21,7 +22,7 @@ scenarios: attackers: - fault_type: "kill-process" process_name: "glance-api" - host: node1 + host: {{attack_host}} monitors: - monitor_type: "openstack-cmd" @@ -32,14 +33,14 @@ scenarios: max_outage_time: 5 - monitor_type: "process" process_name: "glance-api" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: max_recover_time: 30 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml index a13afe3bf..a1629c6d0 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml @@ -13,6 +13,7 @@ description: > Test case for TC048 :Control node Openstack service down - cinder api. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -21,7 +22,7 @@ scenarios: attackers: - fault_type: "kill-process" process_name: "cinder-api" - host: node1 + host: {{attack_host}} monitors: - monitor_type: "openstack-cmd" @@ -32,14 +33,14 @@ scenarios: max_outage_time: 5 - monitor_type: "process" process_name: "cinder-api" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: max_recover_time: 30 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml index 394b98721..7b8383e4e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml @@ -13,6 +13,7 @@ description: > Test case for TC049 :Control node Openstack service down - swift proxy. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -21,7 +22,7 @@ scenarios: attackers: - fault_type: "kill-process" process_name: "swift-proxy" - host: node1 + host: {{attack_host}} monitors: - monitor_type: "openstack-cmd" @@ -32,14 +33,14 @@ scenarios: max_outage_time: 5 - monitor_type: "process" process_name: "swift-proxy" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: max_recover_time: 30 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml index 303dd4216..b765feb68 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml @@ -14,6 +14,7 @@ description: > This test case is written by new scenario-based HA testing framework. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} {% set external_net = external_net or 'br-ex' %} {% set management_net = management_net or 'br-mgmt' %} {% set storage_net = storage_net or 'br-storage' %} @@ -26,7 +27,7 @@ scenarios: attackers: - fault_type: "general-attacker" - host: node1 + host: {{attack_host}} key: "close-br-public" attack_key: "close-interface" action_parameter: @@ -36,7 +37,7 @@ scenarios: - fault_type: "general-attacker" - host: node1 + host: {{attack_host}} key: "close-br-mgmt" attack_key: "close-interface" action_parameter: @@ -46,7 +47,7 @@ scenarios: - fault_type: "general-attacker" - host: node1 + host: {{attack_host}} key: "close-br-storage" attack_key: "close-interface" action_parameter: @@ -56,7 +57,7 @@ scenarios: - fault_type: "general-attacker" - host: node1 + host: {{attack_host}} key: "close-br-private" attack_key: "close-interface" action_parameter: @@ -145,7 +146,7 @@ scenarios: nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration duration: 1 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml index 98a08b7ca..aade1aed2 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml @@ -14,6 +14,7 @@ description: > This test case is written by new scenario-based HA testing framework. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -22,7 +23,7 @@ scenarios: attackers: - fault_type: "general-attacker" - host: node1 + host: {{attack_host}} key: "stress-cpu" attack_key: "stress-cpu" @@ -92,7 +93,7 @@ scenarios: nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration duration: 1 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml index 75835ebf5..62cabd1a2 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml @@ -14,6 +14,7 @@ description: > This test case is written by new scenario-based HA testing framework. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -22,7 +23,7 @@ scenarios: attackers: - fault_type: "general-attacker" - host: node1 + host: {{attack_host}} key: "block-io" attack_key: "block-io" @@ -76,7 +77,7 @@ scenarios: index: 4 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration duration: 1 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml index f987e2b45..64c67c0b3 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml @@ -14,6 +14,7 @@ description: > This test case is written by new scenario-based HA testing framework. {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set attack_host = attack_host or "node1" %} scenarios: - @@ -22,7 +23,7 @@ scenarios: attackers: - fault_type: "kill-process" - host: node1 + host: {{attack_host}} key: "kill-process" process_name: "haproxy" @@ -31,7 +32,7 @@ scenarios: monitor_type: "process" key: "service-status" process_name: "haproxy" - host: node1 + host: {{attack_host}} monitor_time: 30 monitor_number: 3 sla: @@ -61,7 +62,7 @@ scenarios: index: 3 nodes: - node1: node1.LF + {{attack_host}}: {{attack_host}}.LF runner: type: Duration duration: 1 diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml index 10a7a7108..8905b9cdd 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml @@ -19,14 +19,14 @@ description: > cache size per CPU, total cache size; HT (Hyper-Thread) support status, 1 for open, 0 for close. -{% set host = host or "node5.yardstick-TC055" %} {% set file = file or '/etc/yardstick/pod.yaml' %} +{% set host = host or "node5" %} scenarios: - type: ComputeCapacity nodes: - host: {{host}} + host: {{host}}.yardstick-TC055 runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml index 254c214d2..50d0c40e1 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml @@ -14,7 +14,7 @@ description: > Measure disk size, block size and disk utilization using fdisk and iostat. {% set file = file or '/etc/yardstick/pod.yaml' %} -{% set node = node or "node5" %} +{% set host = host or "node5" %} scenarios: - @@ -22,7 +22,7 @@ scenarios: options: test_type: "disk_size" - host: {{node}}.yardstick-TC063 + host: {{host}}.yardstick-TC063 runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml index fb40257f3..54282cbb1 100755 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml @@ -18,8 +18,8 @@ description: > In req/rsp test, TCP_RR TCP_CRR UDP_RR can be used; req_rsp_size is option of req/rsp test; -{% set host = host or "node1.LF" %} -{% set target = target or "node2.LF" %} +{% set host = host or "node1" %} +{% set target = target or "node2" %} {% set file = file or '/etc/yardstick/pod.yaml' %} scenarios: - @@ -29,8 +29,8 @@ scenarios: send_msg_size: 1024 duration: 20 - host: {{host}} - target: {{target}} + host: {{host}}.LF + target: {{target}}.LF runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml index d19b3c4e7..4954249b3 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml @@ -14,13 +14,13 @@ description: > Measure network capacity and scale. Measure number of connections, number of frames received; -{% set host = host or "node1.LF" %} +{% set host = host or "node1" %} {% set file = file or '/etc/yardstick/pod.yaml' %} scenarios: - type: NetworkCapacity - host: {{host}} + host: {{host}}.LF runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml index 94256125f..d20045b25 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml @@ -14,6 +14,7 @@ description: > Measure CPU performance using SPEC CPU2006; {% set file = file or "/etc/yardstick/pod.yaml" %} +{% set host = host or 'node1' %} scenarios: - @@ -26,7 +27,7 @@ scenarios: runspec_size: ref runspec_rate: 1 - host: node1.yardstick-TC078 + host: {{host}}.yardstick-TC078 runner: type: Iteration diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml index 503fe6a45..0da296297 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml @@ -8,10 +8,11 @@ ############################################################################## --- -# Sample benchmark task config file -# measure network latency using ping in container schema: "yardstick:task:0.1" +description: > + Yardstick TC080 config file; + measure network latency between containers in k8s using ping; scenarios: - diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml index d99757e47..0d79a41ed 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml @@ -8,10 +8,12 @@ ############################################################################## --- -# Sample benchmark task config file -# measure network latency using ping betwwen container and VM schema: "yardstick:task:0.1" +description: > + Yardstick TC081 config file; + measure network latency between container and VM using ping; + scenarios: - diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml new file mode 100644 index 000000000..d1b4cce1a --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-openbaton-ha_daily.yaml @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-nosdn-openbaton-ha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-openbaton-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc055.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC055"}' +- + file_name: opnfv_yardstick_tc063.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC063"}' +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml +- + file_name: opnfv_yardstick_tc075.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node1.LF"}' diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml new file mode 100644 index 000000000..10772e0cc --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-ha_daily.yaml @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-nosdn-ovs_dpdk-ha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-ovs_dpdk-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc055.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC055"}' +- + file_name: opnfv_yardstick_tc063.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC063"}' +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml +- + file_name: opnfv_yardstick_tc075.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node1.LF"}' diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml new file mode 100644 index 000000000..9b2be3710 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs_dpdk-noha_daily.yaml @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-nosdn-ovs_dpdk-noha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-ovs_dpdk-noha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc055.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC055"}' +- + file_name: opnfv_yardstick_tc063.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC063"}' +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml +- + file_name: opnfv_yardstick_tc075.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node1.LF"}' diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml new file mode 100644 index 000000000..cff147720 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-noha_daily.yaml @@ -0,0 +1,62 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +# os-odl_l2-moon-noha daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-odl_l2-moon-noha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc002.yaml +- + file_name: opnfv_yardstick_tc005.yaml +- + file_name: opnfv_yardstick_tc010.yaml +- + file_name: opnfv_yardstick_tc011.yaml +- + file_name: opnfv_yardstick_tc012.yaml +- + file_name: opnfv_yardstick_tc014.yaml +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc055.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC055"}' +- + file_name: opnfv_yardstick_tc063.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node5.yardstick-TC063"}' +- + file_name: opnfv_yardstick_tc069.yaml +- + file_name: opnfv_yardstick_tc070.yaml +- + file_name: opnfv_yardstick_tc071.yaml +- + file_name: opnfv_yardstick_tc072.yaml +- + file_name: opnfv_yardstick_tc075.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml", + "host": "node1.LF"}' diff --git a/tests/unit/benchmark/contexts/standalone/test_model.py b/tests/unit/benchmark/contexts/standalone/test_model.py index ddbc1a4bb..6899a0af6 100644 --- a/tests/unit/benchmark/contexts/standalone/test_model.py +++ b/tests/unit/benchmark/contexts/standalone/test_model.py @@ -91,10 +91,12 @@ class ModelLibvirtTestCase(unittest.TestCase): image = Libvirt.create_snapshot_qemu(ssh_mock, "0", "ubuntu.img") self.assertEqual(image, result) + @mock.patch("yardstick.benchmark.contexts.standalone.model.Libvirt.pin_vcpu_for_perf") @mock.patch("yardstick.benchmark.contexts.standalone.model.Libvirt.create_snapshot_qemu") @mock.patch('yardstick.benchmark.contexts.standalone.model.open') @mock.patch('yardstick.benchmark.contexts.standalone.model.write_file') - def test_build_vm_xml(self, mock_open, mock_write_file, mock_create_snapshot_qemu): + def test_build_vm_xml(self, mock_open, mock_write_file, mock_create_snapshot_qemu, + mock_pin_vcpu_for_perf): result = [4] with mock.patch("yardstick.ssh.SSH") as ssh: ssh_mock = mock.Mock(autospec=ssh.SSH) @@ -102,17 +104,10 @@ class ModelLibvirtTestCase(unittest.TestCase): mock.Mock(return_value=(0, "a", "")) ssh.return_value = ssh_mock mock_create_snapshot_qemu.return_value = "0.img" + status = Libvirt.build_vm_xml(ssh_mock, {}, "test", "vm_0", 0) self.assertEqual(status[0], result[0]) - def test_split_cpu_list(self): - result = Libvirt.split_cpu_list("1,2,3") - self.assertEqual(result, [1, 2, 3]) - - def test_get_numa_nodes(self): - result = Libvirt.get_numa_nodes() - self.assertIsNotNone(result) - def test_update_interrupts_hugepages_perf(self): with mock.patch("yardstick.ssh.SSH") as ssh: ssh_mock = mock.Mock(autospec=ssh.SSH) @@ -122,17 +117,16 @@ class ModelLibvirtTestCase(unittest.TestCase): status = Libvirt.update_interrupts_hugepages_perf(ssh_mock) self.assertIsNone(status) - @mock.patch("yardstick.benchmark.contexts.standalone.model.Libvirt.get_numa_nodes") + @mock.patch("yardstick.benchmark.contexts.standalone.model.CpuSysCores") @mock.patch("yardstick.benchmark.contexts.standalone.model.Libvirt.update_interrupts_hugepages_perf") - def test_pin_vcpu_for_perf(self, mock_update_interrupts_hugepages_perf, mock_get_numa_nodes): + def test_pin_vcpu_for_perf(self, mock_update_interrupts_hugepages_perf, mock_CpuSysCores): with mock.patch("yardstick.ssh.SSH") as ssh: ssh_mock = mock.Mock(autospec=ssh.SSH) ssh_mock.execute = \ mock.Mock(return_value=(0, "a", "")) ssh.return_value = ssh_mock - mock_get_numa_nodes.return_value = {'1': [18, 19, 20, 21], '0': [0, 1, 2, 3]} status = Libvirt.pin_vcpu_for_perf(ssh_mock, "vm_0", 4) - self.assertIsNone(status) + self.assertIsNotNone(status) class StandaloneContextHelperTestCase(unittest.TestCase): diff --git a/tests/unit/benchmark/scenarios/networking/test_iperf3.py b/tests/unit/benchmark/scenarios/networking/test_iperf3.py index 331245357..4d3745230 100644 --- a/tests/unit/benchmark/scenarios/networking/test_iperf3.py +++ b/tests/unit/benchmark/scenarios/networking/test_iperf3.py @@ -123,7 +123,7 @@ class IperfTestCase(unittest.TestCase): self.assertRaises(AssertionError, p.run, result) def test_iperf_successful_sla_jitter(self, mock_ssh): - options = {"udp": "udp", "bandwidth": "20m"} + options = {"protocol": "udp", "bandwidth": "20m"} args = { 'options': options, 'sla': {'jitter': 10} @@ -141,7 +141,7 @@ class IperfTestCase(unittest.TestCase): self.assertEqual(result, expected_result) def test_iperf_unsuccessful_sla_jitter(self, mock_ssh): - options = {"udp": "udp", "bandwidth": "20m"} + options = {"protocol": "udp", "bandwidth": "20m"} args = { 'options': options, 'sla': {'jitter': 0.0001} @@ -156,6 +156,24 @@ class IperfTestCase(unittest.TestCase): mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') self.assertRaises(AssertionError, p.run, result) + def test_iperf_successful_tcp_protocal(self, mock_ssh): + options = {"protocol": "tcp", "nodelay": "yes"} + args = { + 'options': options, + 'sla': {'bytes_per_second': 15000000} + } + result = {} + + p = iperf3.Iperf(args, self.ctx) + mock_ssh.SSH.from_node().execute.return_value = (0, '', '') + p.host = mock_ssh.SSH.from_node() + + sample_output = self._read_sample_output(self.output_name_tcp) + mock_ssh.SSH.from_node().execute.return_value = (0, sample_output, '') + expected_result = utils.flatten_dict_key(jsonutils.loads(sample_output)) + p.run(result) + self.assertEqual(result, expected_result) + def test_iperf_unsuccessful_script_error(self, mock_ssh): options = {} diff --git a/tests/unit/network_services/vnf_generic/vnf/test_iniparser.py b/tests/unit/network_services/helpers/test_iniparser.py index 1ad8df9c6..bd27b497e 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_iniparser.py +++ b/tests/unit/network_services/helpers/test_iniparser.py @@ -27,10 +27,10 @@ stl_patch = mock.patch.dict("sys.modules", STL_MOCKS) stl_patch.start() if stl_patch: - from yardstick.network_services.vnf_generic.vnf.iniparser import ParseError - from yardstick.network_services.vnf_generic.vnf.iniparser import LineParser - from yardstick.network_services.vnf_generic.vnf.iniparser import BaseParser - from yardstick.network_services.vnf_generic.vnf.iniparser import ConfigParser + from yardstick.network_services.helpers.iniparser import ParseError + from yardstick.network_services.helpers.iniparser import LineParser + from yardstick.network_services.helpers.iniparser import BaseParser + from yardstick.network_services.helpers.iniparser import ConfigParser PARSE_TEXT_1 = """\ @@ -141,7 +141,7 @@ class TestConfigParser(unittest.TestCase): return internal_open - @mock.patch('yardstick.network_services.vnf_generic.vnf.iniparser.open') + @mock.patch('yardstick.network_services.helpers.iniparser.open') def test_parse(self, mock_open): mock_open.side_effect = self.make_open(PARSE_TEXT_1) @@ -182,7 +182,7 @@ class TestConfigParser(unittest.TestCase): self.assertEqual(config_parser.find_section_index('section1'), 1) self.assertEqual(config_parser.find_section_index('section3'), -1) - @mock.patch('yardstick.network_services.vnf_generic.vnf.iniparser.open') + @mock.patch('yardstick.network_services.helpers.iniparser.open') def test_parse_2(self, mock_open): mock_open.side_effect = self.make_open(PARSE_TEXT_2) @@ -200,7 +200,7 @@ class TestConfigParser(unittest.TestCase): self.assertEqual(config_parser.sections, expected) - @mock.patch('yardstick.network_services.vnf_generic.vnf.iniparser.open') + @mock.patch('yardstick.network_services.helpers.iniparser.open') def test_parse_negative(self, mock_open): bad_text_dict = { 'no section': PARSE_TEXT_BAD_1, diff --git a/tests/unit/network_services/helpers/test_samplevnf_helper.py b/tests/unit/network_services/helpers/test_samplevnf_helper.py index 0ac363f28..05acdfaa9 100644 --- a/tests/unit/network_services/helpers/test_samplevnf_helper.py +++ b/tests/unit/network_services/helpers/test_samplevnf_helper.py @@ -211,6 +211,7 @@ class TestMultiPortConfig(unittest.TestCase): opnfv_vnf.generate_script_data = \ mock.Mock(return_value={'link_config': 0, 'arp_config': '', 'arp_config6': '', 'actions': '', + 'arp_route_tbl': '', 'arp_route_tbl6': '', 'rules': ''}) opnfv_vnf.port_pair_list = [("xe0", "xe1")] self.assertIsNotNone(opnfv_vnf.generate_script(self.VNFD)) @@ -796,7 +797,7 @@ class TestMultiPortConfig(unittest.TestCase): def test_generate_arp_route_tbl(self, *_): topology_file = mock.Mock() config_tpl = mock.Mock() - tmp_file = mock.Mock() + tmp_file = "" vnfd_mock = mock.MagicMock() vnfd_mock.port_num.side_effect = ['32', '1', '987'] vnfd_mock.find_interface.side_effect = [ @@ -823,8 +824,9 @@ class TestMultiPortConfig(unittest.TestCase): opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock) opnfv_vnf.all_ports = [3, 2, 5] - expected = '(0a141000,fffff000,32,0a141e28) (0ac81e00,ffffff00,1,0ac81e28) ' \ - '(0a000000,ff000000,987,0a140328)' + expected = 'routeadd net 32 10.20.30.40 0xfffff000\n' \ + 'routeadd net 1 10.200.30.40 0xffffff00\n' \ + 'routeadd net 987 10.20.3.40 0xff000000' result = opnfv_vnf.generate_arp_route_tbl() self.assertEqual(result, expected) diff --git a/tests/unit/network_services/nfvi/test_resource.py b/tests/unit/network_services/nfvi/test_resource.py index 799cc202b..f3244fdbd 100644 --- a/tests/unit/network_services/nfvi/test_resource.py +++ b/tests/unit/network_services/nfvi/test_resource.py @@ -134,6 +134,14 @@ class TestResourceProfile(unittest.TestCase): self.assertIsNone( self.resource_profile._prepare_collectd_conf("/opt/nsb_bin")) + def test__setup_intel_pmu(self): + self.assertIsNone( + self.resource_profile._setup_intel_pmu(self.ssh_mock, "/opt/nsb_bin")) + + def test__setup_ovs_stats(self): + self.assertIsNone( + self.resource_profile._setup_ovs_stats(self.ssh_mock)) + @mock.patch("yardstick.network_services.nfvi.resource.open") @mock.patch("yardstick.network_services.nfvi.resource.os") def test__provide_config_file(self, mock_open, mock_os): @@ -187,7 +195,6 @@ class TestResourceProfile(unittest.TestCase): res = self.resource_profile.parse_collectd_result({}) expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {}, 'memory': {}, 'ovs_stats': {}, 'timestamp': '', - 'intel_pmu': {}, 'virt': {}} self.assertDictEqual(res, expected_result) @@ -200,7 +207,6 @@ class TestResourceProfile(unittest.TestCase): res = self.resource_profile.parse_collectd_result(metric) expected_result = {'cpu': {1: {'ipc': '1234'}}, 'dpdkstat': {}, 'hugepages': {}, 'memory': {}, 'ovs_stats': {}, 'timestamp': '', - 'intel_pmu': {}, 'virt': {}} self.assertDictEqual(res, expected_result) @@ -209,7 +215,6 @@ class TestResourceProfile(unittest.TestCase): res = self.resource_profile.parse_collectd_result(metric) expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {}, 'memory': {'bw': '101'}, 'ovs_stats': {}, 'timestamp': '', - 'intel_pmu': {}, 'virt': {}} self.assertDictEqual(res, expected_result) @@ -220,7 +225,6 @@ class TestResourceProfile(unittest.TestCase): res = self.resource_profile.parse_collectd_result(metric) expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {'free': '101'}, 'memory': {}, 'ovs_stats': {}, 'timestamp': '', - 'intel_pmu': {}, 'virt': {}} self.assertDictEqual(res, expected_result) @@ -237,7 +241,6 @@ class TestResourceProfile(unittest.TestCase): res = self.resource_profile.parse_collectd_result(metric) expected_result = {'cpu': {}, 'dpdkstat': {'tx': '101'}, 'hugepages': {}, 'memory': {}, 'ovs_stats': {'tx': '101'}, 'timestamp': '', - 'intel_pmu': {}, 'virt': {'memory': '101'}} self.assertDictEqual(res, expected_result) diff --git a/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py index b0ef1da91..832509ea7 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_cgnapt_vnf.py @@ -72,13 +72,12 @@ link 1 up self.assertNotIn("This is a header", out) def test__get_cgnapt_config(self): - vnfd_helper = mock.Mock() + vnfd_helper = mock.MagicMock() vnfd_helper.port_pairs.uplink_ports = [{"name": 'a'}, {"name": "b"}, {"name": "c"}] helper = CgnaptApproxSetupEnvHelper(vnfd_helper, mock.Mock(), mock.Mock()) - helper._get_ports_gateway = mock.Mock(side_effect=[3, 5, 2]) - result = helper._get_cgnapt_config([{"name": 'a'}, {}, {"name": "b"}, {}, {"name": "c"}]) - self.assertEqual(result, [3, 5, 2]) + result = helper._get_cgnapt_config() + self.assertIsNotNone(result) def test_scale(self): helper = CgnaptApproxSetupEnvHelper(mock.Mock(), mock.Mock(), mock.Mock()) diff --git a/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py index 09060ff57..a6d40877d 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_prox_vnf.py @@ -376,7 +376,7 @@ class TestProxApproxVnf(unittest.TestCase): return file_path @mock.patch('yardstick.benchmark.scenarios.networking.vnf_generic.open', create=True) - @mock.patch('yardstick.network_services.vnf_generic.vnf.iniparser.open', create=True) + @mock.patch('yardstick.network_services.helpers.iniparser.open', create=True) @mock.patch(SSH_HELPER) def test_run_prox(self, ssh, *_): mock_ssh(ssh) diff --git a/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py b/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py index 1e6bc1a13..6c102ed59 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py @@ -360,15 +360,6 @@ class TestSetupEnvHelper(unittest.TestCase): with self.assertRaises(NotImplementedError): setup_env_helper.build_config() - def test__get_ports_gateway(self): - vnfd_helper = VnfdHelper(self.VNFD_0) - setup_env_helper = SetupEnvHelper(vnfd_helper, mock.Mock(), mock.Mock()) - result = setup_env_helper._get_ports_gateway("xe0") - self.assertEqual(result, "152.16.100.20") - - result = setup_env_helper._get_ports_gateway("xe123") - self.assertIsNone(result) - def test_setup_vnf_environment(self): setup_env_helper = SetupEnvHelper(mock.Mock(), mock.Mock(), mock.Mock()) self.assertIsNone(setup_env_helper.setup_vnf_environment()) @@ -1886,6 +1877,7 @@ class TestSampleVnf(unittest.TestCase): vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0] sample_vnf = SampleVNF('vnf1', vnfd) sample_vnf.APP_NAME = 'sample1' + sample_vnf.WAIT_TIME_FOR_SCRIPT = 0 sample_vnf._start_server = mock.Mock(return_value=0) sample_vnf._vnf_process = mock.MagicMock() sample_vnf._vnf_process.exitcode = 0 diff --git a/yardstick/benchmark/contexts/standalone/model.py b/yardstick/benchmark/contexts/standalone/model.py index 4491660e0..ffd8858d9 100644 --- a/yardstick/benchmark/contexts/standalone/model.py +++ b/yardstick/benchmark/contexts/standalone/model.py @@ -16,11 +16,9 @@ from __future__ import absolute_import import os import re import time -import glob import uuid import random import logging -import itertools import errno from netaddr import IPNetwork @@ -30,6 +28,7 @@ from yardstick import ssh from yardstick.common.constants import YARDSTICK_ROOT_PATH from yardstick.common.yaml_loader import yaml_load from yardstick.network_services.utils import PciAddress +from yardstick.network_services.helpers.cpu import CpuSysCores from yardstick.common.utils import write_file LOG = logging.getLogger(__name__) @@ -43,7 +42,7 @@ VM_TEMPLATE = """ <memoryBacking> <hugepages /> </memoryBacking> - <vcpu placement="static">{vcpu}</vcpu> + <vcpu cpuset='{cpuset}'>{vcpu}</vcpu> <os> <type arch="x86_64" machine="pc-i440fx-utopic">hvm</type> <boot dev="hd" /> @@ -192,6 +191,8 @@ class Libvirt(object): threads = extra_spec.get('hw:cpu_threads', '2') vcpu = int(cpu) * int(threads) numa_cpus = '0-%s' % (vcpu - 1) + hw_socket = flavor.get('hw_socket', '0') + cpuset = Libvirt.pin_vcpu_for_perf(connection, vm_name, vcpu, hw_socket) mac = StandaloneContextHelper.get_mac_address(0x00) image = cls.create_snapshot_qemu(connection, index, @@ -203,51 +204,28 @@ class Libvirt(object): memory=memory, vcpu=vcpu, cpu=cpu, numa_cpus=numa_cpus, socket=socket, threads=threads, - vm_image=image) + vm_image=image, cpuset=cpuset) write_file(cfg, vm_xml) return [vcpu, mac] @staticmethod - def split_cpu_list(cpu_list): - if not cpu_list: - return [] - - ranges = cpu_list.split(',') - bounds = ([int(b) for b in r.split('-')] for r in ranges) - range_objects = \ - (range(bound[0], bound[1] + 1 if len(bound) == 2 - else bound[0] + 1) for bound in bounds) - - return sorted(itertools.chain.from_iterable(range_objects)) - - @classmethod - def get_numa_nodes(cls): - nodes_sysfs = glob.iglob("/sys/devices/system/node/node*") - nodes = {} - for node_sysfs in nodes_sysfs: - num = os.path.basename(node_sysfs).replace("node", "") - with open(os.path.join(node_sysfs, "cpulist")) as cpulist_file: - cpulist = cpulist_file.read().strip() - nodes[num] = cls.split_cpu_list(cpulist) - LOG.info("nodes: {0}".format(nodes)) - return nodes - - @staticmethod def update_interrupts_hugepages_perf(connection): connection.execute("echo 1 > /sys/module/kvm/parameters/allow_unsafe_assigned_interrupts") connection.execute("echo never > /sys/kernel/mm/transparent_hugepage/enabled") @classmethod - def pin_vcpu_for_perf(cls, connection, vm_name, cpu): - nodes = cls.get_numa_nodes() - num_nodes = len(nodes) - vcpi_pin_template = "virsh vcpupin {0} {1} {2}" - for i in range(0, int(cpu)): - core = nodes[str(num_nodes - 1)][i % len(nodes[str(num_nodes - 1)])] - connection.execute(vcpi_pin_template.format(vm_name, i, core)) - cls.update_interrupts_hugepages_perf(connection) + def pin_vcpu_for_perf(cls, connection, vm_name, cpu, socket="0"): + threads = "" + sys_obj = CpuSysCores(connection) + soc_cpu = sys_obj.get_core_socket() + sys_cpu = int(soc_cpu["cores_per_socket"]) + cores = "%s-%s" % (soc_cpu[socket][0], soc_cpu[socket][sys_cpu - 1]) + if int(soc_cpu["thread_per_core"]): + threads = "%s-%s" % (soc_cpu[socket][sys_cpu], soc_cpu[socket][-1]) + cpuset = "%s,%s" % (cores, threads) + return cpuset class StandaloneContextHelper(object): diff --git a/yardstick/benchmark/contexts/standalone/ovs_dpdk.py b/yardstick/benchmark/contexts/standalone/ovs_dpdk.py index 833c3fb80..e990e46f5 100644 --- a/yardstick/benchmark/contexts/standalone/ovs_dpdk.py +++ b/yardstick/benchmark/contexts/standalone/ovs_dpdk.py @@ -164,7 +164,7 @@ class OvsDpdkContext(Context): cmd_dpdk_list = [ "ovs-vsctl del-br br0", - "rm -rf /usr/local/var/run/openvswitch/dpdkvhostuser*", + "rm -rf {0}/var/run/openvswitch/dpdkvhostuser*".format(vpath), "ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev", ] @@ -175,7 +175,7 @@ class OvsDpdkContext(Context): dpdk_list.append(ovs_add_port.format(br='br0', port='dpdk%s' % vnf.get("port_num", 0), type_='dpdk', dpdk_args=dpdk_args)) dpdk_list.append(ovs_add_queue.format(port='dpdk%s' % vnf.get("port_num", 0), - queue=self.ovs_properties.get("queues", 4))) + queue=self.ovs_properties.get("queues", 1))) # Sorting the array to make sure we execute dpdk0... in the order list.sort(dpdk_list) @@ -370,8 +370,6 @@ class OvsDpdkContext(Context): LOG.info("virsh create ...") Libvirt.virsh_create_vm(self.connection, cfg) - # 5: Tunning for better performace - Libvirt.pin_vcpu_for_perf(self.connection, vm_name, vcpu) self.vm_names.append(vm_name) # build vnf node details diff --git a/yardstick/benchmark/contexts/standalone/sriov.py b/yardstick/benchmark/contexts/standalone/sriov.py index 55d7057a9..69825fbbf 100644 --- a/yardstick/benchmark/contexts/standalone/sriov.py +++ b/yardstick/benchmark/contexts/standalone/sriov.py @@ -196,6 +196,8 @@ class SriovContext(Context): LOG.info("Ports %s" % self.networks) def _enable_interfaces(self, index, idx, vfs, cfg): + vf_spoofchk = "ip link set {0} vf 0 spoofchk off" + vf = self.networks[vfs[0]] vpci = PciAddress.parse_address(vf['vpci'].strip(), multi_line=True) # Generate the vpci for the interfaces @@ -205,6 +207,7 @@ class SriovContext(Context): Libvirt.add_sriov_interfaces( vf['vpci'], vf['vf_pci']['vf_pci'], vf['mac'], str(cfg)) self.connection.execute("ifconfig %s up" % vf['interface']) + self.connection.execute(vf_spoofchk.format(vf['interface'])) def setup_sriov_context(self): nodes = [] @@ -233,8 +236,6 @@ class SriovContext(Context): LOG.info("virsh create ...") Libvirt.virsh_create_vm(self.connection, cfg) - # 5: Tunning for better performace - Libvirt.pin_vcpu_for_perf(self.connection, vm_name, vcpu) self.vm_names.append(vm_name) # build vnf node details diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 53298d8d3..9b1b3f851 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -28,6 +28,7 @@ from jinja2 import Environment from yardstick.benchmark.contexts.base import Context from yardstick.benchmark.runners import base as base_runner +from yardstick.common.constants import CONF_FILE from yardstick.common.yaml_loader import yaml_load from yardstick.dispatcher.base import Base as DispatcherBase from yardstick.common.task_template import TaskTemplate @@ -36,10 +37,8 @@ from yardstick.common import constants from yardstick.common.html_template import report_template output_file_default = "/tmp/yardstick.out" -config_file = '/etc/yardstick/yardstick.conf' test_cases_dir_default = "tests/opnfv/test_cases/" LOG = logging.getLogger(__name__) -JOIN_TIMEOUT = 60 class Task(object): # pragma: no cover @@ -69,7 +68,7 @@ class Task(object): # pragma: no cover self._set_log() try: - output_config = utils.parse_ini_file(config_file) + output_config = utils.parse_ini_file(CONF_FILE) except Exception: # all error will be ignore, the default value is {} output_config = {} @@ -260,7 +259,7 @@ class Task(object): # pragma: no cover # Wait for runners to finish for runner in runners: - status = runner_join(runner, self.outputs, result) + status = runner_join(runner, background_runners, self.outputs, result) if status != 0: raise RuntimeError( "{0} runner status {1}".format(runner.__execution_type__, status)) @@ -270,7 +269,7 @@ class Task(object): # pragma: no cover for scenario in scenarios: if not _is_background_scenario(scenario): runner = self.run_one_scenario(scenario, output_file) - status = runner_join(runner, self.outputs, result) + status = runner_join(runner, background_runners, self.outputs, result) if status != 0: LOG.error('Scenario NO.%s: "%s" ERROR!', scenarios.index(scenario) + 1, @@ -285,11 +284,11 @@ class Task(object): # pragma: no cover # Wait for background runners to finish for runner in background_runners: - status = runner.join(self.outputs, result, JOIN_TIMEOUT) + status = runner.join(self.outputs, result) if status is None: # Nuke if it did not stop nicely base_runner.Runner.terminate(runner) - runner.join(self.outputs, result, JOIN_TIMEOUT) + runner.join(self.outputs, result) base_runner.Runner.release(runner) print("Background task ended") @@ -641,13 +640,22 @@ def get_networks_from_nodes(nodes): return networks -def runner_join(runner, outputs, result): +def runner_join(runner, background_runners, outputs, result): """join (wait for) a runner, exit process at runner failure + :param background_runners: + :type background_runners: :param outputs: :type outputs: dict :param result: :type result: list """ + while runner.poll() is None: + outputs.update(runner.get_output()) + result.extend(runner.get_result()) + # drain all the background runner queues + for background in background_runners: + outputs.update(background.get_output()) + result.extend(background.get_result()) status = runner.join(outputs, result) base_runner.Runner.release(runner) return status diff --git a/yardstick/benchmark/runners/base.py b/yardstick/benchmark/runners/base.py index 13718d793..a887fa5b3 100755 --- a/yardstick/benchmark/runners/base.py +++ b/yardstick/benchmark/runners/base.py @@ -210,6 +210,10 @@ class Runner(object): QUEUE_JOIN_INTERVAL = 5 + def poll(self, timeout=QUEUE_JOIN_INTERVAL): + self.process.join(timeout) + return self.process.exitcode + def join(self, outputs, result, interval=QUEUE_JOIN_INTERVAL): while self.process.exitcode is None: # drain the queue while we are running otherwise we won't terminate diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash b/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash index d9a440c89..757553e8b 100644 --- a/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash +++ b/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash @@ -21,15 +21,24 @@ max_down_time=$6 OUTPUT_FILE=/tmp/output-qemu.log +echo "To check the parameters:" +echo "SRC: $src" +echo "DST: $dst" +echo "DST_IP: $dst_ip" +echo "MIGRATE_PORT: $migrate_to_port" +echo "DOWN_TIME: $max_down_time" + do_migrate() { + echo "Execution of Live Migration" + echo "info status" | nc -U $src # with no speed limit - echo "migrate_set_speed 0" |nc -U $src + echo "migrate_set_speed 0" | nc -U $src # set the expected max downtime - echo "migrate_set_downtime ${max_down_time}" |nc -U $src + echo "migrate_set_downtime ${max_down_time}" | nc -U $src # start live migration - echo "migrate -d tcp:${dst_ip}:$migrate_to_port" |nc -U $src + echo "migrate -d tcp:${dst_ip}:${migrate_to_port}" | nc -U $src # wait until live migration completed status="" while [ "${status}" == "" ] @@ -38,14 +47,17 @@ do_migrate() echo ${status} sleep 1; done -} >/dev/null + + echo "End of Live Migration" +} output_qemu() { + echo "Checking status of Migration" # print detail information echo "info migrate" | nc -U $src echo "quit" | nc -U $src - echo "quit" | nc -u $dst + echo "quit" | nc -U $dst sleep 5 echo "Migration executed successfully" @@ -65,8 +77,11 @@ echo -e "{ \ # main entry main() { + echo "Perform LiveMigration" do_migrate + echo "LiveMigration Status" output_qemu + echo "LiveMigration JSON output " output_json } main diff --git a/yardstick/benchmark/scenarios/networking/iperf3.py b/yardstick/benchmark/scenarios/networking/iperf3.py index a3d273750..98c45990e 100644 --- a/yardstick/benchmark/scenarios/networking/iperf3.py +++ b/yardstick/benchmark/scenarios/networking/iperf3.py @@ -111,18 +111,22 @@ For more info see http://software.es.net/iperf # If there are no options specified if not options: - options = "" + options = {} use_UDP = False - if "udp" in options: - cmd += " --udp" - use_UDP = True - if "bandwidth" in options: - cmd += " --bandwidth %s" % options["bandwidth"] - else: - # tcp obviously + try: + protocol = options.get("protocol") + bandwidth = options.get('bandwidth') + use_UDP = protocol == 'udp' + if protocol: + cmd += " --" + protocol + if use_UDP and bandwidth: + cmd += " --bandwidth " + bandwidth + # if nodelay in the option, protocal maybe null or 'tcp' if "nodelay" in options: cmd += " --nodelay" + except AttributeError: + LOG.warning("Can't parser the options in your config file!!!") # these options are mutually exclusive in iperf3 if time: diff --git a/yardstick/benchmark/scenarios/networking/ping.py b/yardstick/benchmark/scenarios/networking/ping.py index 3bade73e2..e7d9beea8 100644 --- a/yardstick/benchmark/scenarios/networking/ping.py +++ b/yardstick/benchmark/scenarios/networking/ping.py @@ -24,6 +24,8 @@ LOG = logging.getLogger(__name__) class Ping(base.Scenario): """Execute ping between two hosts + If ping error, RTT will be set to 999999 + Parameters packetsize - number of data bytes to send type: int @@ -33,6 +35,8 @@ class Ping(base.Scenario): __scenario_type__ = "Ping" + PING_ERROR_RTT = 999999 + TARGET_SCRIPT = 'ping_benchmark.bash' def __init__(self, scenario_cfg, context_cfg): @@ -60,6 +64,7 @@ class Ping(base.Scenario): rtt_result = {} ping_result = {"rtt": rtt_result} + sla_max_rtt = self.scenario_cfg.get("sla", {}).get("max_rtt") for pos, dest in enumerate(dest_list): if 'targets' in self.scenario_cfg: @@ -76,20 +81,34 @@ class Ping(base.Scenario): if exit_status != 0: raise RuntimeError(stderr) + if isinstance(target_vm, dict): + target_vm_name = target_vm.get("name") + else: + target_vm_name = target_vm.split('.')[0] if stdout: - if isinstance(target_vm, dict): - target_vm_name = target_vm.get("name") - else: - target_vm_name = target_vm.split('.')[0] - rtt_result[target_vm_name] = float(stdout) - if "sla" in self.scenario_cfg: - sla_max_rtt = int(self.scenario_cfg["sla"]["max_rtt"]) + rtt_result[target_vm_name] = float(stdout.strip()) + # store result before potential AssertionError + result.update(utils.flatten_dict_key(ping_result)) + if sla_max_rtt is not None: + sla_max_rtt = float(sla_max_rtt) assert rtt_result[target_vm_name] <= sla_max_rtt,\ "rtt %f > sla: max_rtt(%f); " % \ (rtt_result[target_vm_name], sla_max_rtt) else: LOG.error("ping '%s' '%s' timeout", options, target_vm) - result.update(utils.flatten_dict_key(ping_result)) + # we need to specify a result to satisfy influxdb schema + # choose a very large number to inidcate timeout + # in this case choose an order of magnitude greater than the SLA + rtt_result[target_vm_name] = float(self.PING_ERROR_RTT) + # store result before potential AssertionError + result.update(utils.flatten_dict_key(ping_result)) + if sla_max_rtt is not None: + raise AssertionError("packet dropped rtt {:f} > sla: max_rtt({:f})".format( + rtt_result[target_vm_name], sla_max_rtt)) + + else: + raise AssertionError( + "packet dropped rtt {:f}".format(rtt_result[target_vm_name])) def _test(): # pragma: no cover diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index 0fab45480..b94bfc9ab 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -190,6 +190,12 @@ class NetworkServiceTestCase(base.Scenario): for index, publicip in enumerate(fflow.get("public_ip", [])): flow["public_ip_{}".format(index)] = publicip + for index, src_port in enumerate(fflow.get("src_port", [])): + flow["src_port_{}".format(index)] = src_port + + for index, dst_port in enumerate(fflow.get("dst_port", [])): + flow["dst_port_{}".format(index)] = dst_port + flow["count"] = fflow["count"] except KeyError: flow = {} diff --git a/yardstick/benchmark/scenarios/storage/fio.py b/yardstick/benchmark/scenarios/storage/fio.py index 98fe26973..125bc7ed4 100644 --- a/yardstick/benchmark/scenarios/storage/fio.py +++ b/yardstick/benchmark/scenarios/storage/fio.py @@ -32,6 +32,10 @@ class Fio(base.Scenario): type: string unit: na default: None + job_file_config - content of job configuration file + type: list + unit: na + default: None directory - mount directoey for test volume type: string unit: na @@ -90,15 +94,26 @@ class Fio(base.Scenario): self.client.wait(timeout=600) self.job_file = self.options.get("job_file", None) + config_lines = self.options.get("job_file_config", None) if self.job_file: self.job_file_script = pkg_resources.resource_filename( "yardstick.resources", 'files/' + self.job_file) - # copy script to host + # copy job file to host self.client._put_file_shell(self.job_file_script, '~/job_file.ini') + elif config_lines: + LOG.debug("Job file configuration received, Fio job file will be created.") + self.job_file = 'tmp_job_file.ini' + self.job_file_script = pkg_resources.resource_filename( + "yardstick.resources", 'files/' + self.job_file) + with open(self.job_file_script, 'w') as f: + f.write('\n'.join(str(line) for line in config_lines)) + # copy job file to host + self.client._put_file_shell(self.job_file_script, '~/job_file.ini') else: + LOG.debug("No job file configuration received, Fio will use parameters.") self.target_script = pkg_resources.resource_filename( "yardstick.benchmark.scenarios.storage", Fio.TARGET_SCRIPT) diff --git a/yardstick/cmd/NSBperf.py b/yardstick/cmd/NSBperf.py index 2dc0f65e7..5d0aa746d 100755 --- a/yardstick/cmd/NSBperf.py +++ b/yardstick/cmd/NSBperf.py @@ -150,8 +150,24 @@ class YardstickNSCli(object): testcases = os.listdir(test_path + vnf) print(("VNF :(%s)" % vnf)) print("================") - for testcase in [tc for tc in testcases if "tc_" in tc]: - print('%s' % testcase) + test_cases = [tc for tc in testcases if "tc_" in tc and "template" not in tc] + + print("\tBareMetal Testcase:") + print("\t===================") + for testcase in [tc for tc in test_cases if "baremetal" in tc]: + print("\t%s" % testcase) + + print(os.linesep) + print("\tStandalone Virtualization Testcase:") + print("\t===================================") + for testcase in [tc for tc in test_cases if "ovs" in tc or "sriov" in tc]: + print("\t%s" % testcase) + + print(os.linesep) + print("\tOpenstack Testcase:") + print("\t===================") + for testcase in [tc for tc in test_cases if "heat" in tc]: + print("\t%s" % testcase) print(os.linesep) raise SystemExit(0) diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py index 6ac99a5a9..51f6e1360 100644 --- a/yardstick/common/utils.py +++ b/yardstick/common/utils.py @@ -350,7 +350,7 @@ def config_to_dict(config): def validate_non_string_sequence(value, default=None, raise_exc=None): - if isinstance(value, collections.Sequence) and not isinstance(value, str): + if isinstance(value, collections.Sequence) and not isinstance(value, six.string_types): return value if raise_exc: raise raise_exc diff --git a/yardstick/dispatcher/influxdb.py b/yardstick/dispatcher/influxdb.py index f157e91f9..632b433b5 100644 --- a/yardstick/dispatcher/influxdb.py +++ b/yardstick/dispatcher/influxdb.py @@ -55,7 +55,9 @@ class InfluxdbDispatcher(DispatchBase): for case, data in testcases.items(): tc_criteria = data['criteria'] for record in data['tc_data']: - self._upload_one_record(record, case, tc_criteria) + # skip results with no data because we influxdb encode empty dicts + if record.get("data"): + self._upload_one_record(record, case, tc_criteria) return 0 diff --git a/yardstick/network_services/collector/subscriber.py b/yardstick/network_services/collector/subscriber.py index d560e1d42..4dc5a796e 100644 --- a/yardstick/network_services/collector/subscriber.py +++ b/yardstick/network_services/collector/subscriber.py @@ -23,18 +23,6 @@ LOG = logging.getLogger(__name__) class Collector(object): """Class that handles dictionary of results in yardstick-plot format.""" - @staticmethod - def make_resource_profile(node, timeout): - # node dict works as mgmt dict - # don't need port names, there is no way we can - # tell what port is used on the compute node - collectd_options = node["collectd"] - plugins = collectd_options.get("plugins", {}) - interval = collectd_options.get("interval") - - # use default cores = None to MatchAllCores - return ResourceProfile(node, plugins=plugins, interval=interval, timeout=timeout) - def __init__(self, vnfs, nodes, traffic_profile, timeout=3600): super(Collector, self).__init__() self.traffic_profile = traffic_profile @@ -42,7 +30,7 @@ class Collector(object): self.nodes = nodes self.timeout = timeout self.bin_path = get_nsb_option('bin_path', '') - self.resource_profiles = {node_name: self.make_resource_profile(node, self.timeout) + self.resource_profiles = {node_name: ResourceProfile.make_from_node(node, self.timeout) for node_name, node in self.nodes.items() if node.get("collectd")} diff --git a/yardstick/network_services/vnf_generic/vnf/iniparser.py b/yardstick/network_services/helpers/iniparser.py index 98256e08a..98256e08a 100644 --- a/yardstick/network_services/vnf_generic/vnf/iniparser.py +++ b/yardstick/network_services/helpers/iniparser.py diff --git a/yardstick/network_services/helpers/samplevnf_helper.py b/yardstick/network_services/helpers/samplevnf_helper.py index 0174d9c0d..0ab10d7b7 100644 --- a/yardstick/network_services/helpers/samplevnf_helper.py +++ b/yardstick/network_services/helpers/samplevnf_helper.py @@ -55,6 +55,10 @@ SCRIPT_TPL = """ {arp_config6} +{arp_route_tbl} + +{arp_route_tbl6} + {actions} {rules} @@ -226,7 +230,7 @@ class MultiPortConfig(object): self.tmp_file = os.path.join("/tmp", tmp_file) self.pktq_out_os = [] self.socket = socket - self.start_core = 0 + self.start_core = 1 self.pipeline_counter = "" self.txrx_pipeline = "" self._port_pairs = None @@ -345,30 +349,28 @@ class MultiPortConfig(object): "".join(("{},".format(port_list.index(x)) for x in uplink_ports))) def generate_arp_route_tbl(self): - arp_route_tbl_tmpl = "({port0_dst_ip_hex},{port0_netmask_hex},{port_num}," \ - "{next_hop_ip_hex})" + arp_route_tbl_tmpl = "routeadd net {port_num} {port_dst_ip} 0x{port_netmask_hex}" def build_arp_config(port): dpdk_port_num = self.vnfd_helper.port_num(port) interface = self.vnfd_helper.find_interface(name=port)["virtual-interface"] # We must use the dst because we are on the VNF and we need to # reach the TG. - dst_port0_ip = ipaddress.ip_interface(six.text_type( + dst_port_ip = ipaddress.ip_interface(six.text_type( "%s/%s" % (interface["dst_ip"], interface["netmask"]))) arp_vars = { - "port0_dst_ip_hex": ip_to_hex(dst_port0_ip.network.network_address.exploded), - "port0_netmask_hex": ip_to_hex(dst_port0_ip.network.netmask.exploded), + "port_netmask_hex": ip_to_hex(dst_port_ip.network.netmask.exploded), # this is the port num that contains port0 subnet and next_hop_ip_hex # this is LINKID which should be based on DPDK port number "port_num": dpdk_port_num, # next hop is dst in this case # must be within subnet - "next_hop_ip_hex": ip_to_hex(dst_port0_ip.ip.exploded), + "port_dst_ip": str(dst_port_ip.ip), } return arp_route_tbl_tmpl.format(**arp_vars) - return ' '.join(build_arp_config(port) for port in self.all_ports) + return '\n'.join(build_arp_config(port) for port in self.all_ports) def generate_arpicmp_data(self): swq_in_str = self.make_range_str('SWQ{}', self.swq, offset=self.lb_count) @@ -391,11 +393,6 @@ class MultiPortConfig(object): # 'ports_mac_list': ' '.join(mac_iter), 'pktq_in_prv': ' '.join(pktq_in_iter), 'prv_to_pub_map': self.set_priv_to_pub_mapping(), - 'arp_route_tbl': self.generate_arp_route_tbl(), - # nd_route_tbl must be set or we get segault on random OpenStack IPv6 traffic - # 'nd_route_tbl': "(0064:ff9b:0:0:0:0:9810:6414,120,0,0064:ff9b:0:0:0:0:9810:6414)" - # safe default? route discard prefix to localhost - 'nd_route_tbl': "(0100::,64,0,::1)" } self.pktq_out_os = swq_out_str.split(' ') # HWLB is a run to complition. So override the pktq_in/pktq_out @@ -710,6 +707,9 @@ class MultiPortConfig(object): # disable IPv6 for now # 'arp_config6': self.generate_arp_config6(), 'arp_config6': "", + 'arp_config': self.generate_arp_config(), + 'arp_route_tbl': self.generate_arp_route_tbl(), + 'arp_route_tbl6': "", 'actions': '', 'rules': '', } diff --git a/yardstick/network_services/nfvi/collectd.conf b/yardstick/network_services/nfvi/collectd.conf index e6a1f0d8c..b166fe7fd 100644 --- a/yardstick/network_services/nfvi/collectd.conf +++ b/yardstick/network_services/nfvi/collectd.conf @@ -24,10 +24,17 @@ Interval {{ interval }} ############################################################################## #LoadPlugin syslog -{% for plugin in loadplugins %} +{% for plugin in loadplugins if plugin != "ovs_stats" %} LoadPlugin {{ plugin }} {% endfor %} +{% if "ovs_stats" in plugins %} +<LoadPlugin ovs_stats> + Interval 1 +</LoadPlugin> +{% endif %} + + ############################################################################## # Plugin configuration # #----------------------------------------------------------------------------# @@ -82,12 +89,11 @@ LoadPlugin {{ plugin }} {% endif %} {% if "intel_pmu" in plugins %} -<Plugin intel_pmu> +<Plugin "intel_pmu"> ReportHardwareCacheEvents true ReportKernelPMUEvents true ReportSoftwareEvents true - EventList "/opt/nsb_bin/pmu_event.json" - HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD" + EventList "{{ plugins['intel_pmu']['pmu_event_path'] }}" </Plugin> {% endif %} @@ -110,6 +116,8 @@ LoadPlugin {{ plugin }} {% if "virt" in plugins %} <Plugin "virt"> # monitor all domains + RefreshInterval 60 + ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin" </Plugin> {% endif %} @@ -117,7 +125,7 @@ LoadPlugin {{ plugin }} <Plugin "ovs_stats"> Port "6640" Address "127.0.0.1" - Socket "/usr/local/var/run/openvswitch/db.sock" + Socket "{{ plugins['ovs_stats']['ovs_socket_path'] }}" # don't specify bridges, monitor all bridges </Plugin> {% endif %} diff --git a/yardstick/network_services/nfvi/resource.py b/yardstick/network_services/nfvi/resource.py index fef44e207..5b96aaf29 100644 --- a/yardstick/network_services/nfvi/resource.py +++ b/yardstick/network_services/nfvi/resource.py @@ -34,7 +34,7 @@ from yardstick import ssh from yardstick.common.task_template import finalize_for_yaml from yardstick.common.utils import validate_non_string_sequence from yardstick.network_services.nfvi.collectd import AmqpConsumer -from yardstick.network_services.utils import get_nsb_option + LOG = logging.getLogger(__name__) @@ -53,6 +53,7 @@ class ResourceProfile(object): AMPQ_PORT = 5672 DEFAULT_INTERVAL = 25 DEFAULT_TIMEOUT = 3600 + OVS_SOCKET_PATH = "/usr/local/var/run/openvswitch/db.sock" def __init__(self, mgmt, port_names=None, cores=None, plugins=None, interval=None, timeout=None): @@ -81,6 +82,18 @@ class ResourceProfile(object): self.mgmt = mgmt self.connection = ssh.AutoConnectSSH.from_node(mgmt) + @classmethod + def make_from_node(cls, node, timeout): + # node dict works as mgmt dict + # don't need port names, there is no way we can + # tell what port is used on the compute node + collectd_options = node["collectd"] + plugins = collectd_options.get("plugins", {}) + interval = collectd_options.get("interval") + + # use default cores = None to MatchAllCores + return cls(node, plugins=plugins, interval=interval, timeout=timeout) + def check_if_sa_running(self, process): """ verify if system agent is running """ try: @@ -154,7 +167,6 @@ class ResourceProfile(object): "dpdkstat": {}, "virt": {}, "ovs_stats": {}, - "intel_pmu": {}, } testcase = "" @@ -233,10 +245,32 @@ class ResourceProfile(object): } self._provide_config_file(config_file_path, self.COLLECTD_CONF, kwargs) + def _setup_intel_pmu(self, connection, bin_path): + pmu_event_path = os.path.join(bin_path, "pmu_event.json") + try: + self.plugins["intel_pmu"]["pmu_event_path"] = pmu_event_path + except KeyError: + # if intel_pmu is not a dict, force it into a dict + self.plugins["intel_pmu"] = {"pmu_event_path": pmu_event_path} + LOG.debug("Downloading event list for pmu_stats plugin") + cmd = 'cd {0}; PMU_EVENTS_PATH={1} python event_download_local.py'.format( + bin_path, pmu_event_path) + cmd = "sudo bash -c '{}'".format(cmd) + connection.execute(cmd) + + def _setup_ovs_stats(self, connection): + try: + socket_path = self.plugins["ovs_stats"].get("ovs_socket_path", self.OVS_SOCKET_PATH) + except KeyError: + # ovs_stats is not a dict + socket_path = self.OVS_SOCKET_PATH + status = connection.execute("test -S {}".format(socket_path))[0] + if status != 0: + LOG.error("cannot find OVS socket %s", socket_path) + def _start_collectd(self, connection, bin_path): LOG.debug("Starting collectd to collect NFVi stats") connection.execute('sudo pkill -x -9 collectd') - bin_path = get_nsb_option("bin_path") collectd_path = os.path.join(bin_path, "collectd", "sbin", "collectd") config_file_path = os.path.join(bin_path, "collectd", "etc") exit_status = connection.execute("which %s > /dev/null 2>&1" % collectd_path)[0] @@ -251,9 +285,10 @@ class ResourceProfile(object): # collectd_installer, http_proxy, https_proxy)) return if "intel_pmu" in self.plugins: - LOG.debug("Downloading event list for pmu_stats plugin") - cmd = 'sudo bash -c \'cd /opt/tempT/pmu-tools/; python event_download_local.py\'' - connection.execute(cmd) + self._setup_intel_pmu(connection, bin_path) + if "ovs_stats" in self.plugins: + self._setup_ovs_stats(connection) + LOG.debug("Starting collectd to collect NFVi stats") # ensure collectd.conf.d exists to avoid error/warning connection.execute("sudo mkdir -p /etc/collectd/collectd.conf.d") diff --git a/yardstick/network_services/traffic_profile/traffic_profile.py b/yardstick/network_services/traffic_profile/traffic_profile.py index 3feb92bb6..2f97945c0 100644 --- a/yardstick/network_services/traffic_profile/traffic_profile.py +++ b/yardstick/network_services/traffic_profile/traffic_profile.py @@ -19,6 +19,7 @@ import socket import logging from random import SystemRandom import six +import ipaddress from yardstick.network_services.traffic_profile.base import TrafficProfile from trex_stl_lib.trex_stl_client import STLStream @@ -44,6 +45,8 @@ SRC_PORT = 'sport' DST_PORT = 'dport' TYPE_OF_SERVICE = 'tos' +LOG = logging.getLogger(__name__) + class TrexProfile(TrafficProfile): """ This class handles Trex Traffic profile generation and execution """ @@ -66,7 +69,7 @@ class TrexProfile(TrafficProfile): return f def _ethernet_range_action_partial(self, direction, _): - def partial(min_value, max_value): + def partial(min_value, max_value, count): stl_vm_flow_var = STLVmFlowVar(name="mac_{}".format(direction), min_value=1, max_value=30, @@ -80,7 +83,15 @@ class TrexProfile(TrafficProfile): return partial def _ip_range_action_partial(self, direction, count=1): - def partial(min_value, max_value): + def partial(min_value, max_value, count): + ip1 = int(ipaddress.IPv4Address(min_value)) + ip2 = int(ipaddress.IPv4Address(max_value)) + actual_count = (ip2 - ip1) + if not actual_count: + count = 1 + elif actual_count < int(count): + count = actual_count + stl_vm_flow_var = STLVmFlowVarRepeatableRandom(name="ip4_{}".format(direction), min_value=min_value, max_value=max_value, @@ -96,7 +107,7 @@ class TrexProfile(TrafficProfile): return partial def _ip6_range_action_partial(self, direction, _): - def partial(min_value, max_value): + def partial(min_value, max_value, count): min_value, max_value = self._get_start_end_ipv6(min_value, max_value) stl_vm_flow_var = STLVmFlowVar(name="ip6_{}".format(direction), min_value=min_value, @@ -112,7 +123,7 @@ class TrexProfile(TrafficProfile): return partial def _dscp_range_action_partial(self, *_): - def partial(min_value, max_value): + def partial(min_value, max_value, count): stl_vm_flow_var = STLVmFlowVar(name="dscp", min_value=min_value, max_value=max_value, @@ -125,7 +136,13 @@ class TrexProfile(TrafficProfile): self.vm_flow_vars.append(stl_vm_wr_flow_var) def _udp_range_action_partial(self, field, count=1): - def partial(min_value, max_value): + def partial(min_value, max_value, count): + actual_count = int(max_value) - int(min_value) + if not actual_count: + count = 1 + elif int(count) > actual_count: + count = actual_count + stl_vm_flow_var = STLVmFlowVarRepeatableRandom(name="port_{}".format(field), min_value=min_value, max_value=max_value, @@ -205,13 +222,14 @@ class TrexProfile(TrafficProfile): except StopIteration: single_action(min_value) else: - range_action(min_value=min_value, max_value=max_value) + range_action(min_value=min_value, max_value=max_value, count=count) def _set_proto_addr(self, protocol, field, address, count=1): single_action, range_action, to_int = self._map_proto_actions[protocol] self._call_on_range(address, single_action(field), range_action(field, count), + count=count, to_int=to_int, ) diff --git a/yardstick/network_services/vnf_generic/vnf/cgnapt_vnf.py b/yardstick/network_services/vnf_generic/vnf/cgnapt_vnf.py index b5072c194..53f73b4d7 100644 --- a/yardstick/network_services/vnf_generic/vnf/cgnapt_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/cgnapt_vnf.py @@ -14,6 +14,7 @@ from __future__ import absolute_import import logging +import time from yardstick.network_services.vnf_generic.vnf.sample_vnf import SampleVNF, DpdkVnfSetupEnvHelper @@ -64,14 +65,12 @@ class CgnaptApproxSetupEnvHelper(DpdkVnfSetupEnvHelper): def scale(self, flavor=""): raise NotImplementedError - def _get_cgnapt_config(self, interfaces=None): - # TODO: static CGNAPT is broken, don't use it - if interfaces is None: - interfaces = self.vnfd_helper.interfaces - + def _get_cgnapt_config(self): # fixme: Get private port and gateway from port list uplink_ports = self.vnfd_helper.port_pairs.uplink_ports - return [self._get_ports_gateway(intf["name"]) for intf in uplink_ports] + return \ + [self.vnfd_helper.find_interface(name=intf)["virtual-interface"]['dst_ip'] + for intf in uplink_ports] class CgnaptApproxVnf(SampleVNF): @@ -98,23 +97,26 @@ class CgnaptApproxVnf(SampleVNF): if self.scenario_helper.options.get('napt', 'static') != 'static': return - # ip_iter = self.setup_helper._generate_ip_from_pool("152.16.40.10") - # gw_ips = self.setup_helper._get_cgnapt_config() - # if self.scenario_helper.vnf_cfg.get("lb_config", "SW") == 'HW': - # pipeline = self.setup_helper.HW_DEFAULT_CORE - # offset = 3 - # else: - # pipeline = self.setup_helper.SW_DEFAULT_CORE - 1 - # offset = 0 - # - # worker_threads = int(self.scenario_helper.vnf_cfg["worker_threads"]) - # # p <pipeline id> entry addm <prv_ipv4/6> prvport> <pub_ip> <pub_port> <phy_port> <ttl> - # # <no_of_entries> <end_prv_port> <end_pub_port> - # cmd_template = "p {0} entry addm {1} 1 {2} 1 0 32 65535 65535 65535" - # for gw, ip in zip(gw_ips, ip_iter): - # cmd = cmd_template.format(pipeline, gw, ip) - # pipeline += worker_threads - # pipeline += offset - # self.vnf_execute(cmd) - # - # time.sleep(WAIT_FOR_STATIC_NAPT) + flow = self.scenario_helper.all_options.get('flow', {}) + public_ip = flow.get('public_ip', ['152.16.40.10']).pop() + ip_iter = self.setup_helper._generate_ip_from_pool(public_ip) + gw_ips = self.setup_helper._get_cgnapt_config() + if self.scenario_helper.vnf_cfg.get("lb_config", "SW") == 'HW': + pipeline = self.setup_helper.HW_DEFAULT_CORE + offset = 3 + else: + pipeline = self.setup_helper.SW_DEFAULT_CORE - 1 + offset = 0 + + worker_threads = int(self.scenario_helper.vnf_cfg["worker_threads"]) + # p <pipeline id> entry addm <prv_ipv4/6> prvport> <pub_ip> <pub_port> <phy_port> <ttl> + # <no_of_entries> <end_prv_port> <end_pub_port> + cmd_template = "p {0} entry addm {1} 1 {2} 1 0 32 65535 65535 65535" + for gw, ip in zip(gw_ips, ip_iter): + cmd = cmd_template.format(pipeline, gw, ip) + pipeline += worker_threads + pipeline += offset + LOG.info(cmd) + self.vnf_execute(cmd) + + time.sleep(WAIT_FOR_STATIC_NAPT) diff --git a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py index 992b6d06e..ac5abfbcb 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py @@ -14,28 +14,27 @@ from __future__ import absolute_import import array -import operator -import logging import io +import logging +import operator import os import re import select import socket - -from collections import OrderedDict, namedtuple import time +from collections import OrderedDict, namedtuple from contextlib import contextmanager from itertools import repeat, chain from multiprocessing import Queue import six -from six.moves import zip, StringIO from six.moves import cStringIO +from six.moves import zip, StringIO from yardstick.benchmark.scenarios.networking.vnf_generic import find_relative_file from yardstick.common import utils from yardstick.common.utils import SocketTopology, join_non_strings, try_int -from yardstick.network_services.vnf_generic.vnf.iniparser import ConfigParser +from yardstick.network_services.helpers.iniparser import ConfigParser from yardstick.network_services.vnf_generic.vnf.sample_vnf import ClientResourceHelper from yardstick.network_services.vnf_generic.vnf.sample_vnf import DpdkVnfSetupEnvHelper diff --git a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py index 3bfca19aa..24712dd27 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py @@ -90,7 +90,7 @@ class ProxApproxVnf(SampleVNF): result = { "packets_in": tx_total, - "packets_dropped": (tx_total - rx_total), + "packets_dropped": abs(rx_total - tx_total), "packets_fwd": rx_total, # we share ProxResourceHelper with TG, but we want to collect # collectd KPIs here and not TG KPIs, so use a different method name diff --git a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py index 92f78c2bc..b5cf03477 100644 --- a/yardstick/network_services/vnf_generic/vnf/sample_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/sample_vnf.py @@ -108,13 +108,6 @@ class SetupEnvHelper(object): self.ssh_helper = ssh_helper self.scenario_helper = scenario_helper - def _get_ports_gateway(self, name): - routing_table = self.vnfd_helper.vdu0.get('routing_table', []) - for route in routing_table: - if name == route['if']: - return route['gateway'] - return None - def build_config(self): raise NotImplementedError @@ -685,6 +678,7 @@ class SampleVNF(GenericVNF): VNF_PROMPT = "pipeline>" WAIT_TIME = 1 + WAIT_TIME_FOR_SCRIPT = 10 APP_NAME = "SampleVNF" # we run the VNF interactively, so the ssh command will timeout after this long @@ -811,7 +805,7 @@ class SampleVNF(GenericVNF): self.APP_NAME) LOG.info("Waiting for %s VNF to start.. ", self.APP_NAME) - time.sleep(1) + time.sleep(self.WAIT_TIME_FOR_SCRIPT) # Send ENTER to display a new prompt in case the prompt text was corrupted # by other VNF output self.q_in.put('\r\n') |