Report: Add NAT44 data

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

2 files changed, 41 insertions, 52 deletions

diff --git a/docs/report/introduction/report_history.rst b/docs/report/introduction/report_history.rst
index 963a7f9356..b894b9a383 100644
--- a/docs/report/introduction/report_history.rst
+++ b/docs/report/introduction/report_history.rst
@@ -14,7 +14,7 @@ below.
 |                |      - 3n-skx                                              |
 |                |      - 3n-tsh                                              |
 |                |                                                            |
-|                | 2. Added NAT44 data and graphs:                            |
+|                | 2. Added NAT44 iterative and coverage data and graphs:     |
 |                |                                                            |
 |                |    - 2n-clx                                                |
 |                |    - 2n-skx                                                |
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 71b8342a8d..045be1e347 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -255,16 +255,8 @@
         - 44  # rls2009 NDRPDR iter env 5
         - 46  # rls2009 NDRPDR iter env 5
         - 48  # rls2009 NDRPDR iter env 5
-        - 51  # rls2009 NDRPDR iter NAT44 env 5
-        - 52  # rls2009 NDRPDR iter NAT44 env 5
-        - 53  # rls2009 NDRPDR iter NAT44 env 5
-        - 54  # rls2009 NDRPDR iter NAT44 env 5
-        - 55  # rls2009 NDRPDR iter NAT44 env 5
-        - 56  # rls2009 NDRPDR iter NAT44 env 5
-        - 57  # rls2009 NDRPDR iter NAT44 env 5
-        - 58  # rls2009 NDRPDR iter NAT44 env 5
-        - 59  # rls2009 NDRPDR iter NAT44 env 5
-        - 60  # rls2009 NDRPDR iter NAT44 env 5
+        - 74  # rls2009 NDRPDR iter NAT44 env 5
+        - 75  # rls2009 NDRPDR iter NAT44 env 5
 
     plot-vpp-hdrh-lat-2n-skx:
       csit-vpp-perf-report-iterative-2009-2n-skx:
@@ -272,7 +264,7 @@
 
     plot-vpp-hdrh-lat-2n-skx-nat44:
       csit-vpp-perf-report-iterative-2009-2n-skx:
-        - 51  # rls2009 NDRPDR iter NAT44 env 5
+        - 74  # rls2009 NDRPDR iter NAT44 env 5
 
     plot-vpp-soak-2n-skx:
       csit-vpp-perf-report-iterative-2009-2n-skx:
@@ -340,11 +332,16 @@
         - 88  # rls2009 NDRPDR iter env 5
         - 89  # rls2009 NDRPDR iter env 5
         - 90  # rls2009 NDRPDR iter env 5
+        - 91  # rls2009 NDRPDR iter NAT44 env 5
 
     plot-vpp-hdrh-lat-2n-clx:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 36  # rls2009 NDRPDR iter env 5
 
+    plot-vpp-hdrh-lat-2n-clx-nat44:
+      csit-vpp-perf-report-iterative-2009-2n-clx:
+        - 91  # rls2009 NDRPDR iter NAT44 env 5
+
     plot-vpp-nfv-2n-clx-ndrpdr:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 37  # rls2009 nf-density iter env 5
@@ -499,16 +496,8 @@
         - 44  # rls2009 NDRPDR iter env 5
         - 46  # rls2009 NDRPDR iter env 5
         - 48  # rls2009 NDRPDR iter env 5
-        - 51  # rls2009 NDRPDR iter NAT44 env 5
-        - 52  # rls2009 NDRPDR iter NAT44 env 5
-        - 53  # rls2009 NDRPDR iter NAT44 env 5
-        - 54  # rls2009 NDRPDR iter NAT44 env 5
-        - 55  # rls2009 NDRPDR iter NAT44 env 5
-        - 56  # rls2009 NDRPDR iter NAT44 env 5
-        - 57  # rls2009 NDRPDR iter NAT44 env 5
-        - 58  # rls2009 NDRPDR iter NAT44 env 5
-        - 59  # rls2009 NDRPDR iter NAT44 env 5
-        - 60  # rls2009 NDRPDR iter NAT44 env 5
+        - 74  # rls2009 NDRPDR iter NAT44 env 5
+        - 75  # rls2009 NDRPDR iter NAT44 env 5
 
     vpp-nic-comparison-3n-skx-mrr:
       csit-vpp-perf-report-iterative-2009-3n-skx:
@@ -855,16 +844,8 @@
         - 44  # rls2009 NDRPDR iter env 5
         - 46  # rls2009 NDRPDR iter env 5
         - 48  # rls2009 NDRPDR iter env 5
-        - 51  # rls2009 NDRPDR iter NAT44 env 5
-        - 52  # rls2009 NDRPDR iter NAT44 env 5
-        - 53  # rls2009 NDRPDR iter NAT44 env 5
-        - 54  # rls2009 NDRPDR iter NAT44 env 5
-        - 55  # rls2009 NDRPDR iter NAT44 env 5
-        - 56  # rls2009 NDRPDR iter NAT44 env 5
-        - 57  # rls2009 NDRPDR iter NAT44 env 5
-        - 58  # rls2009 NDRPDR iter NAT44 env 5
-        - 59  # rls2009 NDRPDR iter NAT44 env 5
-        - 60  # rls2009 NDRPDR iter NAT44 env 5
+        - 74  # rls2009 NDRPDR iter NAT44 env 5
+        - 75  # rls2009 NDRPDR iter NAT44 env 5
 
     vpp-performance-changes-2n-clx-h1:
       csit-vpp-perf-report-iterative-2005-2n-clx:
