openstack/watcher
Code Issues Proposed changes

Merge " improve _collect_aggregates"

Browse Source
This commit is contained in:
Zuul 2019-03-06 03:29:37 +00:00 committed by Gerrit Code Review
commit 29d29ef07a
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/decision_engine/scope/compute.py
View File

@ -61,12 +61,10 @@ class ComputeScope(base.BaseScope):
for field in (aggregate_ids, aggregate_names))
for aggregate in aggregate_list:
detailed_aggregate = self.wrapper.get_aggregate_detail(
aggregate.id)
if (detailed_aggregate.id in aggregate_ids or
detailed_aggregate.name in aggregate_names or
if (aggregate.id in aggregate_ids or
aggregate.name in aggregate_names or
include_all_nodes):
compute_nodes.extend(detailed_aggregate.hosts)
compute_nodes.extend(aggregate.hosts)
def _collect_zones(self, availability_zones, allowed_nodes):
service_list = self.wrapper.get_service_list()

31
watcher/tests/decision_engine/scope/test_compute.py
View File

@ -71,25 +71,20 @@ class TestComputeScope(base.TestCase):
]
self.assertEqual(sorted(expected_edges), sorted(model.edges()))
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_detail')
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_list')
def test_collect_aggregates(self, mock_aggregate, mock_detailed_aggregate):
def test_collect_aggregates(self, mock_aggregate):
allowed_nodes = []
mock_aggregate.return_value = [mock.Mock(id=i) for i in range(2)]
mock_detailed_aggregate.side_effect = [
mock_aggregate.return_value = [
mock.Mock(id=i, hosts=['Node_{0}'.format(i)]) for i in range(2)]
compute.ComputeScope([{'host_aggregates': [{'id': 1}, {'id': 2}]}],
mock.Mock(), osc=mock.Mock())._collect_aggregates(
[{'id': 1}, {'id': 2}], allowed_nodes)
self.assertEqual(['Node_1'], allowed_nodes)
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_detail')
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_list')
def test_aggregates_wildcard_is_used(self, mock_aggregate,
mock_detailed_aggregate):
def test_aggregates_wildcard_is_used(self, mock_aggregate):
allowed_nodes = []
mock_aggregate.return_value = [mock.Mock(id=i) for i in range(2)]
mock_detailed_aggregate.side_effect = [
mock_aggregate.return_value = [
mock.Mock(id=i, hosts=['Node_{0}'.format(i)]) for i in range(2)]
compute.ComputeScope([{'host_aggregates': [{'id': '*'}]}],
mock.Mock(), osc=mock.Mock())._collect_aggregates(
@ -108,20 +103,15 @@ class TestComputeScope(base.TestCase):
[{'id': '*'}, {'id': 1}],
allowed_nodes)
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_detail')
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_list')
def test_aggregates_with_names_and_ids(self, mock_aggregate,
mock_detailed_aggregate):
def test_aggregates_with_names_and_ids(self, mock_aggregate):
allowed_nodes = []
mock_aggregate.return_value = [mock.Mock(id=i,
name="HA_{0}".format(i))
for i in range(2)]
mock_collection = [mock.Mock(id=i, hosts=['Node_{0}'.format(i)])
for i in range(2)]
mock_collection[0].name = 'HA_0'
mock_collection[1].name = 'HA_1'
mock_detailed_aggregate.side_effect = mock_collection
mock_aggregate.return_value = mock_collection
compute.ComputeScope([{'host_aggregates': [{'name': 'HA_1'},
{'id': 0}]}],
@ -178,18 +168,13 @@ class TestComputeScope(base.TestCase):
audit_template.AuditTemplatePostType._build_schema()
).validate(test_scope)
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_detail')
@mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_list')
def test_exclude_resource(
self, mock_aggregate, mock_detailed_aggregate):
mock_aggregate.return_value = [mock.Mock(id=i,
name="HA_{0}".format(i))
for i in range(2)]
def test_exclude_resource(self, mock_aggregate):
mock_collection = [mock.Mock(id=i, hosts=['Node_{0}'.format(i)])
for i in range(2)]
mock_collection[0].name = 'HA_0'
mock_collection[1].name = 'HA_1'
mock_detailed_aggregate.side_effect = mock_collection
mock_aggregate.return_value = mock_collection
resources_to_exclude = [{'host_aggregates': [{'name': 'HA_1'},
{'id': 0}]},