Merge "Check instance_type in compute capability filter"

2 files changed, 0 insertions, 14 deletions

diff --git a/nova/scheduler/filters/compute_filter.py b/nova/scheduler/filters/compute_filter.py
index 019068269..93ec7d16e 100644
--- a/nova/scheduler/filters/compute_filter.py
+++ b/nova/scheduler/filters/compute_filter.py
@@ -28,9 +28,6 @@ class ComputeFilter(filters.BaseHostFilter):
 
     def host_passes(self, host_state, filter_properties):
         """Returns True for only active compute nodes"""
-        instance_type = filter_properties.get('instance_type')
-        if not instance_type:
-            return True
         capabilities = host_state.capabilities
         service = host_state.service
 
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index 1f35ede9b..8b160f288 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -629,17 +629,6 @@ class HostFiltersTestCase(test.TestCase):
                  'service': service})
         self.assertFalse(filt_cls.host_passes(host, filter_properties))
 
-    def test_compute_filter_passes_on_no_instance_type(self):
-        self._stub_service_is_up(True)
-        filt_cls = self.class_map['ComputeFilter']()
-        filter_properties = {}
-        capabilities = {'enabled': False}
-        service = {'disabled': False}
-        host = fakes.FakeHostState('host1', 'node1',
-                {'free_ram_mb': 1024, 'capabilities': capabilities,
-                 'service': service})
-        self.assertTrue(filt_cls.host_passes(host, filter_properties))
-
     def test_image_properties_filter_passes_same_inst_props(self):
         self._stub_service_is_up(True)
         filt_cls = self.class_map['ImagePropertiesFilter']()