Merge "More Unit Tests for tempest and IMS module"

[functest.git] / functest / opnfv_tests / features / domino.py

diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py
old mode 100755 (executable)
new mode 100644 (file)
index be3dd54..e34429b
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
@@ -14,70 +14,12 @@
 # 0.3: add report flag to push results when needed
 # 0.4: refactoring to match Test abstraction class
 
-import argparse
-import sys
-import time
+import functest.core.feature as base
 
-from functest.core import TestCasesBase
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as ft_utils
-
-
-class DominoCases(TestCasesBase.TestCasesBase):
-    DOMINO_REPO = \
-        ft_utils.get_functest_config('general.directories.dir_repo_domino')
-    RESULTS_DIR = \
-        ft_utils.get_functest_config('general.directories.dir_results')
-    logger = ft_logger.Logger("domino").getLogger()
 
+class Domino(base.Feature):
     def __init__(self):
-        super(DominoCases, self).__init__()
-        self.project_name = "domino"
-        self.case_name = "domino-multinode"
-
-    def main(self, **kwargs):
-        cmd = 'cd %s && ./tests/run_multinode.sh' % self.DOMINO_REPO
-        log_file = self.RESULTS_DIR + "/domino.log"
-        start_time = time.time()
-
-        ret = ft_utils.execute_command(cmd,
-                                       output_file=log_file)
-
-        stop_time = time.time()
-        duration = round(stop_time - start_time, 1)
-        if ret == 0 and duration > 1:
-            self.logger.info("domino OK")
-            status = 'PASS'
-        elif ret == 0 and duration <= 1:
-            self.logger.info("domino TEST SKIPPED")
-            status = 'SKIP'
-        else:
-            self.logger.info("domino FAILED")
-            status = "FAIL"
-
-        # report status only if tests run (FAIL OR PASS)
-        if status is not "SKIP":
-            self.criteria = status
-            self.start_time = start_time
-            self.stop_time = stop_time
-            self.details = {}
-
-    def run(self):
-        kwargs = {}
-        return self.main(**kwargs)
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument("-r", "--report",
-                        help="Create json result file",
-                        action="store_true")
-    args = vars(parser.parse_args())
-    domino = DominoCases()
-    try:
-        result = domino.main(**args)
-        if result != TestCasesBase.TestCasesBase.EX_OK:
-            sys.exit(result)
-        if args['report']:
-            sys.exit(domino.push_to_db())
-    except Exception:
-        sys.exit(TestCasesBase.TestCasesBase.EX_RUN_ERROR)
+        super(Domino, self).__init__(project='domino',
+                                     case='domino-multinode',
+                                     repo='dir_repo_domino')
+        self.cmd = 'cd %s && ./tests/run_multinode.sh' % self.repo