Trending: Fix TRex graphs, remove VTS

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

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 468135a..d70acb1 100644 (file)
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -35,10 +35,8 @@ analysis and anomaly detection methodology.
     trending/vhost
     trending/container_memif
     trending/ipsec
-    trending/vts
     trending/nf_service_density
     trending/dpdk
-    trending/trex
 
 .. toctree::
     :maxdepth: 2
@@ -53,7 +51,7 @@ analysis and anomaly detection methodology.
     ndrpdr_trending/vhost
     ndrpdr_trending/container_memif
     ndrpdr_trending/ipsec
-    ndrpdr_trending/vts
+    ndrpdr_trending/trex
 
 .. toctree::
     :maxdepth: 2

diff --git a/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst b/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst
deleted file mode 100644 (file)
index 1978958..0000000
--- a/docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-2n-clx-xxv710
--------------
-
-114b-vts-l2switching-base-avf
-`````````````````````````````
-
-2t1c-ndr
-::::::::
-
-.. raw:: html
-
-    <a name="114b-2t1c-base-avf-ndr"></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-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-
-2t1c-pdr
-::::::::
-
-.. raw:: html
-
-    <a name="114b-2t1c-base-avf-pdr"></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-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-ndr.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/ndrpdr_trending/vts.rst b/docs/cpta/ndrpdr_trending/vts.rst
deleted file mode 100644 (file)
index 5b7cd10..0000000
--- a/docs/cpta/ndrpdr_trending/vts.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Virtual Topology System
-=======================
-
-.. toctree::
-
-    vts-2n-clx-xxv710

diff --git a/docs/cpta/trending/vts-2n-clx-xxv710.rst b/docs/cpta/trending/vts-2n-clx-xxv710.rst
deleted file mode 100644 (file)
index 5ea1f1e..0000000
--- a/docs/cpta/trending/vts-2n-clx-xxv710.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-2n-clx-xxv710
--------------
-
-114b-vts-l2switching-base-avf-dpdk
-``````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="114b-2t1c-base-dpdk"></a>
-    <a name="114b-2t1c-base-avf"></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-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="114b-4t2c-base-dpdk"></a>
-    <a name="114b-4t2c-base-avf"></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-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="114b-8t4c-base-dpdk"></a>
-    <a name="114b-8t4c-base-avf"></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-2n-clx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-clx-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/trending/vts-2n-skx-xxv710.rst b/docs/cpta/trending/vts-2n-skx-xxv710.rst
deleted file mode 100644 (file)
index 697f6ec..0000000
--- a/docs/cpta/trending/vts-2n-skx-xxv710.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-2n-skx-xxv710
--------------
-
-114b-vts-l2switching-base-avf
-`````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="114b-2t1c-base-avf"></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-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="114b-4t2c-base-avf"></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-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-4t2c-vts-l2switching-base-avf.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="114b-8t4c-base-avf"></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-2n-skx" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-skx-xxv710-114b-8t4c-vts-l2switching-base-avf.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/trending/vts-2n-zn2-xxv710.rst b/docs/cpta/trending/vts-2n-zn2-xxv710.rst
deleted file mode 100644 (file)
index 2af9fda..0000000
--- a/docs/cpta/trending/vts-2n-zn2-xxv710.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-2n-zn2-xxv710
--------------
-
-114b-vts-l2switching-base-avf-dpdk
-``````````````````````````````````
-
-2t1c
-::::
-
-.. raw:: html
-
-    <a name="114b-2t1c-base-dpdk"></a>
-    <a name="114b-2t1c-base-avf"></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-2n-zn2" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-zn2-xxv710-114b-2t1c-vts-l2switching-base-avf-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-4t2c
-::::
-
-.. raw:: html
-
-    <a name="114b-4t2c-base-dpdk"></a>
-    <a name="114b-4t2c-base-avf"></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-2n-zn2" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-zn2-xxv710-114b-4t2c-vts-l2switching-base-avf-dpdk.html"></iframe>
-    <p><br></p>
-    </center>
-
-8t4c
-::::
-
-.. raw:: html
-
-    <a name="114b-8t4c-base-dpdk"></a>
-    <a name="114b-8t4c-base-avf"></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-2n-zn2" target="_blank">csit-ref</a>
-    <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/2n-zn2-xxv710-114b-8t4c-vts-l2switching-base-avf-dpdk.html"></iframe>
-    <p><br></p>
-    </center>

diff --git a/docs/cpta/trending/vts.rst b/docs/cpta/trending/vts.rst
deleted file mode 100644 (file)
index da65b95..0000000
--- a/docs/cpta/trending/vts.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Virtual Topology System
-=======================
-
-.. toctree::
-
-    vts-2n-clx-xxv710
-    vts-2n-skx-xxv710
-    vts-2n-zn2-xxv710

diff --git a/resources/tools/presentation/generator_cpta.py b/resources/tools/presentation/generator_cpta.py
index 5cc56fd..0320b9e 100644 (file)
--- a/resources/tools/presentation/generator_cpta.py
+++ b/resources/tools/presentation/generator_cpta.py
@@ -223,7 +223,18 @@ def _generate_trending_traces(in_data, job_name, build_info,
         if u"-cps" in name:
             hover_str = hover_str.replace(u"[Mpps]", u"[Mcps]").\
                 replace(u"throughput", u"connection rate")
-        if u"dpdk" in job_name:
+        if u"vpp" in job_name:
+            hover_str = hover_str.format(
+                date=date,
+                property=u"average" if incl_tests == u"mrr" else u"throughput",
+                value=data_y_mpps[index],
+                sut=u"vpp",
+                build=build_info[job_name][str_key][1].rsplit(u'~', 1)[0],
+                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])
+        elif u"dpdk" in job_name:
             hover_str = hover_str.format(
                 date=date,
                 property=u"average" if incl_tests == u"mrr" else u"throughput",
@@ -234,13 +245,13 @@ def _generate_trending_traces(in_data, job_name, build_info,
                 period=u"weekly",
                 build_nr=str_key,
                 testbed=build_info[job_name][str_key][2])
-        elif u"vpp" in job_name:
+        elif u"trex" in job_name:
             hover_str = hover_str.format(
                 date=date,
                 property=u"average" if incl_tests == u"mrr" else u"throughput",
                 value=data_y_mpps[index],
-                sut=u"vpp",
-                build=build_info[job_name][str_key][1].rsplit(u'~', 1)[0],
+                sut=u"trex",
+                build=u"",
                 test=incl_tests,
                 period=u"daily" if incl_tests == u"mrr" else u"weekly",
                 build_nr=str_key,