1 files changed, 15 insertions, 38 deletions
diff --git a/functest/cli/commands/cli_testcase.py b/functest/cli/commands/cli_testcase.py
index ee7afa5a..a8ead5f5 100644
--- a/functest/cli/commands/cli_testcase.py
+++ b/functest/cli/commands/cli_testcase.py
@@ -5,27 +5,16 @@
 # 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
-#
-
-""" global variables """
 
-import pkg_resources
+# pylint: disable=missing-docstring
 
 import click
 
-import functest.ci.tier_builder as tb
-from functest.utils.constants import CONST
-import functest.utils.functest_utils as ft_utils
-import functest.utils.functest_vacation as vacation
+from functest.cli.commands import cli_tier
+from functest.utils import functest_utils
 
 
-class Testcase(object):
-
-    def __init__(self):
-        self.tiers = tb.TierBuilder(
-            CONST.__getattribute__('INSTALLER_TYPE'),
-            CONST.__getattribute__('DEPLOY_SCENARIO'),
-            pkg_resources.resource_filename('functest', 'ci/testcases.yaml'))
+class Testcase(cli_tier.Tier):
 
     def list(self):
         summary = ""
@@ -34,40 +23,28 @@ class Testcase(object):
                 summary += (" %s\n" % test.get_name())
         return summary
 
-    def show(self, testname):
-        description = self.tiers.get_test(testname)
+    def show(self, name):
+        description = self.tiers.get_test(name)
         return description
 
     @staticmethod
-    def run(testname, noclean=False, report=False):
-
-        flags = ""
-        if noclean:
-            flags += "-n "
-        if report:
-            flags += "-r "
-
-        if testname == 'vacation':
-            vacation.main()
-        else:
-            tests = testname.split(",")
-            for test in tests:
-                cmd = "run_tests {}-t {}".format(flags, test)
-                ft_utils.execute_command(cmd)
+    def run(name, noclean=False, report=False):
+        tests = name.split(",")
+        for test in tests:
+            cmd = "run_tests {}-t {}".format(
+                Testcase.get_flags(noclean, report), test)
+            functest_utils.execute_command(cmd)
 
 
 class CliTestcase(Testcase):
 
-    def __init__(self):
-        super(CliTestcase, self).__init__()
-
     def list(self):
         click.echo(super(CliTestcase, self).list())
 
-    def show(self, testname):
-        testcase_show = super(CliTestcase, self).show(testname)
+    def show(self, name):
+        testcase_show = super(CliTestcase, self).show(name)
         if testcase_show:
             click.echo(testcase_show)
         else:
             click.echo("The test case '%s' does not exist or is not supported."
-                       % testname)
+                       % name)