Report: Add rls data, NAT44 ED TCP tput for 2n-dnv

Signed-off-by: Tibor Frank <tifrank@cisco.com>
Change-Id: I5271663ae073d38520581f732afcbeb2f7006651
(cherry picked from commit 8b2c88965335c951db5a4d1eaec65372a82c43c8)

2 files changed, 72 insertions, 6 deletions

diff --git a/resources/tools/presentation/specifications/report/data_sets.yaml b/resources/tools/presentation/specifications/report/data_sets.yaml
index b005325f51..85cb48bf28 100644
--- a/resources/tools/presentation/specifications/report/data_sets.yaml
+++ b/resources/tools/presentation/specifications/report/data_sets.yaml
@@ -1230,15 +1230,15 @@
       - 31  # rls2210.rel NDRPDR cov env 11
       - 32  # rls2210.rel NDRPDR cov env 11
       - 33  # rls2210.rel NDRPDR cov env 11
-      # - 34  # rls2210.rel NDRPDR cov env 11
+      - 34  # rls2210.rel NDRPDR cov env 11
       - 35  # rls2210.rel NDRPDR cov env 11
       - 36  # rls2210.rel NDRPDR cov env 11
       - 37  # rls2210.rel NDRPDR cov env 11
-      # - 38  # rls2210.rel NDRPDR cov env 11
-      # - 39  # rls2210.rel NDRPDR cov env 11
-      # - 40  # rls2210.rel NDRPDR cov env 11
-      # - 41  # rls2210.rel NDRPDR cov env 11
-      # - 42  # rls2210.rel NDRPDR cov env 11
+      - 38  # rls2210.rel NDRPDR cov env 11
+      - 39  # rls2210.rel NDRPDR cov env 11
+      - 40  # rls2210.rel NDRPDR cov env 11
+      - 41  # rls2210.rel NDRPDR cov env 11
+      - 42  # rls2210.rel NDRPDR cov env 11
 
   dpdk-3n-icx-hist-iter:
     csit-dpdk-perf-report-iterative-2202-3n-icx:
diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml
index ab4e38c883..1ae604bf01 100644
--- a/resources/tools/presentation/specifications/report/elements.yaml
+++ b/resources/tools/presentation/specifications/report/elements.yaml
@@ -7080,6 +7080,40 @@
     layout: "plot-throughput"
 
 - type: "plot"
+  title: "Throughput: 2n-dnv-x553-100b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-100b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-{core}-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-{core}-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-{core}-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-100b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
+  title: "Throughput: 2n-dnv-x553-1518b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  algorithm: "plot_ndrpdr_box_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-1518b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+  data: "vpp-2n-dnv-curr-iter"
+  core: ["1t1c", ]
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.1518b-{core}-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.1518b-{core}-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.1518b-{core}-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.1518b-{core}-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.1518b-{core}-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.1518b-{core}-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-1518b-{core}-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput"
+
+- type: "plot"
   title: "Throughput: 3n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
   algorithm: "plot_ndrpdr_box_name"
   output-file: "{DIR[STATIC,VPP]}/3n-dnv-x553-78b-{core}-ip6routing-base-scale-ixgbe-{test_type}"
@@ -8101,6 +8135,38 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
+  title: "Speedup: 2n-dnv-x553-100b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-100b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.100B-.t.c-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.100B-.t.c-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.100B-.t.c-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-100b-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
+  title: "Speedup: 2n-dnv-x553-1518b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  algorithm: "plot_tsa_name"
+  output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-1518b-nat44ed-ip4routing-tcp-tput-{test_type}-tsa"
+  data: "vpp-2n-dnv-curr-iter"
+  include:
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H1024-P63-S64512-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-ip4base-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H16384-P63-S1032192-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-ip4base-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Ip4Base-H65536-P63-S4128768-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-ip4base-h65536-p63-s4128768-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H1024-P63-S64512-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-nat44ed-h1024-p63-s64512-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H16384-P63-S1032192-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-nat44ed-h16384-p63-s1032192-tput-ndrpdr"
+    - "Tests.Vpp.Perf.Ip4.2N1L-10Ge2P1X553-Ethip4Tcp-Nat44Ed-H65536-P63-S4128768-Tput-Ndrpdr.1518b-.t.c-ethip4tcp-nat44ed-h65536-p63-s4128768-tput-ndrpdr"
+  layout:
+    title: "2n-dnv-x553-1518b-nat44ed-ip4routing-tcp-tput-{test_type}"
+    layout: "plot-throughput-speedup-analysis"
+
+- type: "plot"
   title: "Speedup: 2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"
   algorithm: "plot_tsa_name"
   output-file: "{DIR[STATIC,VPP]}/2n-dnv-x553-78b-ip6routing-base-scale-[ixgbe,af_xdp]-{test_type}-tsa"