commit 392d47c2eaa5b827e3d55a78d25a3d0a4e37b3a2
author Jenkins <jenkins@review.openstack.org> Thu Mar 03 11:29:54 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 03 11:29:54 2016 +0000
tree 7fef5dfc902f4749a6f1cb14ec70fad242b4873c
parent d37f98d9eb7dc8b7186b6f1a20cfe5b929a3f66c
parent 9591412eb03ce66b938168480029d6ffabf13783

Merge "Fix ambiguous method name"

tempest/scenario/test_security_groups_basic_ops.py

diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py
index f3f2617..f59354d 100644
--- a/tempest/scenario/test_security_groups_basic_ops.py
+++ b/tempest/scenario/test_security_groups_basic_ops.py
@@ -155,7 +155,7 @@
         super(TestSecurityGroupsBasicOps, cls).resource_setup()
 
         cls.multi_node = CONF.compute.min_compute_nodes > 1 and \
-            test.is_filter_enabled("DifferentHostFilter")
+            test.is_scheduler_filter_enabled("DifferentHostFilter")
         if cls.multi_node:
             LOG.info("Working in Multi Node mode")
         else:

tempest/test.py

diff --git a/tempest/test.py b/tempest/test.py
index 1095981..fe3c770 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -180,7 +180,7 @@
     return False
 
 
-def is_filter_enabled(filter_name):
+def is_scheduler_filter_enabled(filter_name):
     """Check the list of enabled compute scheduler filters from config. """
 
     filters = CONF.compute_feature_enabled.scheduler_available_filters