From f385a6d107b3c5c479583e74e18ef3c5fa55b304 Mon Sep 17 00:00:00 2001 From: "zhifeng.jiang" Date: Tue, 12 Jul 2016 22:36:43 +0800 Subject: Fix pep8 errors for python files in benchmarks,data,dashboard JIRA:QTIP-89 Change-Id: I3465221f0bdc9a8eb7c4e26069f7367fb1add729 Signed-off-by: zhifeng.jiang --- data/report/Qtip_Report.py | 125 ++++++++++++++++++++++----------------------- data/report/get_indices.py | 8 +-- data/report/get_results.py | 47 ++++++++--------- data/report/qtip_graph.py | 33 ++++++------ 4 files changed, 105 insertions(+), 108 deletions(-) (limited to 'data/report') diff --git a/data/report/Qtip_Report.py b/data/report/Qtip_Report.py index 9f2226c4..cd20d57c 100644 --- a/data/report/Qtip_Report.py +++ b/data/report/Qtip_Report.py @@ -1,113 +1,108 @@ -from reportlab.pdfgen import canvas from reportlab.platypus import SimpleDocTemplate, Paragraph, Spacer, Image -from reportlab.lib.styles import getSampleStyleSheet, ParagraphStyle +from reportlab.lib.styles import getSampleStyleSheet from reportlab.lib.units import inch from reportlab.lib.pagesizes import letter -from reportlab.platypus import ListFlowable, ListItem -import qtip_graph as graph +import qtip_graph as graph import get_indices as results from get_results import report_concat from get_results import generate_result -def dump_result(Stor,directory, testcase): + +def dump_result(Stor, directory, testcase): try: - lower_s=testcase.lower() - Stor.append(Paragraph(testcase,Style['h3'])) - l1=report_concat(directory,lower_s) - l=1 + 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', '
').replace(' ',' ') - Stor.append(Paragraph(replaced_string,Style['BodyText'])) - l=l+1 + Stor.append(Paragraph(testcase + " result_" + str(l), Style['h5'])) + raw_string = generate_result(a, 0) + replaced_string = raw_string.replace('\n', '
').replace(' ', ' ') + 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" -Stor.append(Paragraph(Title,Style['Title'])) -H1="Results" -Stor.append(Spacer(0,36)) +doc = SimpleDocTemplate("../../results/QTIP_results.pdf", pagesize=letter, + rightMargin=72, leftMargin=72, + topMargin=72, bottomMargin=18) +Stor = [] +Style = getSampleStyleSheet() +Title = "QTIP Benchmark Suite" +Stor.append(Paragraph(Title, Style['Title'])) +H1 = "Results" +Stor.append(Spacer(0, 36)) Stor.append(Paragraph(H1, Style['h2'])) -compute=0 -storage=0 -network=0 +compute = 0 +storage = 0 +network = 0 try: - compute=results.get_index('compute_result') + compute = results.get_index('compute_result') except IOError: pass try: - storage=results.get_index('storage_result') + storage = results.get_index('storage_result') except IOError: pass try: - network=results.get_index('network_result') + network = results.get_index('network_result') except IOError: pass -Stor.append(Paragraph("Compute Suite: %f" %compute, Style['h5'])) -Stor.append(Paragraph("Storage Suite: %f" %storage, Style['h5'])) -Stor.append(Paragraph("Network Suite: %f" %network, Style['h5'])) -graph.plot_indices(compute,storage,network) -qtip_graph=('qtip_graph.jpeg') -im=Image(qtip_graph, 5*inch,4*inch) +Stor.append(Paragraph("Compute Suite: %f" % compute, Style['h5'])) +Stor.append(Paragraph("Storage Suite: %f" % storage, Style['h5'])) +Stor.append(Paragraph("Network Suite: %f" % network, Style['h5'])) +graph.plot_indices(compute, storage, network) +qtip_graph = ('qtip_graph.jpeg') +im = Image(qtip_graph, 5 * inch, 4 * inch) Stor.append(im) Stor.append(Spacer(0, 12)) Stor.append(Paragraph("Reference POD", Style['h5'])) -ptext="The Dell OPNFV Lab POD3 has been taken as the reference POD against which the reference results have been collected. The POD consists of 6 identical servers. The details of such a server are:" -Stor.append(Paragraph(ptext,Style['Normal'])) -ptext="•Server Type: Dell PowerEdge R630 Server" -Stor.append(Paragraph(ptext,Style['Bullet'])) -ptext="•CPU: Intel Xeon E5-2698 @ 2300 MHz" +ptext = "The Dell OPNFV Lab POD3 has been taken as the reference POD against which the reference results have been collected. The POD consists of 6 identical servers. The details of such a server are:" +Stor.append(Paragraph(ptext, Style['Normal'])) +ptext = "•Server Type: Dell PowerEdge R630 Server" +Stor.append(Paragraph(ptext, Style['Bullet'])) +ptext = "•CPU: Intel Xeon E5-2698 @ 2300 MHz" Stor.append(Paragraph(ptext, Style["Bullet"])) -ptext="•RAM: 128GB" +ptext = "•RAM: 128GB" Stor.append(Paragraph(ptext, Style["Bullet"])) -ptext="•Storage SSD: 420GB" +ptext = "•Storage SSD: 420GB" Stor.append(Paragraph(ptext, Style["Bullet"])) -ptext="•Network Card: Intel 2P X520/2P I350 rNDC" +ptext = "•Network Card: Intel 2P X520/2P I350 rNDC" Stor.append(Paragraph(ptext, Style["Bullet"])) -ptext="Servers interconnected through a DELL S4810 switch using a 10Gbps physical link" +ptext = "Servers interconnected through a DELL S4810 switch using a 10Gbps physical link" Stor.append(Paragraph(ptext, Style["Bullet"])) Stor.append(Spacer(0, 12)) -ptext="For Further Details of the Reference POD hardware, please visit: https://wiki.opnfv.org/reference_pod_hardware_details" -Stor.append(Paragraph(ptext,Style['Normal'])) +ptext = "For Further Details of the Reference POD hardware, please visit: https://wiki.opnfv.org/reference_pod_hardware_details" +Stor.append(Paragraph(ptext, Style['Normal'])) Stor.append(Spacer(0, 12)) -ptext="For Details of the Reference POD Results, please visit: https://wiki.opnfv.org/reference_pod_qtip_results" +ptext = "For Details of the Reference POD Results, please visit: https://wiki.opnfv.org/reference_pod_qtip_results" Stor.append(Spacer(0, 12)) -Stor.append(Paragraph(ptext,Style['Normal'])) +Stor.append(Paragraph(ptext, Style['Normal'])) Stor.append(Paragraph("RAW Results", Style['h1'])) Stor.append(Paragraph("Compute Results", Style['h2'])) -dump_result(Stor,"../../results/dhrystone/","Dhrystone_bm") -dump_result(Stor,"../../results/dhrystone/","Dhrystone_vm") - -dump_result(Stor,"../../results/whetstone/","Whetstone_bm") -dump_result(Stor,"../../results/whetstone/","Whetstone_vm") +dump_result(Stor, "../../results/dhrystone/", "Dhrystone_bm") +dump_result(Stor, "../../results/dhrystone/", "Dhrystone_vm") -dump_result(Stor,"../../results/ramspeed/","Ramspeed_bm") -dump_result(Stor,"../../results/ramspeed/","Ramspeed_vm") +dump_result(Stor, "../../results/whetstone/", "Whetstone_bm") +dump_result(Stor, "../../results/whetstone/", "Whetstone_vm") -dump_result(Stor,"../../results/ssl/","SSL_bm") -dump_result(Stor,"../../results/ssl/","SSL_vm") +dump_result(Stor, "../../results/ramspeed/", "Ramspeed_bm") +dump_result(Stor, "../../results/ramspeed/", "Ramspeed_vm") -#dump_result(Stor,"../../results/dpi/","DPI_bm") -#dump_result(Stor,"../../results/dpi/","DPI_vm") +dump_result(Stor, "../../results/ssl/", "SSL_bm") +dump_result(Stor, "../../results/ssl/", "SSL_vm") Stor.append(Paragraph("Network Results", Style['h2'])) -dump_result(Stor,"../../results/iperf/","IPERF_bm") -dump_result(Stor,"../../results/iperf/","IPERF_vm") -dump_result(Stor,"../../results/iperf/","IPERF_vm_2") +dump_result(Stor, "../../results/iperf/", "IPERF_bm") +dump_result(Stor, "../../results/iperf/", "IPERF_vm") +dump_result(Stor, "../../results/iperf/", "IPERF_vm_2") Stor.append(Paragraph("Storage Results", Style['h2'])) -dump_result(Stor,"../../results/fio/","fio_bm") -dump_result(Stor,"../../results/fio/","fio_vm") +dump_result(Stor, "../../results/fio/", "fio_bm") +dump_result(Stor, "../../results/fio/", "fio_vm") doc.build(Stor) -#canvas.save() diff --git a/data/report/get_indices.py b/data/report/get_indices.py index e23fdb89..91219c0b 100644 --- a/data/report/get_indices.py +++ b/data/report/get_indices.py @@ -1,8 +1,8 @@ import json + def get_index(suite): - with open ('../../results/'+suite+'.json') as result_file: - result_djson=json.load(result_file) - index=result_djson['index'] - + with open('../../results/' + suite + '.json') as result_file: + result_djson = json.load(result_file) + index = result_djson['index'] return index diff --git a/data/report/get_results.py b/data/report/get_results.py index 01fb8080..23fd5383 100644 --- a/data/report/get_results.py +++ b/data/report/get_results.py @@ -2,48 +2,49 @@ import os import json -def report_concat (targ_dir, testcase): - machine_temp=[]; - machines=[]; - diction={}; +def report_concat(targ_dir, testcase): + machine_temp = [] + machines = [] for file in os.listdir(targ_dir): if file.endswith(".json"): machine_temp.append(file) - l=len(machine_temp) + l = len(machine_temp) - for x in range (0,l): - file_t=machine_temp[x] - with open (targ_dir+file_t) as result_file: - result_djson=json.load(result_file) + for x in range(0, l): + file_t = machine_temp[x] + with open(targ_dir + file_t) as result_file: + result_djson = json.load(result_file) if result_djson['1 Testcase Name'] == str(testcase): machines.append(result_djson) return machines + def space_count(l): - spc='' + spc = '' for x in range(l): - spc=spc+' ' + spc = spc + ' ' return spc -def custom_dict(list1,list2,k): - string_1='' - for num_1 in range (0,len(list1)): - string_1=string_1+space_count(k)+str(list1[num_1][0])+"="+str(list2[num_1])+"\n" +def custom_dict(list1, list2, k): + string_1 = '' + for num_1 in range(0, len(list1)): + string_1 = string_1 + space_count(k) + str(list1[num_1][0]) + "=" + str(list2[num_1]) + "\n" return string_1 -def generate_result(dict_a,k): - list_1=[] - list_2=[] - count=0 - for i,j in sorted(dict_a.iteritems()): + +def generate_result(dict_a, k): + list_1 = [] + list_2 = [] + count = 0 + for i, j in sorted(dict_a.iteritems()): list_1.append([]) list_1[count].append(i) if (str(type(dict_a.get(i)))) == "": - list_2.append(str("\n"+generate_result(dict_a.get(i),int(k+1)))) + list_2.append(str("\n" + generate_result(dict_a.get(i), int(k + 1)))) else: list_2.append(dict_a.get(i)) - count=count+1 - return custom_dict(list_1,list_2,k) + count = count + 1 + return custom_dict(list_1, list_2, k) diff --git a/data/report/qtip_graph.py b/data/report/qtip_graph.py index d7e64140..acbda40c 100644 --- a/data/report/qtip_graph.py +++ b/data/report/qtip_graph.py @@ -1,29 +1,30 @@ import matplotlib -matplotlib.use('Agg') import matplotlib.pyplot as plt import numpy as np -def plot_indices(a,b,c): - N=3 - ind= np.arange(N) - y_axis = (a,b,c ) - width=0.35 - f=plt.figure() - ax=f.gca() +matplotlib.use('Agg') + + +def plot_indices(a, b, c): + N = 3 + ind = np.arange(N) + y_axis = (a, b, c) + width = 0.35 + f = plt.figure() + ax = f.gca() ax.set_autoscale_on(True) - my_bars=ax.bar(ind,y_axis,width, color='b') + my_bars = ax.bar(ind, y_axis, width, color='b') ax.set_ylabel('Index Score*') ax.set_xlabel('Suite') ax.set_title(' QTIP benchmark scores') ax.axis('on') - my_bars=ax.bar(ind,y_axis,width) - 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) + my_bars = ax.bar(ind, y_axis, width) + 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) 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') - + ax.text(rect.get_x() + rect.get_width() / 2., 1.05 * height, height, ha='center', va='bottom') f.savefig('qtip_graph.jpeg') -- cgit 1.2.3-korg