aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNauman_Ahad <nauman_ahad@xflowresearch.com>2016-02-12 20:36:54 +0500
committerNauman Ahad <nauman.ahad@xflowresearch.com>2016-02-12 15:44:52 +0000
commitb5c0b2b8c5ea0ab734548813a859ac6065138437 (patch)
tree388a4a01915b76f1b3f29341e72d5dd16a29390d
parent6700444ea735f678ed2841fec29ab11947905a1a (diff)
QTIP report generation docker dependencies resolved
Needed dependencies for report within QTIP docker image were resolved. Additionally, added an error check in case no results are available for the report. Change-Id: Ifd4ccd406555faf156e4274ca312e1ef55ed64b3 Signed-off-by: Nauman_Ahad <nauman_ahad@xflowresearch.com>
-rw-r--r--data/report/Qtip_Report.py24
-rw-r--r--data/report/qtip_graph.py15
-rw-r--r--docker/Dockerfile4
-rw-r--r--docker/packages.pip1
4 files changed, 23 insertions, 21 deletions
diff --git a/data/report/Qtip_Report.py b/data/report/Qtip_Report.py
index 5132e1b6..9f2226c4 100644
--- a/data/report/Qtip_Report.py
+++ b/data/report/Qtip_Report.py
@@ -10,21 +10,23 @@ from get_results import report_concat
from get_results import generate_result
def dump_result(Stor,directory, testcase):
- lower_s=testcase.lower()
- Stor.append(Paragraph(testcase,Style['h3']))
- l1=report_concat(directory,lower_s)
- l=1
- for a in l1:
- Stor.append(Paragraph(testcase+" result_"+str(l),Style['h5']))
- raw_string=generate_result(a,0)
- replaced_string=raw_string.replace('\n', '<br/> ').replace(' ','&nbsp;')
- Stor.append(Paragraph(replaced_string,Style['BodyText']))
- l=l+1
+ try:
+ lower_s=testcase.lower()
+ Stor.append(Paragraph(testcase,Style['h3']))
+ l1=report_concat(directory,lower_s)
+ l=1
+ for a in l1:
+ Stor.append(Paragraph(testcase+" result_"+str(l),Style['h5']))
+ raw_string=generate_result(a,0)
+ replaced_string=raw_string.replace('\n', '<br/> ').replace(' ','&nbsp;')
+ Stor.append(Paragraph(replaced_string,Style['BodyText']))
+ l=l+1
+ except OSError:
+ print "Results for {0} not found".format(testcase)
doc = SimpleDocTemplate("../../results/QTIP_results.pdf",pagesize=letter,
rightMargin=72,leftMargin=72,
topMargin=72,bottomMargin=18)
-
Stor=[]
Style=getSampleStyleSheet()
Title="QTIP Benchmark Suite"
diff --git a/data/report/qtip_graph.py b/data/report/qtip_graph.py
index 3d952824..d7e64140 100644
--- a/data/report/qtip_graph.py
+++ b/data/report/qtip_graph.py
@@ -1,5 +1,7 @@
-import numpy as np
+import matplotlib
+matplotlib.use('Agg')
import matplotlib.pyplot as plt
+import numpy as np
def plot_indices(a,b,c):
N=3
@@ -18,17 +20,10 @@ def plot_indices(a,b,c):
ax.set_xticks(ind+width/2)
ax.set_xticklabels(['Compute','Storage','Network'])
ax.axis([0,3,0,1.25])
- f.text(0.7,0.01,'* With Comparison to Refernece POD', fontsize=9)
-
+ f.text(0.7,0.01,'* With Comparison to Refernece POD', fontsize=9)
+
for rect in my_bars:
height = rect.get_height()
ax.text(rect.get_x() + rect.get_width()/2., 1.05*height, height , ha='center', va='bottom')
f.savefig('qtip_graph.jpeg')
-
-
-def main():
- plot_indices(0.83,0.7,1.0)
-
-if __name__ == "__main__":
- main()
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05e856fb..9ed0980e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -28,6 +28,10 @@ expect \
python-matplotlib \
python-dev \
python-pip \
+libjpeg62 \
+libjpeg62-dev \
+zlib1g-dev \
+python-tk \
--no-install-recommends
RUN apt-add-repository ppa:ansible/ansible -y
diff --git a/docker/packages.pip b/docker/packages.pip
index 2f69efe5..cc048389 100644
--- a/docker/packages.pip
+++ b/docker/packages.pip
@@ -5,3 +5,4 @@ python-glanceclient==1.1.0
python-cinderclient==1.4.0
python-heatclient==0.6.0
python-keystoneclient==1.6.0
+reportlab==3.0