Merge "Lifted requirements.pip one level up to meet the basic structure of OpenStack...

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

diff --git a/functest/opnfv_tests/features/domino.py b/functest/opnfv_tests/features/domino.py
index 445a7a6..942b474 100755 (executable)
--- a/functest/opnfv_tests/features/domino.py
+++ b/functest/opnfv_tests/features/domino.py
@@ -15,28 +15,29 @@
 # 0.4: refactoring to match Test abstraction class
 
 import argparse
+import os
 import sys
 import time
 
 from functest.core import TestCasesBase
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
+import functest.utils.functest_constants as ft_constants
 
 
-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')
+class DominoTests(TestCasesBase.TestCasesBase):
     logger = ft_logger.Logger("domino").getLogger()
 
     def __init__(self):
+        super(DominoTests, 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"
+        cmd = ('cd %s && ./tests/run_multinode.sh' %
+               ft_constants.DOMINO_REPO_DIR)
+        log_file = os.path.join(
+            ft_constants.FUNCTEST_RESULTS_DIR, "domino.log")
         start_time = time.time()
 
         ret = ft_utils.execute_command(cmd,
@@ -65,13 +66,14 @@ class DominoCases(TestCasesBase.TestCasesBase):
         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 = parser.parse_args()
-    domino = DominoCases()
+    args = vars(parser.parse_args())
+    domino = DominoTests()
     try:
         result = domino.main(**args)
         if result != TestCasesBase.TestCasesBase.EX_OK: