TAGS: minor update in TRex tests tags

- fix ip6 scale tag
- unified order of tags

Signed-off-by: Viliam Luc <vluc@cisco.com>
Change-Id: I173bd8369167f07a118f607a9c1957e354f772b2

12 files changed, 24 insertions, 25 deletions

diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4base-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4base-tg-ndrpdr.robot
index 65d0ab0c5c..e7103e0543 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4base-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4base-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N | BASE
-| ... | TG_DRV_IGB_UIO
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | BASE | IP4BASE | TG_DRV_IGB_UIO
 | ... | ethip4-ip4base-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot
index 882e1a455b..83f7b6cecc 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4-ip4scale2m-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4SCALE2M
-| ... | N2N | SCALE | TG_DRV_IGB_UIO
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | SCALE | IP4SCALE2M | TG_DRV_IGB_UIO
 | ... | ethip4-ip4scale2m-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot
index 22c9d656e9..a999c4f636 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot
@@ -16,9 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH
-| ... | IP4FWD | IP4BASE | N2N | TCP | TCP_CPS | TG_DRV_IGB_UIO | SCALE
-| ... | HOSTS_1024
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | TCP | TCP_CPS | TG_DRV_IGB_UIO | SCALE | HOSTS_1024
 | ... | ethip4tcp-ip4base-h1024-p63-s64512-cps-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot
index 043a259933..b11e740ab1 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | IP4BASE | N2N | TCP | TCP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_1024
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | TCP | TCP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_1024
 | ... | ethip4tcp-ip4base-h1024-p63-s64512-tput-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot
index 24d2117a88..df50ee7482 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | IP4BASE | N2N | TCP | TCP_CPS | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | TCP | TCP_CPS | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
 | ... | ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot
index 5d15757f71..5d71985ad8 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | IP4BASE | N2N | TCP | TCP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | TCP | TCP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
 | ... | ethip4tcp-ip4base-h262144-p63-s16515072-tput-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot
index 50bc2fae45..567c0bb76a 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | N2N | SCALE | IP4BASE | TG_DRV_IGB_UIO | UDP | UDP_CPS | HOSTS_1024
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | UDP | UDP_CPS | TG_DRV_IGB_UIO | SCALE | HOSTS_1024
 | ... | ethip4udp-ip4base-h1024-p63-s64512-cps-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot
index 919912797c..7f5303fff1 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h1024-p63-s64512-tput-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | N2N | IP4BASE | UDP | UDP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_1024
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | UDP | UDP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_1024
 | ... | ethip4udp-ip4base-h1024-p63-s64512-tput-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot
index dc93cb5755..9124f5c21e 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | N2N | SCALE | IP4BASE | TG_DRV_IGB_UIO | UDP | UDP_CPS | HOSTS_262144
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | UDP | UDP_CPS | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
 | ... | ethip4udp-ip4base-h262144-p63-s16515072-cps-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot
index 43852ff7aa..9a549722f7 100644
--- a/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip4/1n1l-10ge2p1x710-ethip4udp-ip4base-h262144-p63-s16515072-tput-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP4FWD
-| ... | IP4BASE | N2N | UDP | UDP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | IP4BASE | UDP | UDP_TPUT | TG_DRV_IGB_UIO | SCALE | HOSTS_262144
 | ... | ethip4udp-ip4base-h262144-p63-s16515072-tput-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6base-tg-ndrpdr.robot b/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6base-tg-ndrpdr.robot
index 91000e2389..43a8d9bb4b 100644
--- a/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6base-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6base-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP6BASE
-| ... | N2N | BASE | IP6BASE | TG_DRV_IGB_UIO
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | BASE | IP6BASE | TG_DRV_IGB_UIO
 | ... | ethip6-ip6base-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic
diff --git a/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot b/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot
index 41bfc86f30..096caf3680 100644
--- a/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot
+++ b/tests/trex/perf/ip6/1n1l-10ge2p1x710-ethip6-ip6scale2m-tg-ndrpdr.robot
@@ -16,8 +16,8 @@
 |
 | Force Tags | 1_NODE_SINGLE_LINK_TOPO | 2_NODE_SINGLE_LINK_TOPO
 | ... | 3_NODE_SINGLE_LINK_TOPO
-| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | IP6SCALE2M
-| ... | N2N | BASE | IP6BASE | TG_DRV_IGB_UIO
+| ... | PERFTEST | HW_ENV | NDRPDR | NIC_Intel-X710 | TREX | ETH | N2N
+| ... | SCALE | IP6SCALE2M | TG_DRV_IGB_UIO
 | ... | ethip6-ip6scale2m-tg
 |
 | Suite Setup | Setup suite topology interfaces with no DUT | performance_tg_nic