Introduce per DUT configurable stats

- test/suite/global
- binary logic is not working

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ia3d81cbf2c5f04d1093a0a408c84a9ffc6f3eef0

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 08de523..a743593 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -226,6 +226,9 @@ class Constants:
     PERF_TRIAL_LATENCY_DURATION = get_float_from_env(
         u"PERF_TRIAL_LATENCY_DURATION", 5.0)
 
+    # VPP packet trace
+    PKT_TRACE = get_pessimistic_bool_from_env(u"PKT_TRACE")
+
     # UUID string of DUT1 /tmp volume created outside of the
     # DUT1 docker in case of vpp-device test. ${EMPTY} value means that
     #  /tmp directory is inside the DUT1 docker.

diff --git a/resources/libraries/robot/performance/performance_utils.robot b/resources/libraries/robot/performance/performance_utils.robot
index e0b68f1..53334ed 100644 (file)
--- a/resources/libraries/robot/performance/performance_utils.robot
+++ b/resources/libraries/robot/performance/performance_utils.robot
@@ -28,6 +28,7 @@
 *** Variables ***
 | ${trial_duration}= | ${PERF_TRIAL_DURATION}
 | ${trial_multiplicity}= | ${PERF_TRIAL_MULTIPLICITY}
+| ${pkt_trace}= | ${PKT_TRACE}
 
 *** Keywords ***
 | Find NDR and PDR intervals using optimized search
@@ -433,17 +434,15 @@
 | | [Arguments] | ${trial_duration} | ${rate} | ${frame_size}
 | | ... | ${traffic_profile} | ${trial_multiplicity}=${trial_multiplicity}
 | | ... | ${traffic_directions}=${2} | ${tx_port}=${0} | ${rx_port}=${1}
-| | ... | ${pkt_trace}=${False}
+| | ... | ${pkt_trace}=${pkt_trace}
 | |
 | | Clear and show runtime counters with running traffic | ${trial_duration}
 | | ... | ${rate} | ${frame_size} | ${traffic_profile}
 | | ... | ${traffic_directions} | ${tx_port} | ${rx_port}
-| | Run Keyword If | ${dut_stats}==${True}
-| | ... | Clear statistics on all DUTs | ${nodes}
-| | Run Keyword If | ${dut_stats}==${True} and ${pkt_trace}==${True}
-| | ... | VPP Enable Traces On All DUTs | ${nodes} | fail_on_error=${False}
-| | Run Keyword If | ${dut_stats}==${True}
-| | ... | VPP enable elog traces on all DUTs | ${nodes}
+| | Set Test Variable | ${pkt_trace}
+| | FOR | ${action} | IN | @{pre_stats}
+| | | Run Keyword | Additional Statistics Action For ${action}
+| | END
 | | ${results} = | Create List
 | | FOR | ${i} | IN RANGE | ${trial_multiplicity}
 | | | # The following line is skipping some default arguments,
@@ -456,12 +455,9 @@
 | | | ${rr} = | Evaluate | ${rx} / ${trial_duration}
 | | | Append To List | ${results} | ${rr}
 | | END
-| | Run Keyword If | ${dut_stats}==${True} | Show event logger on all DUTs
-| | ... | ${nodes}
-| | Run Keyword If | ${dut_stats}==${True} | Show statistics on all DUTs
-| | ... | ${nodes}
-| | Run Keyword If | ${dut_stats}==${True} and ${pkt_trace}==${True}
-| | ... | Show Packet Trace On All Duts | ${nodes} | maximum=${100}
+| | FOR | ${action} | IN | @{post_stats}
+| | | Run Keyword | Additional Statistics Action For ${action}
+| | END
 | | Return From Keyword | ${results}
 
 | Measure and show latency at specified rate
@@ -535,11 +531,13 @@
 | | ... | warmup_time=${0} | async_call=${True} | latency=${False}
 | | ... | traffic_directions=${traffic_directions} | tx_port=${tx_port}
 | | ... | rx_port=${rx_port}
-| | Run Keyword If | ${dut_stats}==${True}
-| | ... | VPP clear runtime on all DUTs | ${nodes}
+| | FOR | ${action} | IN | @{pre_run_stats}
+| | | Run Keyword | Additional Statistics Action For ${action}
+| | END
 | | Sleep | ${duration}
