Merge "Split out metrics filter unit tests"

nova/tests/scheduler/filters/test_metrics_filters.py

@@ -0,0 +1,34 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from nova.scheduler.filters import metrics_filter
+from nova import test
+from nova.tests.scheduler import fakes
+
+
+class TestMetricsFilter(test.NoDBTestCase):
+
+    def test_metrics_filter_pass(self):
+        self.flags(weight_setting=['foo=1', 'bar=2'], group='metrics')
+        filt_cls = metrics_filter.MetricsFilter()
+        metrics = dict(foo=1, bar=2)
+        host = fakes.FakeHostState('host1', 'node1',
+                                   attribute_dict={'metrics': metrics})
+        self.assertTrue(filt_cls.host_passes(host, None))
+
+    def test_metrics_filter_missing_metrics(self):
+        self.flags(weight_setting=['foo=1', 'bar=2'], group='metrics')
+        filt_cls = metrics_filter.MetricsFilter()
+        metrics = dict(foo=1)
+        host = fakes.FakeHostState('host1', 'node1',
+                                   attribute_dict={'metrics': metrics})
+        self.assertFalse(filt_cls.host_passes(host, None))

nova/tests/scheduler/test_host_filters.py

@@ -116,19 +116,3 @@ class HostFiltersTestCase(test.NoDBTestCase):
     def test_group_affinity_filter_fails_legacy(self):
         self._test_group_affinity_filter_fails(
                 'GroupAffinityFilter', 'legacy')
-
-    def test_metrics_filter_pass(self):
-        self.flags(weight_setting=['foo=1', 'bar=2'], group='metrics')
-        metrics = dict(foo=1, bar=2)
-        host = fakes.FakeHostState('host1', 'node1',
-                                   attribute_dict={'metrics': metrics})
-        filt_cls = self.class_map['MetricsFilter']()
-        self.assertTrue(filt_cls.host_passes(host, None))
-
-    def test_metrics_filter_missing_metrics(self):
-        self.flags(weight_setting=['foo=1', 'bar=2'], group='metrics')
-        metrics = dict(foo=1)
-        host = fakes.FakeHostState('host1', 'node1',
-                                   attribute_dict={'metrics': metrics})
-        filt_cls = self.class_map['MetricsFilter']()
-        self.assertFalse(filt_cls.host_passes(host, None))