X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fvpp%2Fperf%2F__init__.robot;h=37875163a4a88dd45e6b19c8625eeebbdb0e5596;hp=578c57312b71c9b29928c65e4b31d498b16035a8;hb=03984cf5e2affcb715559fad5f68b8ba165ff8cd;hpb=1577123a3c27541181097cb4186aa8855f20b1cc

diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index 578c57312b..37875163a4 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2021 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,33 +14,49 @@
 *** Settings ***
 | Resource | resources/libraries/robot/shared/default.robot
 | Resource | resources/libraries/robot/shared/interfaces.robot
+|
+| Library | resources.libraries.python.PapiExecutor.Disconnector
 | Library | resources.libraries.python.SetupFramework
 | Library | resources.libraries.python.SetupFramework.CleanupFramework
 | Library | resources.libraries.python.CpuUtils
-| ...
-| Suite Setup | Run Keywords | Setup performance global Variables
+|
+| Suite Setup | Run Keywords | Start Suite Setup Export
+| ... | AND | 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 Layout from All nodes | ${nodes}
+| ... | AND | Get CPU Info from All Nodes | ${nodes}
 | ... | AND | Update All Interface Data on All Nodes | ${nodes}
-| ... | skip_tg=${True} | numa_node=${True}
-| ...
-| Suite Teardown | Cleanup Framework | ${nodes}
+| ... | skip_tg=${True}
+| ... | AND | Finalize Suite Setup Export
+|
+| Suite Teardown | Run Keywords | Start Suite Teardown Export
+| ... | AND | Disconnect All Papi Connections
+| ... | AND | Cleanup Framework | ${nodes}
+| ... | AND | Finalize Suite Teardown Export
 
 *** 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:
-| | ... | - pkt_trace - Switch to enable packet trace for test.
-| | ... | - dut_stats - Switch to enable DUT statistics.
-| | ... | - packages_dir - Directory with VPP binary packages.
-| | ...
-| | Set Global Variable | ${pkt_trace} | ${False}
-| | Set Global Variable | ${dut_stats} | ${True}
+| | ... | - stat_runtime - Statistics actions within traffic trial.
+| | ... | - stat_pre_trial - Statistics actions before traffic trials.
+| | ... | - stat_post_trial - Statistics actions after traffic trials.
+| | ... | - packages_dir - Path to directory where VPP packages are stored.
+| |
+| | ${stat_runtime}= | Create List
+| | ... | vpp-runtime
+| | ${stat_pre_trial}= | Create List
+| | ... | vpp-clear-stats | vpp-enable-packettrace
+| | ${stat_post_trial}= | Create List
+| | ... | vpp-show-stats | vpp-show-packettrace
+| | Set Global Variable | ${stat_runtime}
+| | Set Global Variable | ${stat_pre_trial}
+| | Set Global Variable | ${stat_post_trial}
 | | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/
+| | Set Global Variable | ${nodes}