Merge "add dashboard uploader for uploading results to community"

5 files changed, 147 insertions, 0 deletions

diff --git a/utils/dashboard/__init__.py b/utils/dashboard/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/utils/dashboard/__init__.py
diff --git a/utils/dashboard/collector.py b/utils/dashboard/collector.py
new file mode 100755
index 00000000..1687f80f
--- /dev/null
+++ b/utils/dashboard/collector.py
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+
+import subprocess as subp
+
+def exec_shell(cmd):
+    out,err = subp.Popen(cmd, stdout=subp.PIPE, shell=True).communicate()
+    return out.strip()
+
+
+def get_onetime_data(dir_name):
+    cmd = "grep -in 'remote client nodes' %s/index.html|awk '{print $5}'|awk -F '<' '{print $1}'" % dir_name
+    client_node_num = int(exec_shell(cmd))
+    cmd = "grep -n 'Number of clients' %s/index.html|awk '{print $5}'|awk -F '<' '{print $1}'" % dir_name
+    each_client_num = int(exec_shell(cmd))
+    total_client = (client_node_num+1) * each_client_num
+    cmd = 'grep -n "throughput" %s/stat_client*.html |awk -F "<B>" \'FNR%%4==0 {printf "%%s\\n", $3 }\'|awk \'BEGIN{sum=0;}{sum=sum+$1;}END{print sum}\'' % dir_name
+    throughput = int(exec_shell(cmd))
+
+    return total_client, throughput
+
+
+class Collector(object):
+
+
+    def __init__(self):
+        pass
+
+
+    def collect_data(self, data_home):
+        cmd =  'ls -l %s |grep ^d|awk \'{print $9}\'' % data_home
+        result = []
+        for subdir in exec_shell(cmd).split('\n'):
+            total_client, throughput = get_onetime_data(data_home+'/'+subdir)
+            result.append({'client':total_client, 'throughput':throughput})
+            result.sort(key=lambda x:x['client'])
+
+        return result;
+
diff --git a/utils/dashboard/dashboard.yaml b/utils/dashboard/dashboard.yaml
new file mode 100644
index 00000000..dbc9d8e6
--- /dev/null
+++ b/utils/dashboard/dashboard.yaml
@@ -0,0 +1,6 @@
+---
+
+pod_name: unknown-pod
+installer: fuel
+version: unknown
+target: http://127.0.0.1/results
diff --git a/utils/dashboard/process_data.py b/utils/dashboard/process_data.py
new file mode 100644
index 00000000..7a7144f8
--- /dev/null
+++ b/utils/dashboard/process_data.py
@@ -0,0 +1,31 @@
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+
+import subprocess as subp
+import sys
+from collector import Collector
+from uploader import Uploader
+
+
+#process data
+if len(sys.argv)!=3:
+    print "Wrong arguments, please input 2 parameters, 1st as raw data path; "\
+    "2nd as config yaml!!"
+    exit (1)
+data_home = sys.argv[1]
+conf = sys.argv[2]
+
+#1collect result
+result = Collector().collect_data(data_home)
+print "Result collected:\n%s" % result
+
+#2upload result
+Uploader(conf).upload_result("rubbos", result)
+
diff --git a/utils/dashboard/uploader.py b/utils/dashboard/uploader.py
new file mode 100755
index 00000000..07862fed
--- /dev/null
+++ b/utils/dashboard/uploader.py
@@ -0,0 +1,64 @@
+##############################################################################
+# Copyright (c) 2015 Huawei Technologies Co.,Ltd. and others
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+import sys
+import json
+import requests
+import yaml
+
+
+class Uploader(object):
+
+    def __init__(self, conf):
+        self.headers = {'Content-type': 'application/json'}
+        self.timeout = 5
+        self.result = {
+            "project_name": "bottlenecks",
+            "description": "bottlenecks test cases result"}
+
+        with open(conf) as stream:
+            dashboard_conf = yaml.load(stream)
+        self.result['pod_name'] = dashboard_conf['pod_name']
+        self.result['installer'] = dashboard_conf['installer']
+        self.result['version'] = dashboard_conf['version']
+        self.target = dashboard_conf['target']
+
+
+    def upload_result(self, case_name, raw_data):
+        if self.target == '':
+            print('No target was set, so no data will be posted.')
+            return
+        self.result["case_name"] = case_name
+        self.result["details"] = raw_data
+
+        try:
+            print('Result to be uploaded:\n %s' % json.dumps(self.result))
+            res = requests.post(self.target,
+                                data=json.dumps(self.result),
+                                headers=self.headers,
+                                timeout=self.timeout)
+            print('Test result posting finished with status code %d.' % res.status_code)
+        except Exception as err:
+            print ('Failed to record result data: %s', err)
+
+
+def _test():
+
+    #data = '{"details": [{"client": 200, "throughput": 20}, {"client": 300, "throughput": 20}], "case_name": "rubbos"}'
+    if len(sys.argv) < 2:
+        print ("no argumens input!!")
+        exit(1)
+
+    with open(sys.argv[1],'r') as stream:
+        data = json.load(stream)
+        Uploader().upload_result(data)
+
+if __name__ == "__main__":
+    _test()
+