Updated the code to accept compute instead of compute.txt

Change-Id: I06ce77e04db0e1c7d7de6c16b3a876740099e5ae
Signed-off-by: Mofassir <Mofassir_arif@Dellteam.com>

diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py
new file mode 100644 (file)
index 0000000..e9e05ba
--- /dev/null
+++ b/dashboard/pushtoDB.py
@@ -0,0 +1,56 @@
+import requests\r
+import json\r
+import datetime\r
+import os\r
+TEST_DB = 'http://213.77.62.197'\r
+\r
+suite_list = ['compute_result.json','network_result.json','storage_result.json']\r
+payload_list = []\r
+\r
+def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us-testing-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
+    print url\r
+    print case_name\r
+    print logger\r
+    print pod_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 params\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 suites in suite_list:\r
+        if os.path.isfile('results/'+suites):\r
+            payload_list.append(suites)\r
+    \r
+    print payload_list\r
+\r
+def main():\r
+\r
+    global payload_list\r
+    populate_payload(suite_list)\r
+    for pay in payload_list:\r
+        with open('results/'+pay,'r') as result_file:\r
+            j=result_file.read().rstrip()\r
+            \r
+        push_results_to_db(TEST_DB, 'Compute benchmark suite',j)\r
+\r
+if __name__ == "__main__":\r
+    main()
\ No newline at end of file

diff --git a/dashboard/qtip2dashboard.py b/dashboard/qtip2dashboard.py
new file mode 100644 (file)
index 0000000..008f737
--- /dev/null
+++ b/dashboard/qtip2dashboard.py
@@ -0,0 +1,97 @@
+#!/usr/bin/python
+
+##############################################################################
+# Copyright (c) 2015 Dell Inc  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
+##############################################################################
+
+
+def get_qtip_cases():
+    """
+    get the list of the supported test cases
+    TODO: update the list when adding a new test case for the dashboard
+    """
+    return ["compute_test_suite","storage_test_suite","network_test_suite"]
+
+
+def check_qtip_case_exist(case):
+    """
+    check if the testcase exists
+    if the test case is not defined or not declared in the list
+    return False
+    """
+    qtip_cases = get_qtip_cases()
+ 
+    if (case is None or case not in qtip_cases):
+        return False
+    else:
+        return True
+
+
+def format_qtip_for_dashboard(case, results):
+    """
+    generic method calling the method corresponding to the test case
+    check that the testcase is properly declared first
+    then build the call to the specific method
+    """
+    if check_qtip_case_exist(case):
+        res = format_common_for_dashboard(case, results)
+    else:
+        res = []
+        print "Test cases not declared"
+    return res
+
+def format_common_for_dashboard(case, results):
+    """
+    Common post processing
+    """
+    test_data_description = case + " results for Dashboard"
+    test_data = [{'description': test_data_description}]
+
+    graph_name = ''
+    if "network_test_suite" in case:
+        graph_name = "Throughput index"
+    else:
+        graph_name = "Index"
+
+    # Graph 1: Rx fps = f(time)
+    # ********************************
+    new_element = []
+    for data in results:
+        new_element.append({'x': data['creation_date'],
+                            'y1': data['details']['index'],
+                            })
+
+    test_data.append({'name': graph_name,
+                      'info': {'type': "graph",
+                               'xlabel': 'time',
+                               'y1label': 'Index Number'},
+                      'data_set': new_element})
+
+    return test_data
+
+
+
+
+############################  For local test  ################################
+import os
+
+def _test():
+    ans = [{'creation_date': '2015-09-12', 'project_name': 'qtip', 'version': 'test', 'pod_name': 'dell-us-testing-1', 'case_name': 'compute_test_suite', 'installer': 'fuel', 'details': {'index': '0.9'}},
+           {'creation_date': '2015-09-33', 'project_name': 'qtip', 'version': 'test', 'pod_name': 'dell-us-testing-1', 'case_name': 'compute_test_suite', 'installer': 'fuel', 'details': {'index': '0.8'}}]
+
+    result = format_qtip_for_dashboard("compute_test_suite", ans)
+    print result
+
+    result = format_qtip_for_dashboard("storage_test_suite", ans)
+    print result
+
+    result = format_qtip_for_dashboard("network_test_suite", ans)
+    print result
+
+if __name__ == '__main__':
+    _test()
\ No newline at end of file

diff --git a/data/my_key.pem b/data/my_key.pem
index c7f92ed..66bd451 100644 (file)
--- a/data/my_key.pem
+++ b/data/my_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

diff --git a/data/opnfv-creds.sh b/data/opnfv-creds.sh
new file mode 100644 (file)
index 0000000..9266c19
--- /dev/null
+++ b/data/opnfv-creds.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+export LC_ALL=C
+export OS_NO_CACHE='true'
+export OS_TENANT_NAME='admin'
+export OS_USERNAME='admin'
+export OS_PASSWORD='admin'
+export OS_AUTH_URL='http://172.18.0.69:5000/v2.0'
+export OS_AUTH_STRATEGY='keystone'
+export OS_REGION_NAME='RegionOne'
+export CINDER_ENDPOINT_TYPE='internalURL'
+export GLANCE_ENDPOINT_TYPE='internalURL'
+export KEYSTONE_ENDPOINT_TYPE='internalURL'
+export NOVA_ENDPOINT_TYPE='internalURL'
+export NEUTRON_ENDPOINT_TYPE='internalURL'
+export OS_ENDPOINT_TYPE='internalURL'
+export MURANO_REPO_URL='http://storage.apps.openstack.org/'

diff --git a/data/pushtoDB.py b/data/pushtoDB.py
deleted file mode 100644 (file)
index fab7852..0000000
--- a/data/pushtoDB.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import requests\r
-import json\r
-import os\r
-TEST_DB = 'http://213.77.62.197'\r
-\r
-\r
-\r
-def push_results_to_db(db_url=TEST_DB, case_name, logger=None, pod_name='dell-us-testing-bm-1', payload):\r
-    url = db_url + "/results"\r
-    installer = get_installer_type(logger)\r
-    params = {"project_name": "functest", "case_name": case_name,\r
-              "pod_name": os.environ[''], "installer": installer,\r
-              "version": git_version, "details": payload}\r
-\r
-    headers = {'Content-Type': 'application/json'}\r
-    try:\r
-        r = requests.post(url, data=json.dumps(params), headers=headers)\r
-        logger.debug(r)\r
-        return True\r
-    except:\r
-        print "Error:", sys.exc_info()[0]\r
-        return False\r
-        \r

diff --git a/func/cli.py b/func/cli.py
index 833e374..8433e48 100644 (file)
--- a/func/cli.py
+++ b/func/cli.py
@@ -24,9 +24,9 @@ class cli():
             _benchmarks[items]=_benchmarks[items].rstrip()
         return _benchmarks
     def _getsuite(self, filepath):
-        for suites in range (len(filepath)):
-            xindex= filepath[suites].find('.')
-            filepath[suites]=filepath[suites][0:xindex]
+#        for suites in range (len(filepath)):
+ #           xindex= filepath[suites].find('.')
+  #          filepath[suites]=filepath[suites][0:xindex]
         return filepath
         
     def __init__(self):
@@ -63,4 +63,4 @@ class cli():
                 else:
                     print (args.benchmark, ' is not a Template in the Directory - \
                                 Enter a Valid file name. or use qtip.py -h for list')
-        
\ No newline at end of file
+