feat(jobspec): improve tput selection

+ Revert bad edit on 2n-dnv, add 1518b back.
+ Add 1c ip4base tput everywhere nat44ed tput is tested.
 + Both tcp and udp.
+ Use only 1c tests for ip4base tput.
+ Use the same selection in mrr as in mlr.
- 2n-tx2 and 2n-zn2 still have no ASTF tests.
- ASTF tests still only tested on xxv710, no 100ge tests yet.

Change-Id: I0bfc1fa372c5020f1a6f2f4564c4b44f578ac328
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

2 files changed, 24 insertions, 48 deletions

diff --git a/docs/job_specs/report_iterative/2n-dnv/vpp-mlr-00.md b/docs/job_specs/report_iterative/2n-dnv/vpp-mlr-00.md
index d8ef72a30b..0fc8bf4f91 100644
--- a/docs/job_specs/report_iterative/2n-dnv/vpp-mlr-00.md
+++ b/docs/job_specs/report_iterative/2n-dnv/vpp-mlr-00.md
@@ -18,46 +18,34 @@
 4c AND 64b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
 ##### ethip4tcp-ip4base-h1024-p63-s64512-tput
 1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
 ##### ethip4tcp-ip4base-h16384-p63-s1032192-tput
 1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
 ##### ethip4tcp-ip4base-h65536-p63-s4128768-tput
 1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-tput
 1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
+2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
+4c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 ##### ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
-1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
+2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
+4c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 ##### ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
-1c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
-2c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
-4c AND 100b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
+1c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
+2c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
+4c AND 1518b AND ndrpdr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 ## ./ip4_tunnels
 ## ./ip6
 ### intel-x553
diff --git a/docs/job_specs/report_iterative/2n-dnv/vpp-mrr-00.md b/docs/job_specs/report_iterative/2n-dnv/vpp-mrr-00.md
index f91b44028c..a5bb2297d5 100644
--- a/docs/job_specs/report_iterative/2n-dnv/vpp-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-dnv/vpp-mrr-00.md
@@ -18,46 +18,34 @@
 4c AND 64b AND mrr AND x553 AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
 ##### ethip4tcp-ip4base-h1024-p63-s64512-tput
 1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
+1c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h1024-p63-s64512-tput
 ##### ethip4tcp-ip4base-h16384-p63-s1032192-tput
 1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
+1c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h16384-p63-s1032192-tput
 ##### ethip4tcp-ip4base-h65536-p63-s4128768-tput
 1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
+1c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-ip4base-h65536-p63-s4128768-tput
 ##### ethip4tcp-nat44ed-h1024-p63-s64512-tput
 1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
+1c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
+2c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
+4c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h1024-p63-s64512-tput
 ##### ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
-1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
+1c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
+2c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
+4c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h16384-p63-s1032192-tput
 ##### ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
-1c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
-2c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
-4c AND 100b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
+1c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
+2c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
+4c AND 1518b AND mrr AND x553 AND drv_vfio_pci AND ethip4tcp-nat44ed-h65536-p63-s4128768-tput
 ## ./ip4_tunnels
 ## ./ip6
 ### intel-x553