X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Ftest_setup.robot;h=3bc88858c0597811c484d2229052d677b937f033;hb=585b2e3c08cb87badfe702eb29300634c761a17b;hp=17e9e6c459184f8b597a38b71bfed5a0cd5db2b3;hpb=1577123a3c27541181097cb4186aa8855f20b1cc;p=csit.git

diff --git a/resources/libraries/robot/shared/test_setup.robot b/resources/libraries/robot/shared/test_setup.robot
index 17e9e6c459..3bc88858c0 100644
--- a/resources/libraries/robot/shared/test_setup.robot
+++ b/resources/libraries/robot/shared/test_setup.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:
@@ -15,43 +15,38 @@
 
 *** Settings ***
 | Library | resources.libraries.python.PapiHistory
-| ...
+|
 | Documentation | Test Setup keywords.
 
 *** Keywords ***
 | Setup test
 | | [Documentation]
-| | ... | Common test setup for tests.
-| | ...
+| | ... | Common test setup for VPP tests.
+| |
 | | ... | *Arguments:*
 | | ... | - ${actions} - Additional setup action. Type: list
-| | ...
+| |
 | | [Arguments] | @{actions}
-| | ...
+| |
+| | Start Test Export
 | | Reset PAPI History On All DUTs | ${nodes}
+| | ${int} = | Set Variable If | ${nic_vfs} > 0 | prevf | pf
 | | Create base startup configuration of VPP on all DUTs
-| | :FOR | ${action} | IN | @{actions}
+| | FOR | ${action} | IN | @{actions}
 | | | Run Keyword | Additional Test Setup Action For ${action}
+| | END
 
 | Additional Test Setup Action For namespace
 | | [Documentation]
 | | ... | Additional Setup for tests which uses namespace.
-| | ...
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Clean Up Namespaces | ${nodes['${dut}']}
+| | END
 
-| Additional Test Setup Action For ligato
+| Additional Test Setup Action For performance
 | | [Documentation]
-| | ... | Additional Setup for tests which uses Ligato Kubernetes.
-| | ...
-| | Apply Kubernetes resource on all duts | ${nodes} | namespaces/csit.yaml
-| | Apply Kubernetes resource on all duts | ${nodes} | pods/kafka.yaml
-| | Apply Kubernetes resource on all duts | ${nodes} | pods/etcdv3.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | configmaps/vswitch-agent-cfg.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | configmaps/vnf-agent-cfg.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | pods/contiv-sfc-controller.yaml
-| | Apply Kubernetes resource on all duts | ${nodes}
-| | ... | pods/contiv-vswitch.yaml
+| | ... | Additional Setup for tests which uses namespace.
+| |
+| | ${trex_running}= | Is Trex Running | ${tg}
+| | Run Keyword Unless | ${trex_running} | Startup Trex | ${tg} | ${osi_layer}