Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building of model with a scoped exclusion rule

Browse Source 
If we define an audit scope with a exclusion rule composed
with compute nodes, the compute model built is empty. I fix
the algo used to built this scoped compute model.

Change-Id: I675226c58474b7ea52b3f92e7b466adae40643b8
Closes-bug: #1658995
This commit is contained in:
David TARDIVEL
2017-01-24 15:21:00 +01:00
committed by Vincent Françoise
parent 41f579d464
commit c5d4f9cb40
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,6 +191,7 @@ class DefaultScope(base.BaseScope):
allowed_nodes = [] allowed_nodes = []
nodes_to_exclude = [] nodes_to_exclude = []
nodes_to_remove = set()
instances_to_exclude = [] instances_to_exclude = []
model_hosts = list(cluster_model.get_all_compute_nodes().keys()) model_hosts = list(cluster_model.get_all_compute_nodes().keys())
@@ -210,7 +211,8 @@ class DefaultScope(base.BaseScope):
nodes=nodes_to_exclude) nodes=nodes_to_exclude)
instances_to_remove = set(instances_to_exclude) instances_to_remove = set(instances_to_exclude)
nodes_to_remove = set(model_hosts) - set(allowed_nodes) if allowed_nodes:
nodes_to_remove = set(model_hosts) - set(allowed_nodes)
nodes_to_remove.update(nodes_to_exclude) nodes_to_remove.update(nodes_to_exclude)
self._remove_node_from_model(nodes_to_remove, cluster_model) self._remove_node_from_model(nodes_to_remove, cluster_model)