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

diff --git a/tests/vpp/perf/__init__.robot b/tests/vpp/perf/__init__.robot
index 3d25ebdb8d..578c57312b 100644
--- a/tests/vpp/perf/__init__.robot
+++ b/tests/vpp/perf/__init__.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,14 +15,21 @@
 | 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          | 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}
+| ... | 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 | Update All Interface Data on All Nodes | ${nodes}
+| ... | skip_tg=${True} | numa_node=${True}
+| ...
+| Suite Teardown | Cleanup Framework | ${nodes}
 
 *** Keywords ***
 | Setup performance global Variables
@@ -30,21 +37,10 @@
 | | ... | Setup suite Variables. Variables are used across performance testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - perf_trial_duration - Duration of traffic run [s]
-| | ... | - 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_bin - Path to QEMU binary
-| | ... | - perf_qemu_qsz - QEMU virtio queue size
-| | ... | - use_tuned_cfs - Switch to set scheduler policy
-| | ... | - qemu_built - Information if QEMU build is already prepared
+| | ... | - 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 | ${perf_trial_duration} | 10
-| | 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_bin}
-| | ... | /opt/qemu-2.5.0/bin/qemu-system-x86_64
-| | Set Global Variable | ${perf_qemu_qsz} | 1024
-| | Set Global Variable | ${use_tuned_cfs} | ${False}
-| | Set Global Variable | ${qemu_built} | ${False}
+| | Set Global Variable | ${pkt_trace} | ${False}
+| | Set Global Variable | ${dut_stats} | ${True}
+| | Set Global Variable | ${packages_dir} | /tmp/openvpp-testing/download_dir/