dos2Unix the pushtoDb.py file. 89/15089/1
authorzhifeng.jiang <jiang.zhifeng@zte.com.cn>
Thu, 2 Jun 2016 14:02:54 +0000 (22:02 +0800)
committerzhifeng.jiang <jiang.zhifeng@zte.com.cn>
Thu, 2 Jun 2016 14:02:54 +0000 (22:02 +0800)
Change-Id: I507822e4ea02a4e5fecc7242482b76d9412eede4
Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
dashboard/pushtoDB.py

index 750ec03..d86fbee 100644 (file)
@@ -1,57 +1,57 @@
-import requests\r
-import json\r
-import datetime\r
-import os\r
-TEST_DB = 'http://testresults.opnfv.org/testapi'\r
-\r
-suite_list = [('compute_result.json', 'compute_test_suite'),('network_result.json', 'network_test_suite'),('storage_result.json', 'storage_test_suite')]\r
-payload_list = { }\r
-\r
-def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us-testing-bm-1"):\r
-\r
-    url = db_url + "/results"\r
-    creation_date= str(datetime.datetime.utcnow().isoformat())\r
-    installer = os.environ['INSTALLER_TYPE']\r
-    pod_name = os.environ['NODE_NAME']\r
-\r
-    params = {"project_name": "qtip", "case_name": case_name,\r
-              "pod_name": pod_name, "installer": installer, "creation_date": creation_date,\r
-              "version": "test" , "details": payload}\r
-\r
-    headers = {'Content-Type': 'application/json'}\r
-    print pod_name\r
-    print installer\r
-    print creation_date\r
-\r
-    try:\r
-        r = requests.post(url, data=json.dumps(params), headers=headers)\r
-        print r\r
-        return True\r
-    except:\r
-        print "Error:", sys.exc_info()[0]\r
-        return False\r
-\r
-def populate_payload(suite_list):\r
-\r
-    global payload_list\r
-    for k,v in suite_list:\r
-\r
-        if os.path.isfile('results/'+str(k)):\r
-            payload_list[k]=v\r
-\r
-def main():\r
-\r
-    global payload_list\r
-    populate_payload(suite_list)\r
-    if payload_list:\r
-        print payload_list\r
-        for suite,case in payload_list.items():\r
-            with open('results/'+suite,'r') as result_file:\r
-                j=json.load(result_file)\r
-            push_results_to_db(TEST_DB, case , j)\r
-    elif not payload_list:\r
-        print 'Results not found'\r
-\r
-\r
-if __name__ == "__main__":\r
-    main()\r
+import requests
+import json
+import datetime
+import os
+TEST_DB = 'http://testresults.opnfv.org/testapi'
+
+suite_list = [('compute_result.json', 'compute_test_suite'),('network_result.json', 'network_test_suite'),('storage_result.json', 'storage_test_suite')]
+payload_list = { }
+
+def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us-testing-bm-1"):
+
+    url = db_url + "/results"
+    creation_date= str(datetime.datetime.utcnow().isoformat())
+    installer = os.environ['INSTALLER_TYPE']
+    pod_name = os.environ['NODE_NAME']
+
+    params = {"project_name": "qtip", "case_name": case_name,
+              "pod_name": pod_name, "installer": installer, "creation_date": creation_date,
+              "version": "test" , "details": payload}
+
+    headers = {'Content-Type': 'application/json'}
+    print pod_name
+    print installer
+    print creation_date
+
+    try:
+        r = requests.post(url, data=json.dumps(params), headers=headers)
+        print r
+        return True
+    except:
+        print "Error:", sys.exc_info()[0]
+        return False
+
+def populate_payload(suite_list):
+
+    global payload_list
+    for k,v in suite_list:
+
+        if os.path.isfile('results/'+str(k)):
+            payload_list[k]=v
+
+def main():
+
+    global payload_list
+    populate_payload(suite_list)
+    if payload_list:
+        print payload_list
+        for suite,case in payload_list.items():
+            with open('results/'+suite,'r') as result_file:
+                j=json.load(result_file)
+            push_results_to_db(TEST_DB, case , j)
+    elif not payload_list:
+        print 'Results not found'
+
+
+if __name__ == "__main__":
+    main()