From f1ca479add9327f778d45b3685a46be757e43ef8 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Mon, 17 Apr 2017 17:40:40 +0800 Subject: add qtip reporting Change-Id: Ie573486080fbd36857ff0709d53f6bdcdd43363e Signed-off-by: SerenaFeng --- reporting/docker/reporting.sh | 18 ++++ reporting/js/trend-qtip.js | 76 +++++++++++++++++ reporting/qtip/__init__.py | 0 reporting/qtip/index.html | 51 ++++++++++++ reporting/qtip/reporting-status.py | 110 +++++++++++++++++++++++++ reporting/qtip/template/index-status-tmpl.html | 86 +++++++++++++++++++ reporting/reporting.yaml | 2 + reporting/utils/reporting_utils.py | 37 +++++++++ 8 files changed, 380 insertions(+) create mode 100644 reporting/js/trend-qtip.js create mode 100644 reporting/qtip/__init__.py create mode 100644 reporting/qtip/index.html create mode 100644 reporting/qtip/reporting-status.py create mode 100644 reporting/qtip/template/index-status-tmpl.html (limited to 'reporting') diff --git a/reporting/docker/reporting.sh b/reporting/docker/reporting.sh index 1de13ae..7f5b005 100755 --- a/reporting/docker/reporting.sh +++ b/reporting/docker/reporting.sh @@ -32,6 +32,22 @@ cp -Rf js display # yardstick | # storperf | +function report_project() +{ + project=$1 + dir=$2 + type=$3 + echo "********************************" + echo " $project reporting " + echo "********************************" + python ./$dir/reporting-$type.py + if [ $? ]; then + echo "$project reporting $type...OK" + else + echo "$project reporting $type...KO" + fi +} + if [ -z "$1" ]; then echo "********************************" echo " Functest reporting " @@ -60,6 +76,8 @@ if [ -z "$1" ]; then python ./storperf/reporting-status.py echo "Storperf reporting status...OK" + report_project "QTIP" "qtip" "status" + else if [ -z "$2" ]; then reporting_type="status" diff --git a/reporting/js/trend-qtip.js b/reporting/js/trend-qtip.js new file mode 100644 index 0000000..d4c8735 --- /dev/null +++ b/reporting/js/trend-qtip.js @@ -0,0 +1,76 @@ +// ****************************************** +// Trend line for reporting +// based on scenario_history.txt +// where data looks like +// date,scenario,installer,detail,score +// 2016-09-22 13:12,os-nosdn-fdio-noha,apex,4/12,33.0 +// 2016-09-22 13:13,os-odl_l2-fdio-noha,apex,12/15,80.0 +// 2016-09-22 13:13,os-odl_l2-sfc-noha,apex,18/24,75.0 +// ..... +// ****************************************** +// Set the dimensions of the canvas / graph +var trend_margin = {top: 20, right: 30, bottom: 50, left: 40}, + trend_width = 300 - trend_margin.left - trend_margin.right, + trend_height = 130 - trend_margin.top - trend_margin.bottom; + +// Parse the date / time +var parseDate = d3.time.format("%Y-%m-%d %H:%M").parse; + +// Set the ranges +var trend_x = d3.time.scale().range([0, trend_width]); +var trend_y = d3.scale.linear().range([trend_height, 0]); + +// Define the axes +var trend_xAxis = d3.svg.axis().scale(trend_x) + .orient("bottom").ticks(2).tickFormat(d3.time.format("%m-%d")); + +var trend_yAxis = d3.svg.axis().scale(trend_y) + .orient("left").ticks(4, "s"); + +// Define the line +var valueline = d3.svg.line() + .x(function(d) { return trend_x(d.date); }) + .y(function(d) { return trend_y(d.score); }); + +var trend = function(container, trend_data) { + + var trend_svg = d3.select(container) + .append("svg") + .attr("width", trend_width + trend_margin.left + trend_margin.right) + .attr("height", trend_height + trend_margin.top + trend_margin.bottom) + .attr("style", "font-size: small") + .append("g") + .attr("transform", + "translate(" + trend_margin.left + "," + trend_margin.top + ")"); + + // Scale the range of the data + trend_x.domain(d3.extent(trend_data, function(d) { return d.date; })); + trend_y.domain([0, d3.max(trend_data, function(d) { return d.score; })]); + + // Add the X Axis + trend_svg.append("g") + .attr("class", "x axis") + .attr("transform", "translate(0," + trend_height + ")") + .call(trend_xAxis); + + // Add the Y Axis + trend_svg.append("g") + .attr("class", "y axis") + .call(trend_yAxis); + + // Add the valueline path. + trend_svg.append("path") + .attr("class", "line") + .attr("d", valueline(trend_data)) + .attr("stroke", "steelblue") + .attr("fill", "none"); + + trend_svg.selectAll(".dot") + .data(trend_data) + .enter().append("circle") + .attr("r", 2.5) + .attr("cx", function(d) { return trend_x(d.date); }) + .attr("cy", function(d) { return trend_y(d.score); }); + + return trend; +} diff --git a/reporting/qtip/__init__.py b/reporting/qtip/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/reporting/qtip/index.html b/reporting/qtip/index.html new file mode 100644 index 0000000..0f9df85 --- /dev/null +++ b/reporting/qtip/index.html @@ -0,0 +1,51 @@ + + + + + + + + + + + +
+
+

