Trending: Add TRex ndrpdr tests

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

4 files changed, 83 insertions, 8 deletions

diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index 7f4c050b29..5cc56fd965 100644
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -217,9 +217,6 @@ def _generate_trending_traces(in_data, job_name, build_info,
         else:
             hover_str = hover_str.replace(u"<stdev>", u"")
         if incl_tests == u"pdr-lat":
-            hover_str = hover_str.replace(
-                u"throughput [Mpps]", u"latency [s]"
-            )
             hover_str = hover_str.replace(u"<val>", u"{value:.1e}")
         else:
             hover_str = hover_str.replace(u"<val>", u"{value:.3f}")
@@ -227,7 +224,7 @@ def _generate_trending_traces(in_data, job_name, build_info,
             hover_str = hover_str.replace(u"[Mpps]", u"[Mcps]").\
                 replace(u"throughput", u"connection rate")
         if u"dpdk" in job_name:
-            hover_text.append(hover_str.format(
+            hover_str = hover_str.format(
                 date=date,
                 property=u"average" if incl_tests == u"mrr" else u"throughput",
                 value=data_y_mpps[index],
@@ -236,9 +233,9 @@ def _generate_trending_traces(in_data, job_name, build_info,
                 test=incl_tests,
                 period=u"weekly",
                 build_nr=str_key,
-                testbed=build_info[job_name][str_key][2]))
+                testbed=build_info[job_name][str_key][2])
         elif u"vpp" in job_name:
-            hover_text.append(hover_str.format(
+            hover_str = hover_str.format(
                 date=date,
                 property=u"average" if incl_tests == u"mrr" else u"throughput",
                 value=data_y_mpps[index],
@@ -247,8 +244,12 @@ def _generate_trending_traces(in_data, job_name, build_info,
                 test=incl_tests,
                 period=u"daily" if incl_tests == u"mrr" else u"weekly",
                 build_nr=str_key,
-                testbed=build_info[job_name][str_key][2]))
-
+                testbed=build_info[job_name][str_key][2])
+        if incl_tests == u"pdr-lat":
+            hover_str = hover_str.replace(
+                u"throughput [Mpps]", u"latency [s]"
+            )
+        hover_text.append(hover_str)
         xaxis.append(datetime(int(date[0:4]), int(date[4:6]), int(date[6:8]),
                               int(date[9:11]), int(date[12:])))
 
diff --git a/resources/tools/presentation/specifications/trending/data_sets.yaml b/resources/tools/presentation/specifications/trending/data_sets.yaml
index 2d61c3c042..f40fe1fb9a 100644
--- a/resources/tools/presentation/specifications/trending/data_sets.yaml
+++ b/resources/tools/presentation/specifications/trending/data_sets.yaml
@@ -59,6 +59,9 @@
   table-last-failed-tests-dpdk-2n-tx2:
     csit-dpdk-perf-mrr-weekly-master-2n-tx2:
       - "lastCompletedBuild"
+  table-last-failed-tests-trex-2n-skx-ndrpdr:
+    csit-trex-perf-ndrpdr-weekly-master-2n-skx:
+      - "lastCompletedBuild"
 
   # 3n-skx
   plot-performance-trending-all-3n-skx:
@@ -112,6 +115,12 @@
       end: "lastCompletedBuild"
       max-builds: 26
 
+  plot-ndrpdr-trending-trex-2n-skx:
+    csit-trex-perf-ndrpdr-weekly-master-2n-skx:
+      start: 3
+      end: "lastCompletedBuild"
+      max-builds: 26
+
   # 2n-clx
   plot-performance-trending-vpp-2n-clx:
     csit-vpp-perf-mrr-daily-master-2n-clx:
diff --git a/resources/tools/presentation/specifications/trending/elements.yaml b/resources/tools/presentation/specifications/trending/elements.yaml
index d9f2120a03..83a6a03e27 100644
--- a/resources/tools/presentation/specifications/trending/elements.yaml
+++ b/resources/tools/presentation/specifications/trending/elements.yaml
@@ -51,6 +51,14 @@
     layout: "plot-statistics"
 
 - type: "plot"
+  title: "Statistics: TRex 2n-skx ndrpdr"
+  algorithm: "plot_statistics"
+  output-file: "{DIR[STATIC,VPP]}/stats-trex-2n-skx-ndrpdr"
+  data: "plot-ndrpdr-trending-trex-2n-skx"
+  layout:
+    layout: "plot-statistics"
+
+- type: "plot"
   title: "Statistics: 2n-clx mrr"
   algorithm: "plot_statistics"
   output-file: "{DIR[STATIC,VPP]}/stats-2n-clx-mrr"
@@ -5002,3 +5010,58 @@
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-{core}-avf-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr"
         - "Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Avf-Ethip4Vxlan-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-{core}-avf-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr"
       layout: "plot-cpta"
+
+# TRex 2n-skx
+
+    - title: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
+      output-file-name: "2n-skx-x710-64b--ip4-base-scale-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Base-Tg-Ndrpdr.64B--ethip4-ip4base-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4-Ip4Scale2M-Tg-Ndrpdr.64B--ethip4-ip4scale2m-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+      output-file-name: "2n-skx-x710-64b--ip4routing-stf-cps-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-cps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-Cps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-cps-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+      output-file-name: "2n-skx-x710-64b--ip4routing-stf-pps-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Tcp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4tcp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H1024-P63-S64512-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h1024-p63-s64512-pps-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip4.1N1L-10Ge2P1X710-Ethip4Udp-Ip4Base-H262144-P63-S16515072-pps-Tg-Ndrpdr.64B--ethip4udp-ip4base-h262144-p63-s16515072-pps-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
+      output-file-name: "2n-skx-x710-78b--ip6-base-scale-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Base-Tg-Ndrpdr.78B--ethip6-ip6base-tg-ndrpdr"
+        - "Tests.Trex.Perf.Ip6.1N1L-10Ge2P1X710-Ethip6-Ip6Scale2M-Tg-Ndrpdr.78B--ethip6-ip6scale2m-tg-ndrpdr"
+      layout: "plot-cpta"
+
+    - title: "2n-skx-x710-64b--l2-scale-{test_type}"
+      output-file-name: "2n-skx-x710-64b--l2-scale-{test_type}"
+      data: "plot-ndrpdr-trending-trex-2n-skx"
+      core: ["2t1c", ]
+      test-type: ["ndr", "pdr"]
+      include:
+        - "Tests.Trex.Perf.L2.1N1L-10Ge2P1X710-Eth-L2Bdscale1Mmaclrn-Tg-Ndrpdr.64B--eth-l2bdscale1mmaclrn-tg-ndrpdr"
+      layout: "plot-cpta"
diff --git a/resources/tools/presentation/specifications/trending/environment.yaml b/resources/tools/presentation/specifications/trending/environment.yaml
index 7c9ade3ea7..2440b653e7 100644
--- a/resources/tools/presentation/specifications/trending/environment.yaml
+++ b/resources/tools/presentation/specifications/trending/environment.yaml
@@ -176,6 +176,7 @@
           - "last-failed-tests-vpp-2n-skx-ndrpdr"
           - "last-failed-tests-vpp-3n-skx-ndrpdr"
           - "last-failed-tests-vpp-2n-clx-ndrpdr"
+          - "last-failed-tests-trex-2n-skx-mrr"
         urls:
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx"
@@ -195,6 +196,7 @@
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-3n-skx"
           - "https://jenkins.fd.io/view/csit/job/csit-vpp-perf-ndrpdr-weekly-master-2n-clx"
+          - "https://jenkins.fd.io/view/csit/job/csit-trex-perf-ndrpdr-weekly-master-2n-skx"
         url-details: "https://s3-docs.fd.io/csit/master/trending/introduction/failures.html"
 
     configurations: