aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/cpta/index.rst4
-rw-r--r--docs/cpta/ndrpdr_trending/vts-2n-clx-xxv710.rst34
-rw-r--r--docs/cpta/ndrpdr_trending/vts.rst6
-rw-r--r--docs/cpta/trending/vts-2n-clx-xxv710.rst50
-rw-r--r--docs/cpta/trending/vts-2n-skx-xxv710.rst47
-rw-r--r--docs/cpta/trending/vts-2n-zn2-xxv710.rst50
-rw-r--r--docs/cpta/trending/vts.rst8
-rw-r--r--resources/tools/presentation/generator_cpta.py19
8 files changed, 16 insertions, 202 deletions
diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 468135a29d..d70acb1cb8 100644
--- 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
index 1978958668..0000000000
--- 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
index 5b7cd10514..0000000000
--- 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
index 5ea1f1e76d..0000000000
--- 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
index 697f6ec5ca..0000000000
--- 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
index 2af9fdaf77..0000000000
--- 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
index da65b95850..0000000000
--- 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 5cc56fd965..0320b9eec1 100644
--- 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,