From bb81ef05b86154d000128ef15bd3ecffe997ef9a Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 19 Apr 2018 15:00:14 +0200 Subject: [PATCH] CSIT-1041: Trending dashboard Change-Id: Ide76682e210412fdcd945a21946fa9957429109d Signed-off-by: Tibor Frank --- docs/cpta/trending/container_memif.rst | 18 ++++++ docs/cpta/trending/ip4.rst | 15 +++++ docs/cpta/trending/ip4_tunnels.rst | 6 ++ docs/cpta/trending/ip6.rst | 9 +++ docs/cpta/trending/ipsec.rst | 3 + docs/cpta/trending/l2.rst | 15 +++++ docs/cpta/trending/vm_vhost_ip4.rst | 12 ++++ docs/cpta/trending/vm_vhost_l2.rst | 18 ++++++ resources/tools/presentation/generator_tables.py | 70 +++++++++++++++++++++++- 9 files changed, 164 insertions(+), 2 deletions(-) diff --git a/docs/cpta/trending/container_memif.rst b/docs/cpta/trending/container_memif.rst index f95fba7880..205268857d 100644 --- a/docs/cpta/trending/container_memif.rst +++ b/docs/cpta/trending/container_memif.rst @@ -9,6 +9,7 @@ x520-64b-base .. raw:: html +
:index:`x520-l2sw-memif-64b-base-1t1c-mrr` @@ -25,6 +26,7 @@ x520-64b-base .. raw:: html +
:index:`x520-l2sw-memif-64b-base-2t2c-mrr` @@ -41,6 +43,7 @@ x520-64b-base .. raw:: html +
:index:`x520-l2sw-memif-64b-base-4t4c-mrr` @@ -60,6 +63,7 @@ x710-64b-base .. raw:: html +
:index:`x710-l2sw-memif-64b-base-1t1c-mrr` @@ -76,6 +80,7 @@ x710-64b-base .. raw:: html +
:index:`x710-l2sw-memif-64b-base-2t2c-mrr` @@ -92,6 +97,7 @@ x710-64b-base .. raw:: html +
:index:`x710-l2sw-memif-64b-base-4t4c-mrr` @@ -111,6 +117,7 @@ xl710-64b-base .. raw:: html +
:index:`xl710-l2sw-memif-64b-base-1t1c-mrr` @@ -127,6 +134,7 @@ xl710-64b-base .. raw:: html +
:index:`xl710-l2sw-memif-64b-base-2t2c-mrr` @@ -143,6 +151,7 @@ xl710-64b-base .. raw:: html +
:index:`xl710-l2sw-memif-64b-base-4t4c-mrr` @@ -162,6 +171,7 @@ x520-imix-base .. raw:: html +
:index:`x520-l2sw-memif-imix-base-1t1c-mrr` @@ -178,6 +188,7 @@ x520-imix-base .. raw:: html +
:index:`x520-l2sw-memif-imix-base-2t2c-mrr` @@ -194,6 +205,7 @@ x520-imix-base .. raw:: html +
:index:`x520-l2sw-memif-imix-base-4t4c-mrr` @@ -213,6 +225,7 @@ x710-imix-base .. raw:: html +
:index:`x710-l2sw-memif-imix-base-1t1c-mrr` @@ -229,6 +242,7 @@ x710-imix-base .. raw:: html +
:index:`x710-l2sw-memif-imix-base-2t2c-mrr` @@ -245,6 +259,7 @@ x710-imix-base .. raw:: html +
:index:`x710-l2sw-memif-imix-base-4t4c-mrr` @@ -264,6 +279,7 @@ xl710-imix-base .. raw:: html +
:index:`xl710-l2sw-memif-imix-base-1t1c-mrr` @@ -280,6 +296,7 @@ xl710-imix-base .. raw:: html +
:index:`xl710-l2sw-memif-imix-base-2t2c-mrr` @@ -296,6 +313,7 @@ xl710-imix-base .. raw:: html +
:index:`xl710-l2sw-memif-imix-base-4t4c-mrr` diff --git a/docs/cpta/trending/ip4.rst b/docs/cpta/trending/ip4.rst index 3ad4799664..82aff5ff76 100644 --- a/docs/cpta/trending/ip4.rst +++ b/docs/cpta/trending/ip4.rst @@ -9,6 +9,7 @@ x520-64b-base-scale .. raw:: html +
:index:`x520-ip4-64b-base-scale-1t1c-mrr` @@ -25,6 +26,7 @@ x520-64b-base-scale .. raw:: html +
:index:`x520-ip4-64b-base-scale-2t2c-mrr` @@ -41,6 +43,7 @@ x520-64b-base-scale .. raw:: html +
:index:`x520-ip4-64b-base-scale-4t4c-mrr` @@ -60,6 +63,7 @@ x520-64b-features .. raw:: html +
:index:`x520-ip4-64b-features-1t1c-mrr` @@ -76,6 +80,7 @@ x520-64b-features .. raw:: html +
:index:`x520-ip4-64b-features-2t2c-mrr` @@ -92,6 +97,7 @@ x520-64b-features .. raw:: html +
:index:`x520-ip4-64b-features-4t4c-mrr` @@ -111,6 +117,7 @@ x710-64b-base-scale .. raw:: html +
:index:`x710-ip4-64b-base-scale-1t1c-mrr` @@ -127,6 +134,7 @@ x710-64b-base-scale .. raw:: html +
:index:`x710-ip4-64b-base-scale-2t2c-mrr` @@ -143,6 +151,7 @@ x710-64b-base-scale .. raw:: html +
:index:`x710-ip4-64b-base-scale-4t4c-mrr` @@ -162,6 +171,7 @@ x710-64b-features .. raw:: html +
:index:`x710-ip4-64b-features-1t1c-mrr` @@ -178,6 +188,7 @@ x710-64b-features .. raw:: html +
:index:`x710-ip4-64b-features-2t2c-mrr` @@ -194,6 +205,7 @@ x710-64b-features .. raw:: html +
:index:`x710-ip4-64b-features-4t4c-mrr` @@ -213,6 +225,7 @@ xl710-64b-base-scale-features .. raw:: html +
:index:`xl710-ip4-64b-base-scale-features-1t1c-mrr` @@ -229,6 +242,7 @@ xl710-64b-base-scale-features .. raw:: html +
:index:`xl710-ip4-64b-base-scale-features-2t2c-mrr` @@ -245,6 +259,7 @@ xl710-64b-base-scale-features .. raw:: html +
:index:`xl710-ip4-64b-base-scale-features-4t4c-mrr` diff --git a/docs/cpta/trending/ip4_tunnels.rst b/docs/cpta/trending/ip4_tunnels.rst index e478d5c7b9..5430c97ab8 100644 --- a/docs/cpta/trending/ip4_tunnels.rst +++ b/docs/cpta/trending/ip4_tunnels.rst @@ -9,6 +9,7 @@ x520-64b-base .. raw:: html +
:index:`x520-ip4tun-64b-base-1t1c-mrr` @@ -25,6 +26,7 @@ x520-64b-base .. raw:: html +
:index:`x520-ip4tun-64b-base-2t2c-mrr` @@ -41,6 +43,7 @@ x520-64b-base .. raw:: html +
:index:`x520-ip4tun-64b-base-4t4c-mrr` @@ -60,6 +63,7 @@ x710-64b-base .. raw:: html +
:index:`x710-ip4tun-64b-base-1t1c-mrr` @@ -76,6 +80,7 @@ x710-64b-base .. raw:: html +
:index:`x710-ip4tun-64b-base-2t2c-mrr` @@ -92,6 +97,7 @@ x710-64b-base .. raw:: html +
:index:`x710-ip4tun-64b-base-4t4c-mrr` diff --git a/docs/cpta/trending/ip6.rst b/docs/cpta/trending/ip6.rst index e1b98d61bf..cc1abc780a 100644 --- a/docs/cpta/trending/ip6.rst +++ b/docs/cpta/trending/ip6.rst @@ -9,6 +9,7 @@ x520-78b-base-scale .. raw:: html +
:index:`x520-ip6-78b-base-scale-1t1c-mrr` @@ -25,6 +26,7 @@ x520-78b-base-scale .. raw:: html +
:index:`x520-ip6-78b-base-scale-2t2c-mrr` @@ -41,6 +43,7 @@ x520-78b-base-scale .. raw:: html +
:index:`x520-ip6-78b-base-scale-4t4c-mrr` @@ -60,6 +63,7 @@ x710-78b-base-scale .. raw:: html +
:index:`x710-ip6-78b-base-scale-1t1c-mrr` @@ -76,6 +80,7 @@ x710-78b-base-scale .. raw:: html +
:index:`x710-ip6-78b-base-scale-2t2c-mrr` @@ -92,6 +97,7 @@ x710-78b-base-scale .. raw:: html +
:index:`x710-ip6-78b-base-scale-4t4c-mrr` @@ -111,6 +117,7 @@ xl710-78b-base-scale .. raw:: html +
:index:`xl710-ip6-78b-base-scale-1t1c-mrr` @@ -127,6 +134,7 @@ xl710-78b-base-scale .. raw:: html +
:index:`xl710-ip6-78b-base-scale-2t2c-mrr` @@ -143,6 +151,7 @@ xl710-78b-base-scale .. raw:: html +
:index:`xl710-ip6-78b-base-scale-4t4c-mrr` diff --git a/docs/cpta/trending/ipsec.rst b/docs/cpta/trending/ipsec.rst index 135d12f1b8..5a4d4219dd 100644 --- a/docs/cpta/trending/ipsec.rst +++ b/docs/cpta/trending/ipsec.rst @@ -9,6 +9,7 @@ xl710-64b-base-scale .. raw:: html +
:index:`xl710-ip4-ipsechw-64b-base-scale-1t1c-mrr` @@ -25,6 +26,7 @@ xl710-64b-base-scale .. raw:: html +
:index:`xl710-ip4-ipsechw-64b-base-scale-2t2c-mrr` @@ -41,6 +43,7 @@ xl710-64b-base-scale .. raw:: html +
:index:`xl710-ip4-ipsechw-64b-base-scale-4t4c-mrr` diff --git a/docs/cpta/trending/l2.rst b/docs/cpta/trending/l2.rst index 5778888938..5b08da2c23 100644 --- a/docs/cpta/trending/l2.rst +++ b/docs/cpta/trending/l2.rst @@ -9,6 +9,7 @@ x520-64b-base-scale .. raw:: html +
:index:`x520-l2sw-64b-base-scale-1t1c-mrr` @@ -25,6 +26,7 @@ x520-64b-base-scale .. raw:: html +
:index:`x520-l2sw-64b-base-scale-2t2c-mrr` @@ -41,6 +43,7 @@ x520-64b-base-scale .. raw:: html +
:index:`x520-l2sw-64b-base-scale-4t4c-mrr` @@ -60,6 +63,7 @@ x520-64b-features .. raw:: html +
:index:`x520-l2sw-64b-features-1t1c-mrr` @@ -76,6 +80,7 @@ x520-64b-features .. raw:: html +
:index:`x520-l2sw-64b-features-2t2c-mrr` @@ -92,6 +97,7 @@ x520-64b-features .. raw:: html +
:index:`x520-l2sw-64b-features-4t4c-mrr` @@ -111,6 +117,7 @@ x710-64b-base-scale .. raw:: html +
:index:`x710-l2sw-64b-base-scale-1t1c-mrr` @@ -127,6 +134,7 @@ x710-64b-base-scale .. raw:: html +
:index:`x710-l2sw-64b-base-scale-2t2c-mrr` @@ -143,6 +151,7 @@ x710-64b-base-scale .. raw:: html +
:index:`x710-l2sw-64b-base-scale-4t4c-mrr` @@ -162,6 +171,7 @@ x710-64b-features .. raw:: html +
:index:`x710-l2sw-64b-features-1t1c-mrr` @@ -178,6 +188,7 @@ x710-64b-features .. raw:: html +
:index:`x710-l2sw-64b-features-2t2c-mrr` @@ -194,6 +205,7 @@ x710-64b-features .. raw:: html +
:index:`x710-l2sw-64b-features-4t4c-mrr` @@ -213,6 +225,7 @@ xl710-64b-base-scale .. raw:: html +
:index:`xl710-l2sw-64b-base-scale-1t1c-mrr` @@ -229,6 +242,7 @@ xl710-64b-base-scale .. raw:: html +
:index:`xl710-l2sw-64b-base-scale-2t2c-mrr` @@ -245,6 +259,7 @@ xl710-64b-base-scale .. raw:: html +
:index:`xl710-l2sw-64b-base-scale-4t4c-mrr` diff --git a/docs/cpta/trending/vm_vhost_ip4.rst b/docs/cpta/trending/vm_vhost_ip4.rst index b47577bb24..16f2746838 100644 --- a/docs/cpta/trending/vm_vhost_ip4.rst +++ b/docs/cpta/trending/vm_vhost_ip4.rst @@ -9,6 +9,7 @@ x520-64b-base .. raw:: html +
:index:`x520-ip4-vhost-64b-base-1t1c-mrr` @@ -25,6 +26,7 @@ x520-64b-base .. raw:: html +
:index:`x520-ip4-vhost-64b-base-2t2c-mrr` @@ -41,6 +43,7 @@ x520-64b-base .. raw:: html +
:index:`x520-ip4-vhost-64b-base-4t4c-mrr` @@ -60,6 +63,7 @@ x710-64b-base .. raw:: html +
:index:`x710-ip4-vhost-64b-base-1t1c-mrr` @@ -76,6 +80,7 @@ x710-64b-base .. raw:: html +
:index:`x710-ip4-vhost-64b-base-2t2c-mrr` @@ -92,6 +97,7 @@ x710-64b-base .. raw:: html +
:index:`x710-ip4-vhost-64b-base-4t4c-mrr` @@ -111,6 +117,7 @@ x520-imix-base .. raw:: html +
:index:`x520-ip4-vhost-imix-base-1t1c-mrr` @@ -127,6 +134,7 @@ x520-imix-base .. raw:: html +
:index:`x520-ip4-vhost-imix-base-2t2c-mrr` @@ -143,6 +151,7 @@ x520-imix-base .. raw:: html +
:index:`x520-ip4-vhost-imix-base-4t4c-mrr` @@ -162,6 +171,7 @@ x710-imix-base .. raw:: html +
:index:`x710-ip4-vhost-imix-base-1t1c-mrr` @@ -178,6 +188,7 @@ x710-imix-base .. raw:: html +
:index:`x710-ip4-vhost-imix-base-2t2c-mrr` @@ -194,6 +205,7 @@ x710-imix-base .. raw:: html +
:index:`x710-ip4-vhost-imix-base-4t4c-mrr` diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst index e8be449502..a55574f74b 100644 --- a/docs/cpta/trending/vm_vhost_l2.rst +++ b/docs/cpta/trending/vm_vhost_l2.rst @@ -9,6 +9,7 @@ x520-64b-base .. raw:: html +
:index:`x520-l2sw-vhost-64b-base-1t1c-mrr` @@ -25,6 +26,7 @@ x520-64b-base .. raw:: html +
:index:`x520-l2sw-vhost-64b-base-2t2c-mrr` @@ -41,6 +43,7 @@ x520-64b-base .. raw:: html +
:index:`x520-l2sw-vhost-64b-base-4t4c-mrr` @@ -60,6 +63,7 @@ x710-64b-base .. raw:: html +
:index:`x710-l2sw-vhost-64b-base-1t1c-mrr` @@ -76,6 +80,7 @@ x710-64b-base .. raw:: html +
:index:`x710-l2sw-vhost-64b-base-2t2c-mrr` @@ -92,6 +97,7 @@ x710-64b-base .. raw:: html +
:index:`x710-l2sw-vhost-64b-base-4t4c-mrr` @@ -111,6 +117,7 @@ xl710-64b-base .. raw:: html +
:index:`xl710-l2sw-vhost-64b-base-1t1c-mrr` @@ -127,6 +134,7 @@ xl710-64b-base .. raw:: html +
:index:`xl710-l2sw-vhost-64b-base-2t2c-mrr` @@ -143,6 +151,7 @@ xl710-64b-base .. raw:: html +
:index:`xl710-l2sw-vhost-64b-base-4t4c-mrr` @@ -162,6 +171,7 @@ x520-imix-base .. raw:: html +
:index:`x520-l2sw-vhost-imix-base-1t1c-mrr` @@ -178,6 +188,7 @@ x520-imix-base .. raw:: html +
:index:`x520-l2sw-vhost-imix-base-2t2c-mrr` @@ -194,6 +205,7 @@ x520-imix-base .. raw:: html +
:index:`x520-l2sw-vhost-imix-base-4t4c-mrr` @@ -213,6 +225,7 @@ x710-imix-base .. raw:: html +
:index:`x710-l2sw-vhost-imix-base-1t1c-mrr` @@ -229,6 +242,7 @@ x710-imix-base .. raw:: html +
:index:`x710-l2sw-vhost-imix-base-2t2c-mrr` @@ -245,6 +259,7 @@ x710-imix-base .. raw:: html +
:index:`x710-l2sw-vhost-imix-base-4t4c-mrr` @@ -264,6 +279,7 @@ xl710-imix-base .. raw:: html +
:index:`xl710-l2sw-vhost-imix-base-1t1c-mrr` @@ -280,6 +296,7 @@ xl710-imix-base .. raw:: html +
:index:`xl710-l2sw-vhost-imix-base-2t2c-mrr` @@ -296,6 +313,7 @@ xl710-imix-base .. raw:: html +
:index:`xl710-l2sw-vhost-imix-base-4t4c-mrr` diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index 32273ca920..f73357db30 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -892,7 +892,7 @@ def table_performance_trending_dashboard_html(table, input_data): dashboard = ET.Element("table", attrib=dict(width="100%", border='0')) # Table header: - tr = ET.SubElement(dashboard, "tr", attrib=dict(bgcolor="#6699ff")) + tr = ET.SubElement(dashboard, "tr", attrib=dict(bgcolor="#7eade7")) for idx, item in enumerate(csv_lst[0]): alignment = "left" if idx == 0 else "center" th = ET.SubElement(tr, "th", attrib=dict(align=alignment)) @@ -907,6 +907,71 @@ def table_performance_trending_dashboard_html(table, input_data): for c_idx, item in enumerate(row): alignment = "left" if c_idx == 0 else "center" td = ET.SubElement(tr, "td", attrib=dict(align=alignment)) + # Name: + url = "../trending/" + file_name = "" + anchor = "#" + feature = "" + if c_idx == 0: + if "memif" in item: + file_name = "container_memif.html" + + elif "vhost" in item: + if "l2xcbase" in item or "l2bdbasemaclrn" in item: + file_name = "vm_vhost_l2.html" + elif "ip4base" in item: + file_name = "vm_vhost_ip4.html" + + elif "ipsec" in item: + file_name = "ipsec.html" + + elif "ethip4lispip" in item or "ethip4vxlan" in item: + file_name = "ip4_tunnels.html" + + elif "ip4base" in item or "ip4scale" in item: + file_name = "ip4.html" + if "iacl" in item or "snat" in item or "cop" in item: + feature = "-features" + + elif "ip6base" in item or "ip6scale" in item: + file_name = "ip6.html" + + elif "l2xcbase" in item or "l2xcscale" in item \ + or "l2bdbasemaclrn" in item or "l2bdscale" in item: + file_name = "l2.html" + if "iacl" in item: + feature = "-features" + + if "x520" in item: + anchor += "x520-" + elif "x710" in item: + anchor += "x710-" + elif "xl710" in item: + anchor += "xl710-" + + if "64b" in item: + anchor += "64b-" + elif "78b" in item: + anchor += "78b" + elif "imix" in item: + anchor += "imix-" + elif "9000b" in item: + anchor += "9000b-" + elif "1518" in item: + anchor += "1518b-" + + if "1t1c" in item: + anchor += "1t1c" + elif "2t2c" in item: + anchor += "2t2c" + elif "4t4c" in item: + anchor += "4t4c" + + url = url + file_name + anchor + feature + + ref = ET.SubElement(td, "a", attrib=dict(href=url)) + ref.text = item + if c_idx == 2: if item == "regression": td.set("bgcolor", "#eca1a6") @@ -914,7 +979,8 @@ def table_performance_trending_dashboard_html(table, input_data): td.set("bgcolor", "#d6cbd3") elif item == "progression": td.set("bgcolor", "#bdcebe") - td.text = item + if c_idx > 0: + td.text = item try: with open(table["output-file"], 'w') as html_file: -- 2.16.6