From 5ec0a299c5f9ad2f4843478db69bc6bbc697b0a2 Mon Sep 17 00:00:00 2001
From: Tibor Frank <tifrank@cisco.com>
Date: Wed, 15 May 2019 09:09:07 +0200
Subject: [PATCH] Trending: Add IPSECSW

Change-Id: I5437d46759c3fcf9a8f44d02d43a70f3f3b2635d
Signed-off-by: Tibor Frank <tifrank@cisco.com>
---
 .../trending/ipsec-3n-hsw-xl710-64b-base-scale.rst |  4 +-
 docs/cpta/trending/ipsec.rst                       |  1 +
 .../ipsecsw-3n-hsw-xl710-64b-base-scale.rst        | 44 ++++++++++++++++++++++
 resources/tools/presentation/generator_tables.py   |  4 ++
 .../tools/presentation/specification_CPTA.yaml     | 30 +++++++++++++--
 5 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 docs/cpta/trending/ipsecsw-3n-hsw-xl710-64b-base-scale.rst

diff --git a/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst b/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
index ebaed4fe57..7838113407 100644
--- a/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
+++ b/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
@@ -1,5 +1,5 @@
-3n-hsw-xl710-64b-base-scale
----------------------------
+3n-hsw-xl710-64b-base-scale-hw
+------------------------------
 
 1t1c
 ````
diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst
index edc6284872..5dd16bba27 100644
--- a/docs/cpta/trending/ipsec.rst
+++ b/docs/cpta/trending/ipsec.rst
@@ -4,3 +4,4 @@ IPSec IPv4 Routing
 .. toctree::
 
     ipsec-3n-hsw-xl710-64b-base-scale
+    ipsecsw-3n-hsw-xl710-64b-base-scale
diff --git a/docs/cpta/trending/ipsecsw-3n-hsw-xl710-64b-base-scale.rst b/docs/cpta/trending/ipsecsw-3n-hsw-xl710-64b-base-scale.rst
new file mode 100644
index 0000000000..8340e8d063
--- /dev/null
+++ b/docs/cpta/trending/ipsecsw-3n-hsw-xl710-64b-base-scale.rst
@@ -0,0 +1,44 @@
+3n-hsw-xl710-64b-base-scale-sw
+------------------------------
+
+1t1c
+````
+
+.. raw:: html
+
+    <a name="xl710-64b-1t1c-base-scale"></a>
+    <center>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-1t1c-xl710-3n-hsw.html"></iframe>
+    <p><br></p>
+    </center>
+
+2t2c
+````
+
+.. raw:: html
+
+    <a name="xl710-64b-2t2c-base-scale"></a>
+    <center>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-2t2c-xl710-3n-hsw.html"></iframe>
+    <p><br></p>
+    </center>
+
+4t4c
+````
+
+.. raw:: html
+
+    <a name="xl710-64b-4t4c-base-scale"></a>
+    <center>
+    Links to builds:
+    <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
+    <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
+    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsecsw-4t4c-xl710-3n-hsw.html"></iframe>
+    <p><br></p>
+    </center>
diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py
index f4c3e54ce4..acd3024f35 100644
--- a/resources/tools/presentation/generator_tables.py
+++ b/resources/tools/presentation/generator_tables.py
@@ -811,6 +811,10 @@ def _generate_url(base, testbed, test_name):
             file_name = "vm_vhost_ip4"
             feature = "-base"
 
+    elif "ipsecbasetnlsw" in test_name:
+        file_name = "ipsecsw"
+        feature = "-base-scale"
+
     elif "ipsec" in test_name:
         file_name = "ipsec"
         feature = "-base-scale"
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index d18fbffb36..c0c5c8d5b4 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -2161,7 +2161,7 @@
     - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
       output-file-name: "ipsec-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2169,7 +2169,7 @@
     - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
       output-file-name: "ipsec-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
@@ -2177,7 +2177,31 @@
     - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
       output-file-name: "ipsec-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-1t1c"
+      output-file-name: "ipsecsw-1t1c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECSW' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-2t2c"
+      output-file-name: "ipsecsw-2t2c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECSW' and not 'VHOST'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-xl710-ip4-ipsecsw-64b-base-scale-4t4c"
+      output-file-name: "ipsecsw-4t4c-xl710-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECSW' and not 'VHOST'"
       parameters:
       - "result"
       layout: "plot-cpta"
-- 
2.16.6