openstack
/
watcher
Code Issues Proposed changes

Fix compute CDM to include disabled compute node 

Currently compute CDM excludes disabled compute node.
This patch set fixes compute CDM to include disabled compute node.

Change-Id: I8236bb73e0d9bb242251c2abfb59ad5693087afa
Closes-Bug: #1685787
This commit is contained in:
Hidekazu Nakamura 2017-08-01 10:16:26 +09:00
parent be8b163a62
commit 783627626c
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
watcher/common/nova_helper.py
View File

@ -82,6 +82,9 @@ class NovaHelper(object):
def get_availability_zone_list(self): def get_availability_zone_list(self):
return self.nova.availability_zones.list(detailed=True) return self.nova.availability_zones.list(detailed=True)
def get_service_list(self):
return self.nova.services.list(binary='nova-compute')
def find_instance(self, instance_id): def find_instance(self, instance_id):
return self.nova.servers.get(instance_id) return self.nova.servers.get(instance_id)

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

@ -145,7 +145,7 @@ class DefaultScope(base.BaseScope):
compute_nodes.extend(detailed_aggregate.hosts) compute_nodes.extend(detailed_aggregate.hosts)
def _collect_zones(self, availability_zones, allowed_nodes): def _collect_zones(self, availability_zones, allowed_nodes):
zone_list = self.wrapper.get_availability_zone_list() service_list = self.wrapper.get_service_list()
zone_names = [zone['name'] for zone zone_names = [zone['name'] for zone
in availability_zones] in availability_zones]
include_all_nodes = False include_all_nodes = False
@ -155,9 +155,9 @@ class DefaultScope(base.BaseScope):
else: else:
raise exception.WildcardCharacterIsUsed( raise exception.WildcardCharacterIsUsed(
resource="availability zones") resource="availability zones")
for zone in zone_list: for service in service_list:
if zone.zoneName in zone_names or include_all_nodes: if service.zone in zone_names or include_all_nodes:
allowed_nodes.extend(zone.hosts.keys()) allowed_nodes.extend(service.host)
def exclude_resources(self, resources, **kwargs): def exclude_resources(self, resources, **kwargs):
instances_to_exclude = kwargs.get('instances') instances_to_exclude = kwargs.get('instances')

32
watcher/tests/decision_engine/scope/test_default.py
View File

