Merge "Refactor reporting dir"

3 files changed, 25 insertions, 25 deletions

diff --git a/utils/test/reporting/functest/template/index-status-tmpl.html b/utils/test/reporting/functest/template/index-status-tmpl.html
index e3c9c5fc0..094bbf8a2 100644
--- a/utils/test/reporting/functest/template/index-status-tmpl.html
+++ b/utils/test/reporting/functest/template/index-status-tmpl.html
@@ -3,12 +3,12 @@
     <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">
+    <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/gauge.js"></script>
-    <script type="text/javascript" src="../../../js/trend.js"></script>
+    <script type="text/javascript" src="../../js/gauge.js"></script>
+    <script type="text/javascript" src="../../js/trend.js"></script>
     <script>
     function onDocumentReady() {
     	// Gauge management
@@ -26,7 +26,7 @@
         }
         
         // trend line management
-        d3.csv("./scenario_history.txt", function(data) {
+        d3.csv("./scenario_history.csv", function(data) {
        // ***************************************
        // Create the trend line
       {% for scenario,iteration in scenario_stats.iteritems() -%}
@@ -69,11 +69,11 @@ $(document).ready(function (){
         <h3 class="text-muted">Functest 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>
+            <li class="active"><a href="../../index.html">Home</a></li>
+            <li><a href="status-apex.html">Apex</a></li>
+            <li><a href="status-compass.html">Compass</a></li>
+            <li><a href="status-fuel.html">Fuel</a></li>
+            <li><a href="status-joid.html">Joid</a></li>
           </ul>
         </nav>
       </div>
@@ -133,13 +133,13 @@ $(document).ready(function (){
                         <tr class="tr-weather-weather">
                             {% for test in items[scenario] -%}
                             {% if test.getCriteria() > 2 -%}
-                                <td><img src="../../img/weather-clear.png"></td>
+                                <td><img src="../../../img/weather-clear.png"></td>
                             {%- elif test.getCriteria() > 1 -%}
-                                <td><img src="../../img/weather-few-clouds.png"></td>
+                                <td><img src="../../../img/weather-few-clouds.png"></td>
                             {%- elif test.getCriteria() > 0 -%}
-                                <td><img src="../../img/weather-overcast.png"></td>
+                                <td><img src="../../../img/weather-overcast.png"></td>
                             {%- elif test.getCriteria() > -1 -%}
-                                <td><img src="../../img/weather-storm.png"></td>
+                                <td><img src="../../../img/weather-storm.png"></td>
                             {%- endif %}
                             {%- endfor %}
                         </tr>
diff --git a/utils/test/reporting/functest/template/index-tempest-tmpl.html b/utils/test/reporting/functest/template/index-tempest-tmpl.html
index 42d7ed339..db483070f 100644
--- a/utils/test/reporting/functest/template/index-tempest-tmpl.html
+++ b/utils/test/reporting/functest/template/index-tempest-tmpl.html
@@ -3,7 +3,7 @@
     <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">
+    <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">
@@ -21,11 +21,11 @@
         <h3 class="text-muted">Tempest status 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-tempest-apex.html">Apex</a></li>
-            <li><a href="index-tempest-compass.html">Compass</a></li>
-            <li><a href="index-tempest-fuel.html">Fuel</a></li>
-            <li><a href="index-tempest-joid.html">Joid</a></li>
+            <li class="active"><a href="../../index.html">Home</a></li>
+            <li><a href="tempest-apex.html">Apex</a></li>
+            <li><a href="tempest-compass.html">Compass</a></li>
+            <li><a href="tempest-fuel.html">Fuel</a></li>
+            <li><a href="tempest-joid.html">Joid</a></li>
           </ul>
         </nav>
       </div>
diff --git a/utils/test/reporting/functest/template/index-vims-tmpl.html b/utils/test/reporting/functest/template/index-vims-tmpl.html
index 3836be91f..033c8ab33 100644
--- a/utils/test/reporting/functest/template/index-vims-tmpl.html
+++ b/utils/test/reporting/functest/template/index-vims-tmpl.html
@@ -3,7 +3,7 @@
     <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">
+    <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">
@@ -21,11 +21,11 @@
         <h3 class="text-muted">vIMS status 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-vims-fuel.html">Fuel</a></li>
-            <li><a href="index-vims-compass.html">Compass</a></li>
-            <li><a href="index-vims-joid.html">JOID</a></li>
-            <li><a href="index-vims-apex.html">APEX</a></li>
+            <li class="active"><a href="../../index.html">Home</a></li>
+            <li><a href="vims-fuel.html">Fuel</a></li>
+            <li><a href="vims-compass.html">Compass</a></li>
+            <li><a href="vims-joid.html">JOID</a></li>
+            <li><a href="vims-apex.html">APEX</a></li>
           </ul>
         </nav>
       </div>