QTIP reporting page

+ +
+
+
+
+
+

QTIP

+ QTIP is used in OPNFV for verifying the OPNFV infrastructure and some of the OPNFV features. +
The QTIP framework is deployed in several OPNFV community labs. +
It is installer, infrastructure and application independent. + +

Useful Links

+
  • QTIP in Depth
    • +
  • QTIP Repo
    • +
  • QTIP Project
    • +
  • QTIP Jenkins page
    • +
  • JIRA
    • + +
    +
    +
    +
    diff --git a/reporting/qtip/reporting-status.py b/reporting/qtip/reporting-status.py new file mode 100644 index 0000000..5967cf6 --- /dev/null +++ b/reporting/qtip/reporting-status.py @@ -0,0 +1,110 @@ +#!/usr/bin/python +# +# 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 datetime +import os + +import jinja2 +import utils.reporting_utils as rp_utils +import utils.scenarioResult as sr + +installers = rp_utils.get_config('general.installers') +versions = rp_utils.get_config('general.versions') +PERIOD = rp_utils.get_config('general.period') + +# Logger +logger = rp_utils.getLogger("Qtip-Status") +reportingDate = datetime.datetime.now().strftime("%Y-%m-%d %H:%M") + +logger.info("*******************************************") +logger.info("* Generating reporting scenario status *") +logger.info("* Data retention = %s days *" % PERIOD) +logger.info("* *") +logger.info("*******************************************") + + +def prepare_profile_file(version): + profile_dir = './display/{}/qtip'.format(version) + if not os.path.exists(profile_dir): + os.makedirs(profile_dir) + + profile_file = '{}/scenario_history.txt'.format(profile_dir, version) + if not os.path.exists(profile_file): + with open(profile_file, 'w') as f: + info = 'date,scenario,installer,details,score\n' + f.write(info) + f.close() + return profile_file + + +def profile_results(results, installer, profile_fd): + result_criterias = {} + for s_p, s_p_result in results.iteritems(): + ten_criteria = len(s_p_result) + ten_score = sum(s_p_result) + + LASTEST_TESTS = rp_utils.get_config( + 'general.nb_iteration_tests_success_criteria') + four_result = s_p_result[:LASTEST_TESTS] + four_criteria = len(four_result) + four_score = sum(four_result) + + s_four_score = str(four_score / four_criteria) + s_ten_score = str(ten_score / ten_criteria) + + info = '{},{},{},{},{}\n'.format(reportingDate, + s_p, + installer, + s_ten_score, + s_four_score) + profile_fd.write(info) + result_criterias[s_p] = sr.ScenarioResult('OK', + s_four_score, + s_ten_score, + '100') + + logger.info("--------------------------") + return result_criterias + + +def render_html(prof_results, installer, version): + template_loader = jinja2.FileSystemLoader(".") + template_env = jinja2.Environment(loader=template_loader, + autoescape=True) + + template_file = "./qtip/template/index-status-tmpl.html" + template = template_env.get_template(template_file) + + render_outcome = template.render(prof_results=prof_results, + installer=installer, + period=PERIOD, + version=version, + date=reportingDate) + + with open('./display/{}/qtip/status-{}.html'.format(version, installer), + 'wb') as fh: + fh.write(render_outcome) + + +def render_reporter(): + for version in versions: + profile_file = prepare_profile_file(version) + profile_fd = open(profile_file, 'a') + for installer in installers: + results = rp_utils.getQtipResults(version, installer) + prof_results = profile_results(results, installer, profile_fd) + render_html(prof_results=prof_results, + installer=installer, + version=version) + profile_fd.close() + logger.info("Manage export CSV") + rp_utils.generate_csv(profile_file) + logger.info("CSV generated...") + +if __name__ == '__main__': + render_reporter() diff --git a/reporting/qtip/template/index-status-tmpl.html b/reporting/qtip/template/index-status-tmpl.html new file mode 100644 index 0000000..26da36c --- /dev/null +++ b/reporting/qtip/template/index-status-tmpl.html @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + +
    +
    +

    QTIP status page ({{version}}, {{date}})

    + +
    +
    +
    +
    +
    +

    {{installer}}

    +
    + +
    +

    List of last scenarios ({{version}}) run over the last {{period}} days

    + + + + + + + + {% for scenario,result in prof_results.iteritems() -%} + + + + + + + {%- endfor %} +
    Pod/ScenarioTrendLast 4 IterationsLast 10 Days
    {{scenario}}
    		{{prof_results[scenario].getFourDaysScore()}}{{prof_results[scenario].getTenDaysScore()}}
    +
    + + +
    +
    +
    diff --git a/reporting/reporting.yaml b/reporting/reporting.yaml index 8c5ce13..6af87c1 100644 --- a/reporting/reporting.yaml +++ b/reporting/reporting.yaml @@ -63,6 +63,8 @@ storperf: log_level: ERROR qtip: + log_level: ERROR + period: 1 bottleneck: diff --git a/reporting/utils/reporting_utils.py b/reporting/utils/reporting_utils.py index aab7a3f..0eae591 100644 --- a/reporting/utils/reporting_utils.py +++ b/reporting/utils/reporting_utils.py @@ -198,6 +198,35 @@ def getScenarioStatus(installer, version): return result_dict +def getQtipResults(version, installer): + period = get_config('qtip.period') + url_base = get_config('testapi.url') + + url = ("http://" + url_base + "?project=qtip" + + "&installer=" + installer + + "&version=" + version + "&period=" + str(period)) + request = Request(url) + + try: + response = urlopen(request) + k = response.read() + response.close() + results = json.loads(k)['results'] + except URLError as e: + print('Got an error code:', e) + + result_dict = {} + if results: + for r in results: + key = '{}/{}'.format(r['pod_name'], r['scenario']) + if key not in result_dict.keys(): + result_dict[key] = [] + result_dict[key].append(r['details']['score']) + + # return scenario_results + return result_dict + + def getNbtestOk(results): nb_test_ok = 0 for r in results: @@ -367,6 +396,14 @@ def export_csv(scenario_file_name, installer, version): scenario_installer_file.close +def generate_csv(scenario_file): + import shutil + # csv + # generate sub files based on scenario_history.txt + csv_file = scenario_file.replace('txt', 'csv') + shutil.copy2(scenario_file, csv_file) + + def export_pdf(pdf_path, pdf_doc_name): try: pdfkit.from_file(pdf_path, pdf_doc_name) -- cgit 1.2.3-korg