Trending: TSH ipsec tests

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

4 files changed, 101 insertions, 20 deletions

diff --git a/docs/cpta/data/index.rst b/docs/cpta/data/index.rst
index a844ae629f..c9cc4902c4 100644
--- a/docs/cpta/data/index.rst
+++ b/docs/cpta/data/index.rst
@@ -26,6 +26,16 @@ in the ASCII and CSV formats:
         - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-tsh-trending.txt>`_
         - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-tsh-trending.csv>`_
 
+    - 3n-dnv
+
+        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-dnv-trending.txt>`_
+        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-3n-dnv-trending.csv>`_
+
+    - 2n-dnv
+
+        - `ASCII format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-dnv-trending.txt>`_
+        - `CSV format <../_static/vpp/cpta-csit-vpp-perf-mrr-daily-master-2n-dnv-trending.csv>`_
+
 **DPDK**
 
     - 3n-hsw
diff --git a/docs/cpta/trending/ipsecsw-3n-tsh-x520-64b-base-scale.rst b/docs/cpta/trending/ipsecsw-3n-tsh-x520-64b-base-scale.rst
index 930782242a..e433725d15 100644
--- a/docs/cpta/trending/ipsecsw-3n-tsh-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/ipsecsw-3n-tsh-x520-64b-base-scale.rst
@@ -1,17 +1,17 @@
-3n-tsh-x520-64b-base-scale-sw
------------------------------
+3n-tsh-x520-64b-base-scale-sw-int
+---------------------------------
 
 1t1c
 ````
 
 .. raw:: html
 
-    <a name="x520-64b-1t1c-base-scale"></a>
+    <a name="x520-64b-1t1c-base-scale-int"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-1t1c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-int-1t1c-x520-3n-tsh.html"></iframe>
     <p><br></p>
     </center>
 
@@ -20,12 +20,12 @@
 
 .. raw:: html
 
-    <a name="x520-64b-2t2c-base-scale"></a>
+    <a name="x520-64b-2t2c-base-scale-int"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-2t2c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-int-2t2c-x520-3n-tsh.html"></iframe>
     <p><br></p>
     </center>
 
@@ -34,11 +34,56 @@
 
 .. raw:: html
 
-    <a name="x520-64b-4t4c-base-scale"></a>
+    <a name="x520-64b-4t4c-base-scale-int"></a>
     <center>
     Links to builds:
     <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-4t4c-x520-3n-tsh.html"></iframe>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-int-4t4c-x520-3n-tsh.html"></iframe>
+    <p><br></p>
+    </center>
+
+3n-tsh-x520-64b-base-scale-sw-tnl
+---------------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-1t1c-base-scale-tnl"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-tnl-1t1c-x520-3n-tsh.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-2t2c-base-scale-tnl"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-tnl-2t2c-x520-3n-tsh.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="x520-64b-4t4c-base-scale-tnl"></a>
+    <center>
+    Links to builds:
+    <a href="https://packagecloud.io/app/fdio/master/search?dist=ubuntu%2Fbionic" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-tsh" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-tnl-4t4c-x520-3n-tsh.html"></iframe>
     <p><br></p>
     </center>
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index 3087afda29..d370314459 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -911,8 +911,8 @@ def _generate_url(base, testbed, test_name):
     elif "8t4c" in test_name:
         anchor += "8t4c"
 
-    return url + file_name + '-' + testbed + '-' + nic + framesize + feature + \
-           anchor + feature
+    return url + file_name + '-' + testbed + '-' + nic + framesize + \
+        feature.replace("-int", "").replace("-tnl", "") + anchor + feature
 
 
 def table_performance_trending_dashboard_html(table, input_data):
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 9352a7d85f..74c0ce33c3 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -4960,28 +4960,54 @@
       - "result"
       layout: "plot-cpta"
 
-# IPSec
+# IPSec SW INT
+
+    - title: "3n-tsh-x520-ip4-ipsecsw-int-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-int-1t1c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-ip4-ipsecsw-int-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-int-2t2c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-tsh-x520-ip4-ipsecsw-int-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-int-4t4c-x520-3n-tsh"
+      data: "plot-performance-trending-vpp-3n-tsh"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECINT' and 'AES_256_GCM' and ('BASE' or 'TNL_4' or 'TNL_40' or 'TNL_1000' or 'TNL_60000') and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# IPSec SW TNL
 
-    - title: "3n-tsh-x520-ip4-ipsecsw-64b-base-scale-1t1c"
-      output-file-name: "ipsecsw-1t1c-x520-3n-tsh"
+    - title: "3n-tsh-x520-ip4-ipsecsw-tnl-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-tnl-1t1c-x520-3n-tsh"
       data: "plot-performance-trending-vpp-3n-tsh"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-ip4-ipsecsw-64b-base-scale-2t2c"
-      output-file-name: "ipsecsw-2t2c-x520-3n-tsh"
+    - title: "3n-tsh-x520-ip4-ipsecsw-tnl-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-tnl-2t2c-x520-3n-tsh"
       data: "plot-performance-trending-vpp-3n-tsh"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "3n-tsh-x520-ip4-ipsecsw-64b-base-scale-4t4c"
-      output-file-name: "ipsecsw-4t4c-x520-3n-tsh"
+    - title: "3n-tsh-x520-ip4-ipsecsw-tnl-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-tnl-4t4c-x520-3n-tsh"
       data: "plot-performance-trending-vpp-3n-tsh"
-      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and 'IPSECTUN' and 'AES_256_GCM' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"