X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fdashboard%2Fprocess_data.py;h=4be0917899d0c77942b3d1787875e01e55ef5e6d;hb=07b553641c1f5991191eb4efcb238cd819f7f6a8;hp=d4b2ccfb2fa88997e82fcebb6e56eac909e16ee8;hpb=fc3e423277087d08fa19cb1beb43a53e6a32f427;p=bottlenecks.git

diff --git a/utils/dashboard/process_data.py b/utils/dashboard/process_data.py
index d4b2ccfb..4be09178 100644
--- a/utils/dashboard/process_data.py
+++ b/utils/dashboard/process_data.py
@@ -8,25 +8,28 @@
 ##############################################################################
 
 
-import subprocess as subp
 import sys
 from rubbos_collector import RubbosCollector
 from uploader import Uploader
 
+
 def printUsage():
-    print "Usage: python process_data.py required_params(**) optional_params([])"
+    print ("Usage: python process_data.py required_params(**)"
+           " optional_params([])")
     print "       ** -i|--input   input_data_dir"
     print "       ** -s|--suite   suite_name"
     print "       ** -c|--conf    conf_file"
     print "       [] -o|--output  output_file"
     print "       [] -u|--upload  yes|no"
 
+
 def process(input_dir, suite_name):
     result = dict()
     if suite_name == "rubbos":
         result = RubbosCollector().collect_data(input_dir)
     return result
 
+
 def writeResult(output_file, result):
     f = open(output_file, "w")
     if isinstance(result, list):
@@ -34,41 +37,43 @@ def writeResult(output_file, result):
             f.write(str(elem) + "\n")
     f.close()
 
+
 def uploadResult(conf, suite_name, result):
     Uploader(conf).upload_result(suite_name, result)
 
+
 def main():
     if len(sys.argv) < 7 or len(sys.argv) % 2 == 0:
         printUsage()
-        exit (1)
+        exit(1)
     i = 1
     params = dict()
     while (i < len(sys.argv)):
-        if sys.argv[i]=="-i" or sys.argv[i]=="--input":
-            params["input"] = sys.argv[i+1]
-        if sys.argv[i]=="-s" or sys.argv[i]=="--suite":
-            params["suite"] = sys.argv[i+1]
-        if sys.argv[i]=="-c" or sys.argv[i]=="--conf":
-            params["conf"] = sys.argv[i+1]
-        if sys.argv[i]=="-o" or sys.argv[i]=="--output":
-            params["output"] = sys.argv[i+1]
-        if sys.argv[i]=="-u" or sys.argv[i]=="--upload":
-            params["upload"] = sys.argv[i+1]
-        i = i+2
-    if not(params.has_key("input") and params.has_key("suite") and params.has_key("conf")):
+        if sys.argv[i] == "-i" or sys.argv[i] == "--input":
+            params["input"] = sys.argv[i + 1]
+        if sys.argv[i] == "-s" or sys.argv[i] == "--suite":
+            params["suite"] = sys.argv[i + 1]
+        if sys.argv[i] == "-c" or sys.argv[i] == "--conf":
+            params["conf"] = sys.argv[i + 1]
+        if sys.argv[i] == "-o" or sys.argv[i] == "--output":
+            params["output"] = sys.argv[i + 1]
+        if sys.argv[i] == "-u" or sys.argv[i] == "--upload":
+            params["upload"] = sys.argv[i + 1]
+        i = i + 2
+    if not("input" in params and "suite" in params and "conf" in params):
         print "Lack some required parameters."
-        exit (1)
+        exit(1)
 
     result = process(params["input"], params["suite"])
     print "Results:"
     for elem in result:
         print elem
 
-    if params.has_key("output"):
-        writeResult(params["output"],result)
+    if "output" in params:
+        writeResult(params["output"], result)
 
-    if params.has_key("upload") and params["upload"].lower()=="yes":
+    if "upload" in params and params["upload"].lower() == "yes":
         uploadResult(params["conf"], params["suite"], result)
 
-if __name__=="__main__":
+if __name__ == "__main__":
     main()