Merge "Remove useless odlreport2db args"

[functest.git] / ci / tier_builder.py

diff --git a/ci/tier_builder.py b/ci/tier_builder.py
index 82b58cd..e1c3e49 100644 (file)
--- a/ci/tier_builder.py
+++ b/ci/tier_builder.py
@@ -7,12 +7,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 
-import yaml
-
 import tier_handler as th
+import yaml
 
 
 class TierBuilder:
+
     def __init__(self, ci_installer, ci_scenario, testcases_file):
         self.ci_installer = ci_installer
         self.ci_scenario = ci_scenario
@@ -38,7 +38,7 @@ class TierBuilder:
         for dic_tier in self.dic_tier_array:
             tier = th.Tier(name=dic_tier['name'],
                            order=dic_tier['order'],
-                           ci=dic_tier['ci'],
+                           ci_loop=dic_tier['ci_loop'],
                            description=dic_tier['description'])
 
             for dic_testcase in dic_tier['testcases']:
@@ -48,6 +48,8 @@ class TierBuilder:
 
                 testcase = th.TestCase(name=dic_testcase['name'],
                                        dependency=dep,
+                                       criteria=dic_testcase['criteria'],
+                                       blocking=dic_testcase['blocking'],
                                        description=dic_testcase['description'])
                 if testcase.is_compatible(self.ci_installer, self.ci_scenario):
                     tier.add_test(testcase)
@@ -57,6 +59,12 @@ class TierBuilder:
     def get_tiers(self):
         return self.tier_objects
 
+    def get_tier_names(self):
+        tier_names = []
+        for tier in self.tier_objects:
+            tier_names.append(tier.get_name())
+        return tier_names
+
     def get_tier(self, tier_name):
         for i in range(0, len(self.tier_objects)):
             if self.tier_objects[i].get_name() == tier_name: