lib/toaster/state/convergence.rb in cloud-toaster-1.1.5 vs lib/toaster/state/convergence.rb in cloud-toaster-1.1.6
- old
+ new
@@ -49,11 +49,11 @@
ignore_props = SystemState.read_ignore_properties()
ps.each do |p|
SystemState.remove_ignore_props!(p, ignore_props)
end
# remove ignored properties from state changes
- SystemState.remove_ignore_props!(ch, ignore_props)
+ SystemState.remove_ignore_props!(ch, ignore_props.collect { |ip| ip.key } )
return convergence_for_prop_changes(ch, ps, prop_value_percentage_threshold)
end
#
@@ -148,10 +148,10 @@
# list of property keys
prop_keys = Set.new
# build tmp result hash
task_execs.each do |run,exes|
tmp[run] = {}
- exes.unshift(TaskExecution.new(nil,nil,nil,[],"start"))
+ exes.unshift(TaskExecution.new(:uuid => "start"))
exes.each_with_index do |exe,idx|
if exe.kind_of?(TaskExecution)
pre_state = MarkupUtil.clone(exe.state_before) || {}
post_state = MarkupUtil.clone(exe.state_after) || {}
MarkupUtil.eliminate_inserted_map_entries!(pre_state)