X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftools%2Fpresentation%2Fgenerator_plots.py;h=25a3736a260ada209e07d3f1248daa8116e6206c;hp=6fe1f287de4c4679ae296487804db2243f6c5efe;hb=60ecfa318740f00e009e9611be2390fbef5fe92d;hpb=dd2b7fc16501f50d12e8330a7bdd541583e4419d

diff --git a/resources/tools/presentation/generator_plots.py b/resources/tools/presentation/generator_plots.py
index 6fe1f287de..25a3736a26 100644
--- a/resources/tools/presentation/generator_plots.py
+++ b/resources/tools/presentation/generator_plots.py
@@ -111,20 +111,18 @@ def plot_service_density_reconf_box_name(plot, input_data):
     traces = list()
     df = pd.DataFrame(y_vals)
     df.head()
-    y_max = list()
     for i, col in enumerate(df.columns):
         tst_name = re.sub(REGEX_NIC, "",
                           col.lower().replace('-ndrpdr', '').
                           replace('2n1l-', ''))
         tst_name = "-".join(tst_name.split("-")[3:-2])
-        name = "{nr}. ({samples:02d} run{plural}, avg pkt loss: {loss:.1f}, " \
-               "stdev: {stdev:.2f}) {name}".format(
+        name = "{nr}. ({samples:02d} run{plural}, packets lost average: " \
+               "{loss:.1f}, {name}".format(
                     nr=(i + 1),
                     samples=nr_of_samples[i],
                     plural='s' if nr_of_samples[i] > 1 else '',
                     name=tst_name,
-                    loss=mean(loss[col]) / 1000000,
-                    stdev=stdev(loss[col]) / 1000000)
+                    loss=mean(loss[col]))
 
         traces.append(plgo.Box(x=[str(i + 1) + '.'] * len(df[col]),
                                y=[y if y else None for y in df[col]],
@@ -132,22 +130,13 @@ def plot_service_density_reconf_box_name(plot, input_data):
                                hoverinfo="x+y",
                                boxpoints="outliers",
                                whiskerwidth=0))
-        try:
-            val_max = max(df[col])
-        except ValueError as err:
-            logging.error(repr(err))
-            continue
-        if val_max:
-            y_max.append(int(val_max) + 1)
-
     try:
         # Create plot
         layout = deepcopy(plot["layout"])
         layout["title"] = "<b>Time Lost:</b> {0}".format(layout["title"])
         layout["yaxis"]["title"] = "<b>Implied Time Lost [s]</b>"
         layout["legend"]["font"]["size"] = 14
-        if y_max:
-            layout["yaxis"]["range"] = [0, max(y_max)]
+        layout["yaxis"].pop("range")
         plpl = plgo.Figure(data=traces, layout=layout)
 
         # Export Plot
@@ -1792,9 +1781,9 @@ def plot_service_density_heatmap(plot, input_data):
     """
 
     REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
-    REGEX_TEST_NAME = re.compile(r'^.*-(\d+vhost|\d+memif)-'
-                                 r'(\d+chain|\d+pipe)-'
-                                 r'(\d+vm|\d+dcr|\d+drc).*$')
+    REGEX_TEST_NAME = re.compile(r'^.*-(\d+ch|\d+pl)-'
+                                 r'(\d+mif|\d+vh)-'
+                                 r'(\d+vm\d+t|\d+dcr\d+t).*$')
 
     txt_chains = list()
     txt_nodes = list()
@@ -1821,9 +1810,9 @@ def plot_service_density_heatmap(plot, input_data):
                     continue
                 groups = re.search(REGEX_TEST_NAME, test["name"])
                 if groups and len(groups.groups()) == 3:
-                    hover_name = "{vhost}-{chain}-{vm}".format(
-                        vhost=str(groups.group(1)),
-                        chain=str(groups.group(2)),
+                    hover_name = "{chain}-{vhost}-{vm}".format(
+                        chain=str(groups.group(1)),
+                        vhost=str(groups.group(2)),
                         vm=str(groups.group(3)))
                 else:
                     hover_name = ""
@@ -2076,8 +2065,8 @@ def plot_service_density_heatmap_compare(plot, input_data):
 
     REGEX_CN = re.compile(r'^(\d*)R(\d*)C$')
     REGEX_TEST_NAME = re.compile(r'^.*-(\d+ch|\d+pl)-'
-                                 r'(\d+vh|\d+mif)-'
-                                 r'(\d+vm|\d+dcr).*$')
+                                 r'(\d+mif|\d+vh)-'
+                                 r'(\d+vm\d+t|\d+dcr\d+t).*$')
     REGEX_THREADS = re.compile(r'^(\d+)(VM|DCR)(\d+)T$')
 
     txt_chains = list()