CSIT-530: Add common setup and teardown to perf tests

Change-Id: I2e76de710b4b758eac1d24d447a9c5938f937385
Signed-off-by: Tibor Frank <tifrank@cisco.com>

1 files changed, 112 insertions, 118 deletions

diff --git a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
index 85f46d1b58..08e1198e2a 100644
--- a/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
+++ b/tests/perf/10ge2p1x520-ethip6lispip6-ip6base-ndrchk.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 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,15 +14,18 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Resource | resources/libraries/robot/lisp/lisp_static_adjacency.robot
-# import additional Lisp settings from resource file
 | Variables | resources/test_data/lisp/performance/lisp_static_adjacency.py
+| ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRCHK
 | ... | NIC_Intel-X520-DA2 | IP6FWD | ENCAP | LISP | IP6UNRLAY | IP6OVRLAY
+| ...
 | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
 | ... | L3 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keyword | Remove startup configuration of VPP from all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance ndrchk test teardown
+| ...
 | Documentation | *Reference NDR throughput Lisp tunnel verify test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
@@ -53,22 +56,21 @@
 | | ... | throughput test at 2x 1.56mpps.
 | | [Tags] | 1T1C | STHREAD
 | | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 1.56mpps
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc02-1460B-1t1c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -78,22 +80,21 @@
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 1T1C | STHREAD
 | | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 740000pps
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc03-9000B-1t1c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -103,21 +104,20 @@
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 1T1C | STHREAD
 | | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 120000pps
 | | Given Add '1' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc04-78B-2t2c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -127,22 +127,21 @@
 | | ... | throughput test at 2x 3.2mpps.
 | | [Tags] | 2T2C | MTHREAD
 | | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.2mpps
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc05-1460B-2t2c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -152,22 +151,21 @@
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 2T2C | MTHREAD
 | | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 740000pps
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc06-9000B-2t2c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -177,21 +175,20 @@
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 2T2C | MTHREAD
 | | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 120000pps
 | | Given Add '2' worker threads and rxqueues '1' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc07-78B-4t4c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -201,22 +198,21 @@
 | | ... | throughput test at 2x 3.2mpps.
 | | [Tags] | 4T4C | MTHREAD
 | | ${framesize}= | Set Variable | 78
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 3.2mpps
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc08-1460B-4t4c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -226,22 +222,21 @@
 | | ... | throughput test at 2x 740000pps.
 | | [Tags] | 4T4C | MTHREAD
 | | ${framesize}= | Set Variable | 1460
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 740000pps
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Add No Multi Seg to all DUTs
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Add No Multi Seg to all DUTs
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6
 
 | tc09-9000B-4t4c-ethip6lispip6-ip6base-ndrchk
 | | [Documentation]
@@ -251,19 +246,18 @@
 | | ... | throughput test at 2x 120000pps.
 | | [Tags] | 4T4C | MTHREAD
 | | ${framesize}= | Set Variable | 9000
-| | ${duration}= | Set Variable | 10
 | | ${rate}= | Set Variable | 120000pps
 | | Given Add '4' worker threads and rxqueues '2' in 3-node single-link topo
-| | And   Add PCI devices to DUTs from 3-node single link topology
-| | And   Apply startup configuration on all VPP DUTs
+| | And Add PCI devices to DUTs from 3-node single link topology
+| | And Apply startup configuration on all VPP DUTs
 | | When Lisp IPv6 forwarding initialized in a 3-node circular topology
-| | ...  | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
-| | ...  | ${dut2_to_tg_ip6} | ${prefix6}
-| | And  Set up Lisp topology
-| | ...  | ${dut1} | ${dut1_if2} | ${NONE}
-| | ...  | ${dut2} | ${dut2_if1} | ${NONE}
-| | ...  | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
-| | ...  | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
-| | Then Traffic should pass with no loss | ${duration} | ${rate}
-| | ...                                   | ${framesize} | 3-node-IPv6
+| | ... | ${dut1_to_dut2_ip6} | ${dut1_to_tg_ip6} | ${dut2_to_dut1_ip6}
+| | ... | ${dut2_to_tg_ip6} | ${prefix6}
+| | And Set up Lisp topology
+| | ... | ${dut1} | ${dut1_if2} | ${NONE}
+| | ... | ${dut2} | ${dut2_if1} | ${NONE}
+| | ... | ${duts_locator_set} | ${dut1_ip6_eid} | ${dut2_ip6_eid}
+| | ... | ${dut1_ip6_static_adjacency} | ${dut2_ip6_static_adjacency}
+| | Then Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
+| | ... | ${framesize} | 3-node-IPv6