X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Ftier_builder.py;h=d2722dc224b639ff226fd26b9c90f00d41ab6ba1;hb=f617cbf76e7fe53f8ee7841a3c75f2fa2e8aa5ce;hp=dae7c73e883bee25f4f101d0f26cfc8f3fe7799f;hpb=48fc7087653384cc83a6f89fa984ad6281e1752b;p=functest.git

diff --git a/functest/ci/tier_builder.py b/functest/ci/tier_builder.py
old mode 100755
new mode 100644
index dae7c73e8..d2722dc22
--- a/functest/ci/tier_builder.py
+++ b/functest/ci/tier_builder.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
+
+# Copyright (c) 2016 Ericsson AB and others.
 #
-# jose.lausuch@ericsson.com
 # All rights reserved. This program and the accompanying materials
 # 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
-#
 
 import tier_handler as th
 import yaml
@@ -46,13 +46,20 @@ 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):
+                                       description=dic_testcase['description'],
+                                       project=dic_testcase['project_name'])
+                if (testcase.is_compatible(self.ci_installer,
+                                           self.ci_scenario) and
+                        testcase.is_enabled()):
                     tier.add_test(testcase)
+                else:
+                    tier.skip_test(testcase)
 
             self.tier_objects.append(tier)
 
@@ -71,6 +78,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):