add qtip reporting 25/33425/6
authorSerenaFeng <feng.xiaowei@zte.com.cn>
Mon, 17 Apr 2017 09:40:40 +0000 (17:40 +0800)
committerSerenaFeng <feng.xiaowei@zte.com.cn>
Mon, 8 May 2017 06:25:53 +0000 (14:25 +0800)
Change-Id: Ie573486080fbd36857ff0709d53f6bdcdd43363e
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
utils/test/reporting/docker/reporting.sh
utils/test/reporting/js/trend-qtip.js [new file with mode: 0644]
utils/test/reporting/qtip/__init__.py [new file with mode: 0644]
utils/test/reporting/qtip/index.html [new file with mode: 0644]
utils/test/reporting/qtip/reporting-status.py [new file with mode: 0644]
utils/test/reporting/qtip/template/index-status-tmpl.html [new file with mode: 0644]
utils/test/reporting/reporting.yaml
utils/test/reporting/utils/reporting_utils.py

index 1de13ae..7f5b005 100755 (executable)
@@ -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/utils/test/reporting/js/trend-qtip.js b/utils/test/reporting/js/trend-qtip.js
new file mode 100644 (file)
index 0000000..d4c8735
--- /dev/null
@@ -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/utils/test/reporting/qtip/__init__.py b/utils/test/reporting/qtip/__init__.py
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/utils/test/reporting/qtip/index.html b/utils/test/reporting/qtip/index.html
new file mode 100644 (file)
index 0000000..0f9df85
--- /dev/null
@@ -0,0 +1,51 @@
+ <html>
+  <head>
+    <meta charset="utf-8">
+    <!-- Bootstrap core CSS -->
+    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+    <link href="default.css" rel="stylesheet">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+    <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script type="text/javascript">
+    $(document).ready(function (){
+        $(".btn-more").click(function() {
+            $(this).hide();
+            $(this).parent().find(".panel-default").show();
+        });
+    })
+    </script>
+  </head>
+    <body>
+    <div class="container">
+      <div class="masthead">
+        <h3 class="text-muted">QTIP reporting page</h3>
+        <nav>
+          <ul class="nav nav-justified">
+            <li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
+            <li><a href="index-status-apex.html">Apex</a></li>
+            <li><a href="index-status-compass.html">Compass</a></li>
+            <li><a href="index-status-fuel.html">Fuel</a></li>
+            <li><a href="index-status-joid.html">Joid</a></li>
+          </ul>
+        </nav>
+      </div>
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+        <div class="page-main">
+            <h2>QTIP</h2>
+            QTIP is used in OPNFV for verifying the OPNFV infrastructure and some of the OPNFV features.
+            <br>The QTIP framework is deployed in several OPNFV community labs.
+            <br>It is installer, infrastructure and application independent.
+
+            <h2>Useful Links</h2>
+            <li><a href="https://wiki.opnfv.org/download/attachments/5734608/qtip%20in%20depth.pdf?version=1&modificationDate=1463410431000&api=v2">QTIP in Depth</a></li>
+            <li><a href="https://git.opnfv.org/cgit/qtip">QTIP Repo</a></li>
+            <li><a href="https://wiki.opnfv.org/display/qtip">QTIP Project</a></li>
+            <li><a href="https://build.opnfv.org/ci/view/qtip/">QTIP Jenkins page</a></li>
+            <li><a href="https://jira.opnfv.org/browse/QTIP-119?jql=project%20%3D%20QTIP">JIRA</a></li>
+
+        </div>
+    </div>
+    <div class="col-md-1"></div>
+</div>
diff --git a/utils/test/reporting/qtip/reporting-status.py b/utils/test/reporting/qtip/reporting-status.py
new file mode 100644 (file)
index 0000000..5967cf6
--- /dev/null
@@ -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/utils/test/reporting/qtip/template/index-status-tmpl.html b/utils/test/reporting/qtip/template/index-status-tmpl.html
new file mode 100644 (file)
index 0000000..26da36c
--- /dev/null
@@ -0,0 +1,86 @@
+ <html>
+  <head>
+    <meta charset="utf-8">
+    <!-- Bootstrap core CSS -->
+    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
+    <link href="../../css/default.css" rel="stylesheet">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
+    <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="http://d3js.org/d3.v2.min.js"></script>
+    <script type="text/javascript" src="../../js/trend-qtip.js"></script>
+    <script>
+        // trend line management
+        d3.csv("./scenario_history.csv", function(data) {
+            // ***************************************
+            // Create the trend line
+            {% for scenario in prof_results.keys() -%}
+            // for scenario {{scenario}}
+            // Filter results
+                var trend{{loop.index}} = data.filter(function(row) {
+                    return row["scenario"]=="{{scenario}}" && row["installer"]=="{{installer}}";
+                })
+            // Parse the date
+            trend{{loop.index}}.forEach(function(d) {
+                d.date = parseDate(d.date);
+                d.score = +d.score
+            });
+            // Draw the trend line
+            var mytrend = trend("#trend_svg{{loop.index}}",trend{{loop.index}})
+            // ****************************************
+            {%- endfor %}
+        });
+    </script>
+    <script type="text/javascript">
+    $(document).ready(function (){
+        $(".btn-more").click(function() {
+            $(this).hide();
+            $(this).parent().find(".panel-default").show();
+        });
+    })
+    </script>
+  </head>
+    <body>
+    <div class="container">
+      <div class="masthead">
+          <h3 class="text-muted">QTIP status page ({{version}}, {{date}})</h3>
+        <nav>
+          <ul class="nav nav-justified">
+            <li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
+            <li><a href="index-status-apex.html">Apex</a></li>
+            <li><a href="index-status-compass.html">Compass</a></li>
+            <li><a href="index-status-fuel.html">Fuel</a></li>
+            <li><a href="index-status-joid.html">Joid</a></li>
+          </ul>
+        </nav>
+      </div>
+<div class="row">
+    <div class="col-md-1"></div>
+    <div class="col-md-10">
+        <div class="page-header">
+            <h2>{{installer}}</h2>
+        </div>
+
+        <div class="scenario-overview">
+            <div class="panel-heading"><h4><b>List of last scenarios ({{version}}) run over the last {{period}} days </b></h4></div>
+                <table class="table">
+                    <tr>
+                        <th width="25%">Pod/Scenario</th>
+                        <th width="25%">Trend</th>
+                        <th width="25%">Last 4 Iterations</th>
+                        <th width="25%">Last 10 Days</th>
+                    </tr>
+                        {% for scenario,result in prof_results.iteritems() -%}
+                            <tr class="tr-ok">
+                                <td>{{scenario}}</td>
+                                <td><div id="trend_svg{{loop.index}}"></div></td>
+                                <td>{{prof_results[scenario].getFourDaysScore()}}</td>
+                                <td>{{prof_results[scenario].getTenDaysScore()}}</td>
+                            </tr>
+                        {%- endfor %}
+                </table>
+        </div>
+
+
+    </div>
+    <div class="col-md-1"></div>
+</div>
index 8c5ce13..6af87c1 100644 (file)
@@ -63,6 +63,8 @@ storperf:
     log_level: ERROR
 
 qtip:
+    log_level: ERROR
+    period: 1
 
 bottleneck:
 
index aab7a3f..0eae591 100644 (file)
@@ -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)