From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 26 Nov 2019 01:24:20 +0000 (+0100)
Subject: Update scheduler_available_filters
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f6d318963f62ab40b61f85c4e75f9f94521b4c41;p=functest.git

Update scheduler_available_filters

Else few tests are skipped if DifferentHostFilter is not available.

Change-Id: Idfc524216dc8503e590d4fed569a43e99ea22123
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit c8a4d5f41f90dcbc60e3b276ed560b3b10be7bef)
---

diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index 2d9346f54..01bbaa341 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -20,6 +20,7 @@ compute-feature-enabled:
     rdp_console: false
     rescue: true
     resize: true
+    scheduler_available_filters: RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter
     serial_console: true
     shelve: true
     snapshot: true
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index d30d59468..6269540ec 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -270,13 +270,6 @@ class TempestCommon(singlevm.VmReady2):
             # enable multinode tests
             rconfig.set('compute', 'min_compute_nodes', compute_cnt)
             rconfig.set('compute-feature-enabled', 'live_migration', True)
-        filters = ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter',
-                   'ComputeCapabilitiesFilter', 'ImagePropertiesFilter',
-                   'ServerGroupAntiAffinityFilter',
-                   'ServerGroupAffinityFilter']
-        rconfig.set(
-            'compute-feature-enabled', 'scheduler_available_filters',
-            functest_utils.convert_list_to_ini(filters))
         if os.environ.get('OS_REGION_NAME'):
             rconfig.set('identity', 'region', os.environ.get('OS_REGION_NAME'))
         if env.get("NEW_USER_ROLE").lower() != "member":