@@ -912,6 +893,7 @@
         - 88  # rls2009 NDRPDR iter env 5
         - 89  # rls2009 NDRPDR iter env 5
         - 90  # rls2009 NDRPDR iter env 5
+        - 91  # rls2009 NDRPDR iter NAT44 env 5
 
     vpp-performance-changes-2n-dnv-h1:
       csit-vpp-perf-verify-2001-2n-dnv:
@@ -1464,16 +1446,8 @@
         - 44  # rls2009 NDRPDR iter env 5
         - 46  # rls2009 NDRPDR iter env 5
         - 48  # rls2009 NDRPDR iter env 5
-        - 51  # rls2009 NDRPDR iter NAT44 env 5
-        - 52  # rls2009 NDRPDR iter NAT44 env 5
-        - 53  # rls2009 NDRPDR iter NAT44 env 5
-        - 54  # rls2009 NDRPDR iter NAT44 env 5
-        - 55  # rls2009 NDRPDR iter NAT44 env 5
-        - 56  # rls2009 NDRPDR iter NAT44 env 5
-        - 57  # rls2009 NDRPDR iter NAT44 env 5
-        - 58  # rls2009 NDRPDR iter NAT44 env 5
-        - 59  # rls2009 NDRPDR iter NAT44 env 5
-        - 60  # rls2009 NDRPDR iter NAT44 env 5
+        - 74  # rls2009 NDRPDR iter NAT44 env 5
+        - 75  # rls2009 NDRPDR iter NAT44 env 5
     vpp-compare-testbeds-skx-clx-cmp:
       csit-vpp-perf-report-iterative-2009-2n-clx:
         - 36  # rls2009 NDRPDR iter env 5
@@ -1486,6 +1460,7 @@
         - 88  # rls2009 NDRPDR iter env 5
         - 89  # rls2009 NDRPDR iter env 5
         - 90  # rls2009 NDRPDR iter env 5
+        - 91  # rls2009 NDRPDR iter NAT44 env 5
 
     vpp-compare-testbeds-hsw-clx-ref:
       csit-vpp-perf-report-iterative-2009-3n-hsw:
@@ -2700,16 +2675,18 @@
       - 44  # rls2009 NDRPDR iter env 5
       - 46  # rls2009 NDRPDR iter env 5
       - 48  # rls2009 NDRPDR iter env 5
-      - 51  # rls2009 NDRPDR iter NAT44 env 5
-      - 52  # rls2009 NDRPDR iter NAT44 env 5
-      - 53  # rls2009 NDRPDR iter NAT44 env 5
-      - 54  # rls2009 NDRPDR iter NAT44 env 5
-      - 55  # rls2009 NDRPDR iter NAT44 env 5
-      - 56  # rls2009 NDRPDR iter NAT44 env 5
-      - 57  # rls2009 NDRPDR iter NAT44 env 5
-      - 58  # rls2009 NDRPDR iter NAT44 env 5
-      - 59  # rls2009 NDRPDR iter NAT44 env 5
-      - 60  # rls2009 NDRPDR iter NAT44 env 5
+      - 74  # rls2009 NDRPDR iter NAT44 env 5
+      - 75  # rls2009 NDRPDR iter NAT44 env 5
+#      - 51  # rls2009 NDRPDR iter NAT44 env 5
+#      - 52  # rls2009 NDRPDR iter NAT44 env 5
+#      - 53  # rls2009 NDRPDR iter NAT44 env 5
+#      - 54  # rls2009 NDRPDR iter NAT44 env 5
+#      - 55  # rls2009 NDRPDR iter NAT44 env 5
+#      - 56  # rls2009 NDRPDR iter NAT44 env 5
+#      - 57  # rls2009 NDRPDR iter NAT44 env 5
+#      - 58  # rls2009 NDRPDR iter NAT44 env 5
+#      - 59  # rls2009 NDRPDR iter NAT44 env 5
+#      - 60  # rls2009 NDRPDR iter NAT44 env 5
       - 38  # rls2009 nf-density iter env 5
       - 41  # rls2009 nf-density iter env 5
       - 45  # rls2009 nf-density iter env 5
@@ -2795,6 +2772,7 @@
       - 88  # rls2009 NDRPDR iter env 5
       - 89  # rls2009 NDRPDR iter env 5
       - 90  # rls2009 NDRPDR iter env 5
+      - 91  # rls2009 NDRPDR iter NAT44 env 5
       - 37  # rls2009 nf-density iter env 5
       - 43  # rls2009 nf-density iter env 5
       - 69  # rls2009 nf-density iter env 5
@@ -20321,6 +20299,17 @@
     layout: "plot-hdrh-latency-by-percentile"
 
 - type: "plot"
+  title: "Latency by percentile: 2n-clx-nat44"
+  algorithm: "plot_hdrh_lat_by_percentile"
+  output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-2n-clx"
+  output-file-links: "{DIR[LAT,VPP]}/2n_clx.rst"
+  target-links: "../../_static/vpp"
+  data: "plot-vpp-hdrh-lat-2n-clx-nat44"
+  filter: "'2T1C' and 'NIC_Intel-XXV710'"
+  layout:
+    layout: "plot-hdrh-latency-by-percentile"
+
+- type: "plot"
   title: "Latency by percentile: 3n-hsw"
   algorithm: "plot_hdrh_lat_by_percentile"
   output-file: "{DIR[STATIC,VPP]}/hdrh-lat-percentile-3n-hsw"