Merge "Enable tempest offline by use_custom_images=True"

[functest.git] / functest / ci / tier_builder.py

diff --git a/functest/ci/tier_builder.py b/functest/ci/tier_builder.py
old mode 100755 (executable)
new mode 100644 (file)
index dae7c73..f803846
--- a/functest/ci/tier_builder.py
+++ b/functest/ci/tier_builder.py
@@ -46,12 +46,16 @@ class TierBuilder(object):
                 scenario = dic_testcase['dependencies']['scenario']
                 dep = th.Dependency(installer, scenario)
 
-                testcase = th.TestCase(name=dic_testcase['name'],
+                testcase = th.TestCase(name=dic_testcase['case_name'],
+                                       enabled=dic_testcase.get(
+                                           'enabled', True),
                                        dependency=dep,
                                        criteria=dic_testcase['criteria'],
                                        blocking=dic_testcase['blocking'],
                                        description=dic_testcase['description'])
-                if testcase.is_compatible(self.ci_installer, self.ci_scenario):
+                if (testcase.is_compatible(self.ci_installer,
+                                           self.ci_scenario) and
+                        testcase.is_enabled()):
                     tier.add_test(testcase)
 
             self.tier_objects.append(tier)
@@ -71,6 +75,12 @@ class TierBuilder(object):
                 return self.tier_objects[i]
         return None
 
+    def get_tier_name(self, test_name):
+        for i in range(0, len(self.tier_objects)):
+            if self.tier_objects[i].is_test(test_name):
+                return self.tier_objects[i].name
+        return None
+
     def get_test(self, test_name):
         for i in range(0, len(self.tier_objects)):
             if self.tier_objects[i].is_test(test_name):