From cf9fbdf9e597dbdcb89823a3151c5396eadea70c Mon Sep 17 00:00:00 2001
From: Jan Gelety <jgelety@cisco.com>
Date: Fri, 13 Dec 2019 16:11:58 +0100
Subject: Trending: new daily set

New daily sets are prepared based on information in
https://gerrit.fd.io/r/c/csit/+/24073/1/docs/job_specs/perf_tests_job_specs.md
and previous test set definitions in
docs/job_specs/test_select_list_[2n|3n]_[clx|skx|hsw|tsh|dnv].md
files.

- mrr-daily-2n-clx: 510 TCs (incl. nfv_density), expected exec. time 8:50h
- mrr-daily-2n-skx: 525 TCs (incl. nfv_density), expected exec. time 7:55h
- mrr-daily-3n-skx: 393 TCs (incl. nfv_density), expected exec. time 11:00h
- mrr-daily-3n-hsw: 177 TCs (incl. nfv_density), expected exec. time 7:10h
- mrr-daily-3n-tsh: 204 TCs, expected exec. time 21:00h
- mrr-daily-2n-dnv: 84 TCs, expected exec. time 2:25h
- mrr-daily-3n-dnv: 144 TCs, expected exec. time 6:35h

+ add some missing test suites
+ add trex-sl-2n-ethip4udp-1000u15p.py T-Rex traffic profile
+ correction of TS and TC names and tags in directory
  tests/vpp/perf/nfv_density/chain_ipsec

Change-Id: Icfc86e9af97ed8dd8ccd2a34355c99aad69a28c0
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---
 resources/libraries/robot/l2/l2_xconnect.robot | 27 ++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'resources/libraries/robot/l2')

diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot
index a0c1c24a5d..a08c286a88 100644
--- a/resources/libraries/robot/l2/l2_xconnect.robot
+++ b/resources/libraries/robot/l2/l2_xconnect.robot
@@ -156,7 +156,7 @@
 | | | ... | nf_nodes=${nf_nodes}
 | | END
 
-| Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
+| Initialize L2 xconnect with Vhost-User and VLAN in circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
 | | ... | connect each Vhost interface with one physical interface.
@@ -174,19 +174,30 @@
 | | [Arguments] | ${subid} | ${tag_rewrite}
 | |
 | | Set interfaces in path up
-| | Initialize VLAN dot1q sub-interfaces in circular topology
+| |
+| | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Initialize VLAN dot1q sub-interfaces in circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | Configure L2 tag rewrite method on interfaces
-| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
-| | ... | ${tag_rewrite}
+| | ... | ELSE | Initialize VLAN dot1q sub-interfaces in circular topology
+| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid}
+| | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Configure L2 tag rewrite method on interfaces | ${dut1}
+| | ... | ${subif_index_1} | ${dut2} | ${subif_index_2} | ${tag_rewrite}
+| | ... | ELSE | Configure L2 tag rewrite method on interfaces
+| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite}
+| |
 | | Configure vhost interfaces
 | | ... | ${dut1} | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2
 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1}
 | | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2}
-| | Configure vhost interfaces
+| |
+| | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Configure vhost interfaces
 | | ... | ${dut2} | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2
-| | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1}
-| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1}
+| | Run Keyword If | '${dut2_status}' == 'PASS'
+| | ... | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
 
 | Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology
 | | [Documentation]
-- 
cgit 1.2.3-korg