Consolidates scheduler utils tests into a single file.
Two separate test files [nova/tests/unit/scheduler/test_filters_utils.py] and [nova/tests/unit/scheduler/filters/test_utils.py] appear to be testing methods from the same module nova.scheduler.filters.utils in a very similar fashion. Additional cleanup: * Removed superfluous directory [nova/tests/unit/functional] Change-Id: I4ac41cea3ab3d95a11aca80a469aca516bf44e52 Closes-Bug: #1463918
This commit is contained in:
Ming Yang
parent
7a78bc40d9
commit
2a1c595358
|
|
@ -18,11 +18,86 @@ from nova.scheduler.filters import utils
|
|||
from nova import test
|
||||
from nova.tests.unit.scheduler import fakes
|
||||
|
||||
_AGGREGATE_FIXTURES = [
|
||||
objects.Aggregate(
|
||||
id=1,
|
||||
name='foo',
|
||||
hosts=['fake-host'],
|
||||
metadata={'k1': '1', 'k2': '2'},
|
||||
),
|
||||
objects.Aggregate(
|
||||
id=2,
|
||||
name='bar',
|
||||
hosts=['fake-host'],
|
||||
metadata={'k1': '3', 'k2': '4'},
|
||||
),
|
||||
objects.Aggregate(
|
||||
id=3,
|
||||
name='bar',
|
||||
hosts=['fake-host'],
|
||||
metadata={'k1': '6,7', 'k2': '8, 9'},
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
class TestUtils(test.NoDBTestCase):
|
||||
def setUp(self):
|
||||
super(TestUtils, self).setUp()
|
||||
|
||||
def test_aggregate_values_from_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
values = utils.aggregate_values_from_key(host_state, key_name='k1')
|
||||
|
||||
self.assertEqual(set(['1', '3', '6,7']), values)
|
||||
|
||||
def test_aggregate_values_from_key_with_wrong_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
values = utils.aggregate_values_from_key(host_state, key_name='k3')
|
||||
|
||||
self.assertEqual(set(), values)
|
||||
|
||||
def test_aggregate_metadata_get_by_host_no_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
metadata = utils.aggregate_metadata_get_by_host(host_state)
|
||||
|
||||
self.assertIn('k1', metadata)
|
||||
self.assertEqual(set(['1', '3', '7', '6']), metadata['k1'])
|
||||
self.assertIn('k2', metadata)
|
||||
self.assertEqual(set(['9', '8', '2', '4']), metadata['k2'])
|
||||
|
||||
def test_aggregate_metadata_get_by_host_with_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
metadata = utils.aggregate_metadata_get_by_host(host_state, 'k1')
|
||||
|
||||
self.assertIn('k1', metadata)
|
||||
self.assertEqual(set(['1', '3', '7', '6']), metadata['k1'])
|
||||
|
||||
def test_aggregate_metadata_get_by_host_empty_result(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': []})
|
||||
|
||||
metadata = utils.aggregate_metadata_get_by_host(host_state, 'k3')
|
||||
|
||||
self.assertEqual({}, metadata)
|
||||
|
||||
def test_validate_num_values(self):
|
||||
f = utils.validate_num_values
|
||||
|
||||
self.assertEqual("x", f(set(), default="x"))
|
||||
self.assertEqual(1, f(set(["1"]), cast_to=int))
|
||||
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_instance_uuids_overlap(self):
|
||||
inst1 = objects.Instance(uuid='aa')
|
||||
inst2 = objects.Instance(uuid='bb')
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
# All Rights Reserved.
|
||||
#
|
||||
# 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 import objects
|
||||
from nova.scheduler.filters import utils
|
||||
from nova import test
|
||||
from nova.tests.unit.scheduler import fakes
|
||||
|
||||
|
||||
_AGGREGATE_FIXTURES = [
|
||||
objects.Aggregate(
|
||||
id=1,
|
||||
name='foo',
|
||||
hosts=['fake-host'],
|
||||
metadata={'k1': '1', 'k2': '2'},
|
||||
),
|
||||
objects.Aggregate(
|
||||
id=2,
|
||||
name='bar',
|
||||
hosts=['fake-host'],
|
||||
metadata={'k1': '3', 'k2': '4'},
|
||||
),
|
||||
objects.Aggregate(
|
||||
id=3,
|
||||
name='bar',
|
||||
hosts=['fake-host'],
|
||||
metadata={'k1': '6,7', 'k2': '8, 9'},
|
||||
),
|
||||
]
|
||||
|
||||
|
||||
class UtilsTestCase(test.NoDBTestCase):
|
||||
def test_validate_num_values(self):
|
||||
f = utils.validate_num_values
|
||||
|
||||
self.assertEqual("x", f(set(), default="x"))
|
||||
self.assertEqual(1, f(set(["1"]), cast_to=int))
|
||||
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(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
values = utils.aggregate_values_from_key(host_state, key_name='k1')
|
||||
|
||||
self.assertEqual(set(['1', '3', '6,7']), values)
|
||||
|
||||
def test_aggregate_values_from_key_with_wrong_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
values = utils.aggregate_values_from_key(host_state, key_name='k3')
|
||||
|
||||
self.assertEqual(set(), values)
|
||||
|
||||
def test_aggregate_metadata_get_by_host_no_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
metadata = utils.aggregate_metadata_get_by_host(host_state)
|
||||
|
||||
self.assertIn('k1', metadata)
|
||||
self.assertEqual(set(['1', '3', '7', '6']), metadata['k1'])
|
||||
self.assertIn('k2', metadata)
|
||||
self.assertEqual(set(['9', '8', '2', '4']), metadata['k2'])
|
||||
|
||||
def test_aggregate_metadata_get_by_host_with_key(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': _AGGREGATE_FIXTURES})
|
||||
|
||||
metadata = utils.aggregate_metadata_get_by_host(host_state, 'k1')
|
||||
|
||||
self.assertIn('k1', metadata)
|
||||
self.assertEqual(set(['1', '3', '7', '6']), metadata['k1'])
|
||||
|
||||
def test_aggregate_metadata_get_by_host_empty_result(self):
|
||||
host_state = fakes.FakeHostState(
|
||||
'fake', 'node', {'aggregates': []})
|
||||
|
||||
metadata = utils.aggregate_metadata_get_by_host(host_state, 'k3')
|
||||
|
||||
self.assertEqual({}, metadata)
|
||||
Loading…
Reference in New Issue