X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fsuites%2Fperformance%2Fshort_xconnect.robot;h=55e05237b32f94f34208605088ff4a0a2893d110;hp=7eff81cdced6ae23481360c03d9d1bf6b538ad10;hb=4b2b04f21eee90ee3c9b4ebed2d8546dbc7be8e1;hpb=4ae37074a3e74bd6fdcd606d1553b99131372c84

diff --git a/tests/suites/performance/short_xconnect.robot b/tests/suites/performance/short_xconnect.robot
index 7eff81cdce..55e05237b3 100644
--- a/tests/suites/performance/short_xconnect.robot
+++ b/tests/suites/performance/short_xconnect.robot
@@ -11,57 +11,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 *** Settings ***
-| Resource | resources/libraries/robot/default.robot
-| Resource | resources/libraries/robot/interfaces.robot
-| Resource | resources/libraries/robot/l2_xconnect.robot
 | Resource | resources/libraries/robot/performance.robot
-| Resource | resources/libraries/robot/counters.robot
-| Library | resources.libraries.python.TrafficGenerator
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV| PERFTEST_SHORT
-| Suite Setup | 3-node Performance Suite Setup
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_SHORT
+| Suite Setup | 3-node Performance Suite Setup | L2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
 | Test Teardown  | Run Keyword If Test Failed | Show statistics on all DUTs
 
 *** Test Cases ***
 | 1core VPP passes 64B frames through L2 cross connect at 3.5mpps in 3-node topology
+| | ${framesize}= | Set Variable | 64
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 3.5mpps
 | | Given L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 3.5mpps | 64 | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${duration} | ${rate} | ${framesize} | 3-node-xconnect
 
 | 1core VPP passes 1518B frames through L2 cross connect at 10gbps in 3-node topology
+| | ${framesize}= | Set Variable | 1518
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
 | | Given L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 10gbps | 1518 | 3-node-xconnect
+| | Then Traffic should pass with no loss | ${duration} | ${rate} | ${framesize} | 3-node-xconnect
 
 | 1core VPP passes 9000B frames through L2 cross connect at 10gbps in 3-node topology
+| | ${framesize}= | Set Variable | 9000
+| | ${duration}= | Set Variable | 10
+| | ${rate}= | Set Variable | 10gbps
 | | Given L2 xconnect initialized in a 3-node circular topology
-| | Then Traffic should pass with no loss | 10 | 10gbps | 9000 | 3-node-xconnect
-
-*** Keywords ***
-
-| 3-node Performance Suite Setup
-| | 3-node circular Topology Variables Setup
-| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
-| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | ...                          | L2
-
-| 3-node Performance Suite Teardown
-| | Teardown traffic generator | ${tg}
-
-| L2 xconnect initialized in a 3-node circular topology
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | All Vpp Interfaces Ready Wait | ${nodes}
-
-| Traffic should pass with no loss
-| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | Send traffic on | ${tg} | ${duration}
-| | ...             | ${rate} | ${framesize} | ${topology_type}
-| | No traffic loss occured
-
-| Show statistics on all DUTs
-| | Sleep | 10 | Waiting for statistics to be collected
-| | Vpp show stats | ${dut1}
-| | Vpp show stats | ${dut2}
+| | Then Traffic should pass with no loss | ${duration} | ${rate} | ${framesize} | 3-node-xconnect