@ -32,20 +32,20 @@ class TestDefaultScope(base.TestCase):
super(TestDefaultScope, self).setUp() super(TestDefaultScope, self).setUp()
self.fake_cluster = faker_cluster_state.FakerModelCollector() self.fake_cluster = faker_cluster_state.FakerModelCollector()
@mock.patch.object(nova_helper.NovaHelper, 'get_availability_zone_list') @mock.patch.object(nova_helper.NovaHelper, 'get_service_list')
def test_get_scoped_model_with_zones_and_instances(self, mock_zone_list): def test_get_scoped_model_with_zones_and_instances(self, mock_zone_list):
cluster = self.fake_cluster.generate_scenario_1() cluster = self.fake_cluster.generate_scenario_1()
audit_scope = fake_scopes.fake_scope_1 audit_scope = fake_scopes.fake_scope_1
mock_zone_list.return_value = [ mock_zone_list.return_value = [
mock.Mock(zoneName='AZ{0}'.format(i), mock.Mock(zone='AZ{0}'.format(i),
hosts={'Node_{0}'.format(i): {}}) host={'Node_{0}'.format(i): {}})
for i in range(2)] for i in range(2)]
model = default.DefaultScope(audit_scope, mock.Mock(), model = default.DefaultScope(audit_scope, mock.Mock(),
osc=mock.Mock()).get_scoped_model(cluster) osc=mock.Mock()).get_scoped_model(cluster)
expected_edges = [('INSTANCE_2', 'Node_1')] expected_edges = [('INSTANCE_2', 'Node_1')]
self.assertEqual(sorted(expected_edges), sorted(model.edges())) self.assertEqual(sorted(expected_edges), sorted(model.edges()))
@mock.patch.object(nova_helper.NovaHelper, 'get_availability_zone_list') @mock.patch.object(nova_helper.NovaHelper, 'get_service_list')
def test_get_scoped_model_without_scope(self, mock_zone_list): def test_get_scoped_model_without_scope(self, mock_zone_list):
model = self.fake_cluster.generate_scenario_1() model = self.fake_cluster.generate_scenario_1()
default.DefaultScope([], mock.Mock(), default.DefaultScope([], mock.Mock(),
@ -125,26 +125,26 @@ class TestDefaultScope(base.TestCase):
[{'name': 'HA_1'}, {'id': 0}], allowed_nodes) [{'name': 'HA_1'}, {'id': 0}], allowed_nodes)
self.assertEqual(['Node_0', 'Node_1'], allowed_nodes) self.assertEqual(['Node_0', 'Node_1'], allowed_nodes)
@mock.patch.object(nova_helper.NovaHelper, 'get_availability_zone_list') @mock.patch.object(nova_helper.NovaHelper, 'get_service_list')
def test_collect_zones(self, mock_zone_list): def test_collect_zones(self, mock_zone_list):
allowed_nodes = [] allowed_nodes = []
mock_zone_list.return_value = [ mock_zone_list.return_value = [
mock.Mock(zoneName="AZ{0}".format(i + 1), mock.Mock(zone="AZ{0}".format(i + 1),
hosts={'Node_{0}'.format(2 * i): 1, host={'Node_{0}'.format(2 * i): 1,
'Node_{0}'.format(2 * i + 1): 2}) 'Node_{0}'.format(2 * i + 1): 2})
for i in range(2)] for i in range(2)]
default.DefaultScope([{'availability_zones': [{'name': "AZ1"}]}], default.DefaultScope([{'availability_zones': [{'name': "AZ1"}]}],
mock.Mock(), osc=mock.Mock())._collect_zones( mock.Mock(), osc=mock.Mock())._collect_zones(
[{'name': "AZ1"}], allowed_nodes) [{'name': "AZ1"}], allowed_nodes)
self.assertEqual(['Node_0', 'Node_1'], sorted(allowed_nodes)) self.assertEqual(['Node_0', 'Node_1'], sorted(allowed_nodes))
@mock.patch.object(nova_helper.NovaHelper, 'get_availability_zone_list') @mock.patch.object(nova_helper.NovaHelper, 'get_service_list')
def test_zones_wildcard_is_used(self, mock_zone_list): def test_zones_wildcard_is_used(self, mock_zone_list):
allowed_nodes = [] allowed_nodes = []
mock_zone_list.return_value = [ mock_zone_list.return_value = [
mock.Mock(zoneName="AZ{0}".format(i + 1), mock.Mock(zone="AZ{0}".format(i + 1),
hosts={'Node_{0}'.format(2 * i): 1, host={'Node_{0}'.format(2 * i): 1,
'Node_{0}'.format(2 * i + 1): 2}) 'Node_{0}'.format(2 * i + 1): 2})
for i in range(2)] for i in range(2)]
default.DefaultScope([{'availability_zones': [{'name': "*"}]}], default.DefaultScope([{'availability_zones': [{'name': "*"}]}],
mock.Mock(), osc=mock.Mock())._collect_zones( mock.Mock(), osc=mock.Mock())._collect_zones(
@ -152,13 +152,13 @@ class TestDefaultScope(base.TestCase):
self.assertEqual(['Node_0', 'Node_1', 'Node_2', 'Node_3'], self.assertEqual(['Node_0', 'Node_1', 'Node_2', 'Node_3'],
sorted(allowed_nodes)) sorted(allowed_nodes))
@mock.patch.object(nova_helper.NovaHelper, 'get_availability_zone_list') @mock.patch.object(nova_helper.NovaHelper, 'get_service_list')
def test_zones_wildcard_with_other_ids(self, mock_zone_list): def test_zones_wildcard_with_other_ids(self, mock_zone_list):
allowed_nodes = [] allowed_nodes = []
mock_zone_list.return_value = [ mock_zone_list.return_value = [
mock.Mock(zoneName="AZ{0}".format(i + 1), mock.Mock(zone="AZ{0}".format(i + 1),
hosts={'Node_{0}'.format(2 * i): 1, host={'Node_{0}'.format(2 * i): 1,
'Node_{0}'.format(2 * i + 1): 2}) 'Node_{0}'.format(2 * i + 1): 2})
for i in range(2)] for i in range(2)]
scope_handler = default.DefaultScope( scope_handler = default.DefaultScope(
[{'availability_zones': [{'name': "*"}, {'name': 'AZ1'}]}], [{'availability_zones': [{'name': "*"}, {'name': 'AZ1'}]}],