Merge "Add storperf reportign status page Create associated static storperf page Prepare vsperf, qtip, bottlenecks Put Yardstick scenario class into utils directory"

2 files changed, 1 insertions, 30 deletions

diff --git a/utils/test/reporting/yardstick/reporting-status.py b/utils/test/reporting/yardstick/reporting-status.py
index a0f0b0184..12f42ca31 100644
--- a/utils/test/reporting/yardstick/reporting-status.py
+++ b/utils/test/reporting/yardstick/reporting-status.py
@@ -10,7 +10,7 @@ import datetime
 import jinja2
 import os
 
-import scenarioResult as sr
+import utils.scenarioResult as sr
 from scenarios import config as cf
 
 # manage conf
diff --git a/utils/test/reporting/yardstick/scenarioResult.py b/utils/test/reporting/yardstick/scenarioResult.py
deleted file mode 100644
index 1f7eb2b24..000000000
--- a/utils/test/reporting/yardstick/scenarioResult.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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
-#
-
-
-class ScenarioResult(object):
-    def __init__(self, status, four_days_score='', ten_days_score='',
-                 score_percent=0.0):
-        self.status = status
-        self.four_days_score = four_days_score
-        self.ten_days_score = ten_days_score
-        self.score_percent = score_percent
-
-    def getStatus(self):
-        return self.status
-
-    def getTenDaysScore(self):
-        return self.ten_days_score
-
-    def getFourDaysScore(self):
-        return self.four_days_score
-
-    def getScorePercent(self):
-        return self.score_percent