[dovetail] split the sla check results into process recovery and service

recovery for HA tcs

make sla check for process recovery optional: only check when sla is
set.

JIRA: YARDSTICK-1512

Change-Id: I717d39614a1af2ee9e62dec3b8a32d7d611f557e
Signed-off-by: rexlee8776 <limingjiang@huawei.com>

2 files changed, 19 insertions, 20 deletions

diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py
index 971bae1e9..8f1f53cde 100644
--- a/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py
+++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_multi.py
@@ -62,20 +62,19 @@ class MultiMonitor(basemonitor.BaseMonitor):
         outage_time = (
             last_outage - first_outage if last_outage > first_outage else 0
         )
+        self._result = {"outage_time": outage_time}
         LOG.debug("outage_time is: %f", outage_time)
 
         max_outage_time = 0
-        if "max_outage_time" in self._config["sla"]:
-            max_outage_time = self._config["sla"]["max_outage_time"]
-        elif "max_recover_time" in self._config["sla"]:
-            max_outage_time = self._config["sla"]["max_recover_time"]
-        else:
-            raise RuntimeError("'max_outage_time' or 'max_recover_time' "
-                               "config is not found")
-        self._result = {"outage_time": outage_time}
-
-        if outage_time > max_outage_time:
-            LOG.error("SLA failure: %f > %f", outage_time, max_outage_time)
-            return False
-        else:
-            return True
+        if self._config.get("sla"):
+            if "max_outage_time" in self._config["sla"]:
+                max_outage_time = self._config["sla"]["max_outage_time"]
+            elif "max_recover_time" in self._config["sla"]:
+                max_outage_time = self._config["sla"]["max_recover_time"]
+            else:
+                raise RuntimeError("'max_outage_time' or 'max_recover_time' "
+                                   "config is not found")
+            if outage_time > max_outage_time:
+                LOG.error("SLA failure: %f > %f", outage_time, max_outage_time)
+                return False
+        return True
diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_process.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_process.py
index 8d2f2633c..280e5811d 100644
--- a/yardstick/benchmark/scenarios/availability/monitor/monitor_process.py
+++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_process.py
@@ -46,12 +46,12 @@ class MonitorProcess(basemonitor.BaseMonitor):
 
     def verify_SLA(self):
         outage_time = self._result.get('outage_time', None)
-        max_outage_time = self._config["sla"]["max_recover_time"]
-        if outage_time > max_outage_time:
-            LOG.info("SLA failure: %f > %f", outage_time, max_outage_time)
-            return False
-        else:
-            return True
+        if self._config.get("sla"):
+            max_outage_time = self._config["sla"]["max_recover_time"]
+            if outage_time > max_outage_time:
+                LOG.info("SLA failure: %f > %f", outage_time, max_outage_time)
+                return False
+        return True
 
 
 def _test():    # pragma: no cover