X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=tests%2Fkubernetes%2Fperf%2F__init__.robot;h=790a85be0fdc601901a09755e41fec713f3b84c1;hb=248d1a52e06622dc9eb1dfdd6ca9f6670b4c0bc3;hp=686ead5e1cdc80cd47dc16b410fdf1e68ef68d3a;hpb=2553b94d96db0a23b1fa3bfa6a3dae1468f4cb83;p=csit.git

diff --git a/tests/kubernetes/perf/__init__.robot b/tests/kubernetes/perf/__init__.robot
index 686ead5e1c..790a85be0f 100644
--- a/tests/kubernetes/perf/__init__.robot
+++ b/tests/kubernetes/perf/__init__.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2018 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:
@@ -20,17 +20,20 @@
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.SchedUtils
 | Library | resources.libraries.python.SetupFramework
+| Library | resources.libraries.python.SetupFramework.CleanupFramework
 | Library | resources.libraries.python.topology.Topology
 | Library | Collections
 | Suite Setup | Run Keywords | Setup performance global Variables
 | ...         | AND          | Setup Framework | ${nodes}
+| ...         | AND          | Load Docker image on all duts | ${nodes}
+| ...                        | ${dcr_image}
 | ...         | AND          | Setup Kubernetes on all duts | ${nodes}
-| ...         | AND          | Get CPU Layout from all nodes | ${nodes}
+| ...         | AND          | Get CPU Info from All Nodes | ${nodes}
 | ...         | AND          | Update all numa nodes | ${nodes}
 | ...                        | skip_tg=${True}
 | ...         | AND          | Update NIC interface names on all duts | ${nodes}
-| ...
-| Suite Teardown | Destroy Kubernetes on all duts | ${nodes}
+| Suite Teardown | Run Keywords | Destroy Kubernetes on all duts | ${nodes}
+| ...            | AND          | Cleanup Framework | ${nodes}
 
 *** Keywords ***
 | Setup performance global Variables
@@ -38,19 +41,15 @@
 | | ... | 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
+| | ... | - dcr_image - vpp-agent docker image
 | | ... | - 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_trial_duration} | 10
-| | Set Global Variable | ${perf_pdr_loss_acceptance} | 0.5
-| | Set Global Variable | ${perf_pdr_loss_acceptance_type} | percentage
+| | Set Global Variable | ${dcr_image}
+| | ... | /tmp/openvpp-testing/download_dir/prod_vpp_agent.tar.gz
 | | Set Global Variable | ${pkt_trace} | ${False}
 | | Set Global Variable | ${dut_stats} | ${False}
-| | Set Global Variable | ${uio_driver} | uio_pci_generic
 | | @{plugins_to_enable}= | Create List | dpdk_plugin.so
 | | Set Global Variable | @{plugins_to_enable}