openstack/placement
Code Issues Proposed changes

[scheduler][tests]: Fix incorrect aggr mock values

Browse Source 
Currently the value return from 'utils.aggregate_metadata_get_by_host'
is a type of collections.defaultdict(set). That said all the values
are 'set' not 'String'. Unfortunately, most of test cases related to
aggregate filters are using it with in incorrect way. This patch fixes
it and adds an extra test case to verify it.

Co-Authored-By: Fei Long Wang <flwang@catalyst.net.nz>

Change-Id: I12f033a66ed31cd624bda47be944bab6c841dbf5
This commit is contained in:
Pavel Kholkin 2016-11-25 18:58:23 +03:00
parent 9f82809fc1
commit c6ac14e0d4
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nova/tests/unit/scheduler/filters/test_aggregate_image_properties_isolation_filters.py
View File

@ -26,7 +26,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
self.filt_cls = aipi.AggregateImagePropertiesIsolation()
def test_aggregate_image_properties_isolation_passes(self, agg_mock):
agg_mock.return_value = {'hw_vm_mode': 'hvm'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -35,7 +35,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
self.assertTrue(self.filt_cls.host_passes(host, spec_obj))
def test_aggregate_image_properties_isolation_passes_comma(self, agg_mock):
agg_mock.return_value = {'hw_vm_mode': 'hvm,xen'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm', 'xen'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -43,9 +43,20 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
host = fakes.FakeHostState('host1', 'compute', {})
self.assertTrue(self.filt_cls.host_passes(host, spec_obj))
def test_aggregate_image_properties_isolation_props_bad_comma(self,
agg_mock):
agg_mock.return_value = {'os_distro': set(['windows', 'linux'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
os_distro='windows,')))
host = fakes.FakeHostState('host1', 'compute', {})
self.assertFalse(self.filt_cls.host_passes(host, spec_obj))
def test_aggregate_image_properties_isolation_multi_props_passes(self,
agg_mock):
agg_mock.return_value = {'hw_vm_mode': 'hvm', 'hw_cpu_cores': '2'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm']),
'hw_cpu_cores': set(['2'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -55,7 +66,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_isolation_props_with_meta_passes(self,
agg_mock):
agg_mock.return_value = {'hw_vm_mode': 'hvm'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps()))
@ -74,7 +85,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_isolation_props_not_match_fails(self,
agg_mock):
agg_mock.return_value = {'hw_vm_mode': 'hvm'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -84,7 +95,8 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_isolation_props_not_match2_fails(self,
agg_mock):
agg_mock.return_value = {'hw_vm_mode': 'hvm', 'hw_cpu_cores': '1'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm']),
'hw_cpu_cores': set(['1'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -98,7 +110,8 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
group='filter_scheduler')
self.flags(aggregate_image_properties_isolation_separator='_',
group='filter_scheduler')
agg_mock.return_value = {'hw_vm_mode': 'hvm', 'img_owner_id': 'foo'}
agg_mock.return_value = {'hw_vm_mode': set(['hvm']),
'img_owner_id': set(['foo'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -108,7 +121,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_iso_props_with_custom_meta(self,
agg_mock):
agg_mock.return_value = {'os': 'linux'}
agg_mock.return_value = {'os': set(['linux'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -118,7 +131,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_iso_props_with_matching_meta_pass(self,
agg_mock):
agg_mock.return_value = {'os_type': 'linux'}
agg_mock.return_value = {'os_type': set(['linux'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(
@ -128,7 +141,7 @@ class TestAggImagePropsIsolationFilter(test.NoDBTestCase):
def test_aggregate_image_properties_iso_props_with_matching_meta_fail(
self, agg_mock):
agg_mock.return_value = {'os_type': 'windows'}
agg_mock.return_value = {'os_type': set(['windows'])}
spec_obj = objects.RequestSpec(
context=mock.sentinel.ctx,
image=objects.ImageMeta(properties=objects.ImageMetaProps(

8
nova/tests/unit/scheduler/filters/test_aggregate_instance_extra_specs_filters.py
View File

@ -55,7 +55,7 @@ class TestAggregateInstanceExtraSpecsFilter(test.NoDBTestCase):
assertion(self.filt_cls.host_passes(host, spec_obj))
def test_aggregate_filter_passes_extra_specs_simple(self, agg_mock):
agg_mock.return_value = {'opt1': '1', 'opt2': '2'}
agg_mock.return_value = {'opt1': set(['1']), 'opt2': set(['2'])}
especs = {
# Un-scoped extra spec
'opt1': '1',
@ -67,7 +67,7 @@ class TestAggregateInstanceExtraSpecsFilter(test.NoDBTestCase):
self._do_test_aggregate_filter_extra_specs(especs, passes=True)
def test_aggregate_filter_passes_extra_specs_simple_comma(self, agg_mock):
agg_mock.return_value = {'opt1': '1,3', 'opt2': '2'}
agg_mock.return_value = {'opt1': set(['1', '3']), 'opt2': set(['2'])}
especs = {
# Un-scoped extra spec
'opt1': '1',
@ -79,7 +79,7 @@ class TestAggregateInstanceExtraSpecsFilter(test.NoDBTestCase):
self._do_test_aggregate_filter_extra_specs(especs, passes=True)
def test_aggregate_filter_passes_with_key_same_as_scope(self, agg_mock):
agg_mock.return_value = {'aggregate_instance_extra_specs': '1'}
agg_mock.return_value = {'aggregate_instance_extra_specs': set(['1'])}
especs = {
# Un-scoped extra spec, make sure we don't blow up if it
# happens to match our scope.
@ -88,7 +88,7 @@ class TestAggregateInstanceExtraSpecsFilter(test.NoDBTestCase):
self._do_test_aggregate_filter_extra_specs(especs, passes=True)
def test_aggregate_filter_fails_extra_specs_simple(self, agg_mock):
agg_mock.return_value = {'opt1': '1', 'opt2': '2'}
agg_mock.return_value = {'opt1': set(['1']), 'opt2': set(['2'])}
especs = {
'opt1': '1',
'opt2': '222',