-| | Run Keyword If | ${dut_stats}==${True}
-| | ... | VPP show runtime on all DUTs | ${nodes}
+| | FOR | ${action} | IN | @{post_run_stats}
+| | | Run Keyword | Additional Statistics Action For ${action}
+| | END
 | | Stop traffic on tg
 
 | Start Traffic on Background
@@ -587,3 +585,53 @@
 | |
 | | ${result}= | Stop traffic on tg
 | | Return From Keyword | ${result}
+
+| Additional Statistics Action For vpp-clear-stats
+| | [Documentation]
+| | ... | Additional Statistics Action for clear VPP statistics.
+| |
+| | Clear Statistics On All DUTs | ${nodes}
+
+| Additional Statistics Action For vpp-show-stats
+| | [Documentation]
+| | ... | Additional Statistics Action for show VPP statistics.
+| |
+| | Show Statistics On All DUTs | ${nodes}
+
+| Additional Statistics Action For vpp-clear-runtime
+| | [Documentation]
+| | ... | Additional Statistics Action for clear VPP runtime.
+| |
+| | VPP Clear Runtime On All DUTs | ${nodes}
+
+| Additional Statistics Action For vpp-show-runtime
+| | [Documentation]
+| | ... | Additional Statistics Action for show VPP runtime.
+| |
+| | VPP Show Runtime On All DUTs | ${nodes}
+
+| Additional Statistics Action For vpp-enable-packettrace
+| | [Documentation]
+| | ... | Additional Statistics Action for enable VPP packet trace.
+| |
+| | Run Keyword If | ${pkt_trace}==${True}
+| | ... | VPP Enable Traces On All DUTs | ${nodes} | fail_on_error=${False}
+
+| Additional Statistics Action For vpp-show-packettrace
+| | [Documentation]
+| | ... | Additional Statistics Action for show VPP packet trace.
+| |
+| | Run Keyword If | ${pkt_trace}==${True}
+| | ... | Show Packet Trace On All Duts | ${nodes} | maximum=${100}
+
+| Additional Statistics Action For vpp-enable-elog
+| | [Documentation]
+| | ... | Additional Statistics Action for enable VPP elog trace.
+| |
+| | VPP Enable Elog Traces On All DUTs | ${nodes}
+
+| Additional Statistics Action For vpp-show-elog
+| | [Documentation]
+| | ... | Additional Statistics Action for show VPP elog trace.
+| |
+| | Show Event Logger On All DUTs | ${nodes}

diff --git a/tests/dpdk/perf/__init__.robot b/tests/dpdk/perf/__init__.robot
index a0c5f28..321ddc8 100644 (file)
--- a/tests/dpdk/perf/__init__.robot
+++ b/tests/dpdk/perf/__init__.robot
@@ -34,9 +34,17 @@
 | | ... | Setup suite Variables. Variables are used across performance testing.
 | |
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - pkt_trace - Switch to enable packet trace for test
-| | ... | - dut_stats - Switch to enable DUT statistics
+| | ... | - 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.
 | |
-| | Set Global Variable | ${pkt_trace} | ${False}
-| | Set Global Variable | ${dut_stats} | ${False}
+| | ${pre_stats}= | Create List | ${EMPTY}
+| | ${post_stats}= | Create List | ${EMPTY}
+| | ${pre_run_stats}= | Create List | ${EMPTY}
+| | ${post_run_stats}= | Create List | ${EMPTY}
+| | 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 | ${nodes}

diff --git a/tests/vpp/device/__init__.robot b/tests/vpp/device/__init__.robot
index 0d31fc1..9be4c66 100644 (file)
--- a/tests/vpp/device/__init__.robot
+++ b/tests/vpp/device/__init__.robot
@@ -35,9 +35,23 @@
 | | ... | Setup suite Variables. Variables are used across device testing.
 | |
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - dut_stats - Switch to enable DUT statistics
+| | ... | - 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.
 | |
-| | Set Global Variable | ${dut_stats} | ${True}
+| | ${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/
 | | Set Global Variable | ${nodes}

diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index e5a2c75..534e0f3 100644 (file)
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -38,9 +38,23 @@
 | | ... | Setup suite Variables. Variables are used across performance testing.
 | |
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - dut_stats - Switch to enable DUT statistics.
-| | ... | - packages_dir - Directory with VPP binary packages.
+| | ... | - 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.
 | |
-| | Set Global Variable | ${dut_stats} | ${True}
+| | ${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/
 | | Set Global Variable | ${nodes}