Merge "Fix AggregateCoreFilter return incorrect value"

nova/scheduler/filters/utils.py

@@ -66,7 +66,7 @@ def validate_num_values(vals, default=None, cast_to=int, based_on=min):
                      "of which the minimum value will be used."),
                  {'num_values': num_values})
 
-    return cast_to(based_on(vals))
+    return based_on([cast_to(val) for val in vals])
 
 
 def instance_uuids_overlap(host_state, uuids):

nova/tests/unit/scheduler/test_filters_utils.py

@@ -49,6 +49,7 @@ class UtilsTestCase(test.NoDBTestCase):
         self.assertEqual(1.0, f(set(["1"]), cast_to=float))
         self.assertEqual(1, f(set([1, 2]), based_on=min))
         self.assertEqual(2, f(set([1, 2]), based_on=max))
+        self.assertEqual(9, f(set(['10', '9']), based_on=min))
 
     def test_aggregate_values_from_key(self):
         host_state = fakes.FakeHostState(