From 20e3ada3bb276b8a0c7fece9ecbb3be6380dd589 Mon Sep 17 00:00:00 2001 From: Cloud user Date: Thu, 25 Feb 2016 14:48:02 +0000 Subject: Add POD visualisation Change-Id: I4044c018fc3900615492a897e0c2a73348c8b0cd Signed-off-by: Cloud user --- .../tools/dashboard/css/opnfv_dashboard_tests.css | 8 +-- .../tools/dashboard/js/opnfv_dashboard_tests.js | 67 ++++++++++++++++------ .../dashboard/js/opnfv_dashboard_tests_conf.js | 31 +++++++--- .../tools/dashboard/opnfv_dashboard_tests.html | 9 +-- 4 files changed, 80 insertions(+), 35 deletions(-) (limited to 'utils/test') diff --git a/utils/test/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css b/utils/test/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css index 369b0f935..c74e26c63 100644 --- a/utils/test/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css +++ b/utils/test/result_collection_api/tools/dashboard/css/opnfv_dashboard_tests.css @@ -20,7 +20,7 @@ body { #testcase_selected{ position: relative; - left: 100px; + left: 50px; font-size: 20px; color: #00ADBB; } @@ -53,17 +53,17 @@ body { .btn-default{ font-size: 20px; - background-color: #0095A2; + background-color: #FFFFFF; /*#0095A2*/ } .dropdown-header{ font-size: 20px; - background-color: #0095A2; + background-color: #FFFFFF; /*#0095A2*/ } .dropdown-menu{ font-size: 16px; - background-color: #0095A2; + background-color: #FFFFFF; /*#0095A2*/ } .dropdown-menu > li > a:focus, .dropdown-menu > li > a:hover { diff --git a/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js b/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js index 3683c632c..4bb56af79 100644 --- a/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js +++ b/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests.js @@ -15,14 +15,14 @@ function format_date(inputDate){ } // Draw a single graph for a specific test for a specific installer -function draw_graph_per_scenario_per_installer (filename, installer, scenario, test_unit){ +function draw_graph_per_scenario_per_installer (filename, installer, pod, scenario, test_unit){ $.getJSON(filename, function(data) { var serie = []; index_test = 0; // find index mapping to the test_unit for (var i=0; i'+opnfv_dashboard_installers[i]+''; - else - html_installers += '
  • '+opnfv_dashboard_installers[i]+'
  • '; + else + html_installers += '
  • '+opnfv_dashboard_installers[i]+'
  • '; html_installers += ''; $("#installers").html(html_installers); } +// generate pods buttons +function show_installers_pods(active_pod) +{ + var html_pods = ''; + html_pods += ''; + $("#pods").html(html_pods); +} + // generate a div per installer (to host the graph) function show_divs(installer){ $("#graphs").remove(); @@ -163,14 +191,15 @@ function show_divs(installer){ var div_scenario = '
    '; console.log(div_scenario); var $newdiv = $(div_scenario); - $("#graphs").append($newdiv); } } // generate HTML menus and buttons $( document ).ready(function(){ - show_installers(''); - show_testcases(); console.log( "ready!" ); + + //show_installers(''); + show_testcases(); + on_ready_draw_graph(); }); diff --git a/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js b/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js index e091f2680..6778332eb 100644 --- a/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js +++ b/utils/test/result_collection_api/tools/dashboard/js/opnfv_dashboard_tests_conf.js @@ -1,7 +1,8 @@ +var opnfv_dashboard_project = 'functest'; var opnfv_dashboard_installer = ''; var opnfv_dashboard_test = ''; var opnfv_dashboard_test_unit = ''; -var opnfv_dashboard_project = 'functest'; +var opnfv_dashboard_pod = 'all'; var opnfv_dashboard_installers = ['apex', 'compass', 'fuel', 'joid']; @@ -9,7 +10,7 @@ var opnfv_dashboard_installers_scenarios = {}; opnfv_dashboard_installers_scenarios['apex'] = ['os-nosdn-nofeature-ha', 'os-odl_l2-nofeature-ha', - 'os-onos-nofeature-ha', + 'os-onos-nofeature-ha', 'os-odl_l3-nofeature-ha', 'os-odl_l2-sfc-ha']; @@ -20,7 +21,7 @@ opnfv_dashboard_installers_scenarios['compass']= 'os-ocl-nofeature-ha']; opnfv_dashboard_installers_scenarios['fuel']= - ['os-nosdn-nofeature-ha','os-odl_l2-nofeature-ha','os-onos-nofeature-ha','os-odl_l3-nofeature-ha','os-odl_l2-bgpvpn-ha','os-nosdn-ovs-ha','os-nosdn-kvm-ha','os-nosdn-ovs_kvm-ha']; + ['os-nosdn-nofeature-ha','os-odl_l2-nofeature-ha','os-onos-nofeature-ha','os-odl_l3-nofeature-ha','os-odl_l2-bgpvpn-ha','os-nosdn-ovs-ha','os-nosdn-kvm-ha','os-nosdn-ovs_kvm-ha']; opnfv_dashboard_installers_scenarios['joid']= ['os-nosdn-nofeature-ha', @@ -30,10 +31,11 @@ opnfv_dashboard_installers_scenarios['joid']= var opnfv_dashboard_testcases = { 'VIM': { - 'tempest': ['Tempest duration', + 'Tempest': ['Tempest duration', 'Tempest nb tests/nb failures'], 'vPing': ['vPing duration'], - 'vPing_userdata': ['vPing_userdata duration'] + 'vPing_userdata': ['vPing_userdata duration'], + 'Rally': ['rally duration'] }, 'Controller': { 'ODL': ['ODL nb tests/nb failures'], @@ -46,11 +48,24 @@ var opnfv_dashboard_testcases = { 'vIMS': ['vIMS nb tests passed/failed/skipped', 'vIMS orchestrator/VNF/test duration'], 'promise': ['Promise duration ', - 'Promise nb tests/nb failures'] + 'Promise nb tests/nb failures'], + 'doctor': ['doctor-notification duration '] } }; -var opnfv_dashboard_file_directory = 'res'; +var opnfv_dashboard_installers_pods = {}; +opnfv_dashboard_installers_pods['apex'] = ['all','intel-pod7','opnfv-jump-1']; +opnfv_dashboard_installers_pods['compass'] = ['all','huawei-us-deploy-bare-1','huawei-us-deploy-vm-1','huawei-us-deploy-vm2','intel-pod8']; +opnfv_dashboard_installers_pods['fuel'] = ['all','ericsson-pod2','opnfv-jump-2']; +opnfv_dashboard_installers_pods['joid'] = ['all','intel-pod5','intel-pod6','orange-fr-pod2']; + +var opnfv_dashboard_installers_pods_print = {}; +opnfv_dashboard_installers_pods_print['apex'] = ['all','intelpod7','opnfvjump1']; +opnfv_dashboard_installers_pods_print['compass'] = ['all','hwusbare1','hwusvm1','hwusvm2','intelpod8']; +opnfv_dashboard_installers_pods_print['fuel'] = ['all','ericssonpod2','opnfvjump2']; +opnfv_dashboard_installers_pods_print['joid'] = ['all','intelpod5','intelpod6','orangefrpod2']; + +var opnfv_dashboard_file_directory = 'res-test'; var opnfv_dashboard_file_prefix = 'res_'; var opnfv_dashboard_file_suffix = '.json'; @@ -71,4 +86,4 @@ var opnfv_dashboard_graph_title_height = 30; // height for the graph title var opnfv_dashboard_graph_stroke_width = 5; // line stroke when mouse over var opnfv_dashboard_graph_axis_label_color = '#2E2925'; var opnfv_dashboard_graph_text_align = 'right'; -var opnfv_dashboard_graph_background_color = 'transparent'; \ No newline at end of file +var opnfv_dashboard_graph_background_color = 'transparent'; diff --git a/utils/test/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html b/utils/test/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html index ad2bf222a..424b525a3 100644 --- a/utils/test/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html +++ b/utils/test/result_collection_api/tools/dashboard/opnfv_dashboard_tests.html @@ -19,13 +19,14 @@ - +
    FuncTest dashboard -

     

    +

     

    +
    +
    -
    -
    +
    -- cgit 1.2.3-korg