X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2F__init__.robot;h=534e0f3e381627bfcbfb171b490bf05905e2f13e;hp=ecee11c09f54d766c721014a23f04aa8a77dddae;hb=5ba372e3b5066b87e345e5f3b1bb7074e95530d0;hpb=325bf96ce5fc13780fab0731855a2e2092208a2b

diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index ecee11c09f..534e0f3e38 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # 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:
@@ -14,52 +14,47 @@
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/shared/interfaces.robot
+|
 | Library | resources.libraries.python.SetupFramework
 | Library | resources.libraries.python.SetupFramework.CleanupFramework
 | Library | resources.libraries.python.CpuUtils
-| Suite Setup | Run Keywords | Setup performance global Variables
-| ...         | AND          | Setup Framework | ${nodes}
-| ...         | AND          | Install Vpp On All Duts | ${nodes}
-| ...         | ${packages_dir} | ${vpp_rpm_pkgs} | ${vpp_deb_pkgs}
-| ...         | AND          | Verify Vpp On All Duts | ${nodes}
-| ...         | AND          | Verify UIO Driver on all DUTs | ${nodes}
-| ...         | AND          | Setup All DUTs | ${nodes}
-| ...         | AND          | Show Vpp Version On All Duts | ${nodes}
-| ...         | AND          | Get CPU Layout from all nodes | ${nodes}
-| ...         | AND          | Update All Interface Data On All Nodes
-| ...                        | ${nodes} | skip_tg=${True} | numa_node=${True}
+|
+| Suite Setup | Run Keywords | Setup Global Variables
+| ... | AND | Setup Framework | ${nodes}
+| ... | AND | Setup Corekeeper on All Nodes | ${nodes}
+| ... | AND | Install Vpp on All Duts | ${nodes} | ${packages_dir}
+| ... | AND | Verify Vpp on All Duts | ${nodes}
+| ... | AND | Verify UIO Driver on all DUTs | ${nodes}
+| ... | AND | Show Vpp Version on All Duts | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
+| ... | AND | Update All Interface Data on All Nodes | ${nodes}
+| ... | skip_tg=${True}
+|
 | Suite Teardown | Cleanup Framework | ${nodes}
 
 *** Keywords ***
-| Setup performance global Variables
+| Setup Global Variables
 | | [Documentation]
 | | ... | Setup suite Variables. Variables are used across performance testing.
-| | ...
+| |
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - perf_pdr_loss_acceptance - Loss acceptance treshold
-| | ... | - perf_pdr_loss_acceptance_type - Loss acceptance treshold type
-| | ... | - perf_vm_image - Guest VM disk image
-| | ... | - perf_qemu_path - Path prefix to QEMU binary
-| | ... | - use_tuned_cfs - Switch to set scheduler policy
-| | ... | - qemu_build - Whether Qemu will be built
-| | ... | - pkt_trace - Switch to enable packet trace for test
-| | ... | - dut_stats - Switch to enable DUT statistics
-| | ... | - uio_driver - Default UIO driver
-| | ... | - plugins_to_enable - List of plugins to be enabled for test
-| | ...
-| | Set Global Variable | ${perf_pdr_loss_acceptance} | 0.5
-| | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage
-| | Set Global Variable | ${perf_vm_image} | /var/lib/vm/csit-nested-1.7.img
-| | Set Global Variable | ${perf_qemu_path} | /opt/qemu-2.5.0
-| | Set Global Variable | ${use_tuned_cfs} | ${False}
-| | Set Global Variable | ${qemu_build} | ${True}
-| | Set Global Variable | ${pkt_trace} | ${False}
-| | Set Global Variable | ${dut_stats} | ${True}
-| | @{plugins_to_enable}= | Create List | dpdk_plugin.so
-| | Set Global Variable | @{plugins_to_enable}
+| | ... | - pre_stats - Statistics actions before traffic.
+| | ... | - post_stats - Statistics actions after traffic.
+| | ... | - pre_run_stats - Statistics actions during traffic before timer.
+| | ... | - post_run_stats - Statistics actions during traffic after timer.
+| | ... | - packages_dir - Path to directory where VPP packages are stored.
+| |
+| | ${pre_stats}= | Create List
+| | ... | vpp-clear-stats | vpp-enable-packettrace | vpp-enable-elog
+| | ${post_stats}= | Create List
+| | ... | vpp-show-stats | vpp-show-packettrace | vpp-show-elog
+| | ${pre_run_stats}= | Create List
+| | ... | vpp-clear-runtime
+| | ${post_run_stats}= | Create List
+| | ... | vpp-show-runtime
+| | Set Global Variable | ${pre_stats}
+| | Set Global Variable | ${post_stats}
+| | Set Global Variable | ${pre_run_stats}
+| | Set Global Variable | ${post_run_stats}
 | | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
-| | @{vpp_rpm_pkgs}= | Create List | vpp | vpp-devel | vpp-lib | vpp-plugins
-| | Set Global Variable | ${vpp_rpm_pkgs}
-| | @{vpp_deb_pkgs}= | Create List | vpp | vpp-dbg | vpp-dev | vpp-lib
-| | ... | vpp-plugins | vpp-dpdk-dkms
-| | Set Global Variable | ${vpp_deb_pkgs}
+| | Set Global Variable | ${nodes}