Explicitly list the NIC type for perf tests

JIRA: CSIT-74
- FIX test names
- list NICs

Change-Id: Ic5dba9381b7bf7129cb0944deb33a86ccdbf2c7b
Signed-off-by: Miroslav Miklus <mmiklus@cisco.com>

9 files changed, 26 insertions, 11 deletions

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index ebdad73b3c..fedfa0876c 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -124,25 +124,25 @@ case "$TEST_TAG" in
     PERFTEST_LONG_BRIDGE )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_bridge_domain \
+              -s "performance.Long_Bridge_Domain*" \
               tests/
         ;;
     PERFTEST_LONG_IPV4 )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_ipv4 \
+              -s "performance.Long_IPv4*" \
               tests/
         ;;
     PERFTEST_LONG_IPV6 )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_ipv6 \
+              -s "performance.Long_IPv6*" \
               tests/
         ;;
     PERFTEST_LONG_XCONNECT )
         pybot -L TRACE \
               -v TOPOLOGY_PATH:${WORKING_TOPOLOGY} \
-              -s performance.long_xconnect \
+              -s "performance.Long_Xconnect*" \
               tests/
         ;;
     * )
diff --git a/tests/suites/performance/long_bridge_domain.robot b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
index e912f8d842..e772a85d64 100644
--- a/tests/suites/performance/long_bridge_domain.robot
+++ b/tests/suites/performance/Long_Bridge_Domain_Intel-X520-DA2.robot
@@ -14,7 +14,9 @@
 | Resource | resources/libraries/robot/performance.robot
 | Library | resources.libraries.python.NodePath
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
-| Suite Setup | 3-node Performance Suite Setup | L2
+| ...        | NIC_Intel-X520-DA2
+| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
 | Test Teardown | Run Keyword | Show statistics on all DUTs
diff --git a/tests/suites/performance/long_ipv4.robot b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
index 91c77d6232..7353340f41 100644
--- a/tests/suites/performance/long_ipv4.robot
+++ b/tests/suites/performance/Long_IPv4_Intel-X520-DA2.robot
@@ -18,7 +18,9 @@
 | Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
 | Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
-| Suite Setup | 3-node Performance Suite Setup | L3
+| ...        | NIC_Intel-X520-DA2
+| 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 | Show statistics on all DUTs
diff --git a/tests/suites/performance/long_ipv6.robot b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
index af7faaebbb..3be3cfb17e 100644
--- a/tests/suites/performance/long_ipv6.robot
+++ b/tests/suites/performance/Long_IPv6_Intel-X520-DA2.robot
@@ -13,7 +13,9 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
-| Suite Setup | 3-node Performance Suite Setup | L3
+| ...        | NIC_Intel-X520-DA2
+| 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 | Show statistics on all DUTs
diff --git a/tests/suites/performance/long_xconnect.robot b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
index e6b62edf4a..d88591f4d1 100644
--- a/tests/suites/performance/long_xconnect.robot
+++ b/tests/suites/performance/Long_Xconnect_Intel-X520-DA2.robot
@@ -15,7 +15,9 @@
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.NodePath
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
-| Suite Setup | 3-node Performance Suite Setup | L2
+| ...        | NIC_Intel-X520-DA2
+| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
 | Test Teardown | Run Keyword | Show statistics on all DUTs
diff --git a/tests/suites/performance/short_bridge_domain.robot b/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot
index f14d8be5ac..8dd7a7d4c8 100644
--- a/tests/suites/performance/short_bridge_domain.robot
+++ b/tests/suites/performance/Short_Bridge_Domain_Intel-X520-DA2.robot
@@ -14,7 +14,9 @@
 | Resource | resources/libraries/robot/performance.robot
 | Library | resources.libraries.python.NodePath
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_SHORT
-| Suite Setup | 3-node Performance Suite Setup | L2
+| ...        | NIC_Intel-X520-DA2
+| Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
+| ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
 | Test Setup | Setup all DUTs before test
 | Test Teardown | Run Keyword | Show statistics on all DUTs
diff --git a/tests/suites/performance/short_ipv4.robot b/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot
index 51ab839549..2cbd2e5b08 100644
--- a/tests/suites/performance/short_ipv4.robot
+++ b/tests/suites/performance/Short_IPv4_Intel-X520-DA2.robot
@@ -18,7 +18,9 @@
 | Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT1']} | WITH NAME | dut1_v4
 | Library | resources.libraries.python.IPv4Setup.Dut | ${nodes['DUT2']} | WITH NAME | dut2_v4
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_SHORT
-| Suite Setup | 3-node Performance Suite Setup | L3
+| ...        | NIC_Intel-X520-DA2
+| 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 | Show statistics on all DUTs
diff --git a/tests/suites/performance/short_ipv6.robot b/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot
index 776dd5f342..83412eb187 100644
--- a/tests/suites/performance/short_ipv6.robot
+++ b/tests/suites/performance/Short_IPv6_Intel-X520-DA2.robot
@@ -13,7 +13,10 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_SHORT
-| Suite Setup | 3-node Performance Suite Setup | L3
+| ...        | NIC_Intel-X520-DA2
+| 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 | Show statistics on all DUTs
diff --git a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot b/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot
index 11ac9eddc8..11ac9eddc8 100644
--- a/tests/suites/performance/short_xconnect_Intel-X520-DA2.robot
+++ b/tests/suites/performance/Short_Xconnect_Intel-X520-DA2.robot