openstack
/
fuel-astute
Code Issues Proposed changes

Fix progress bar for cinder

This commit is contained in:
Evgeniy L 2013-09-23 19:08:41 +04:00
parent 3c5e06eeba
commit bf431852e3
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/astute/logparser.rb
View File

@ -141,9 +141,10 @@ module Astute
node = nodes.find {|n| n['uid'] == uid}
@nodes_states[uid] ||= deep_copy @pattern_spec
node_pattern_spec = @nodes_states[uid]
erb_path = node_pattern_spec['path_format']
path = ERB.new(erb_path).result(binding())
begin
progress = (get_log_progress(path, node_pattern_spec)*100).to_i # Return percent of progress
rescue Exception => e

18
lib/astute/logparser/parser_patterns.rb
View File

@ -524,27 +524,35 @@ module Astute
'puppet-log-components-list-ha-cinder' => {
'type' => 'count-lines',
'endlog_patterns' => [{'pattern' => /Finished catalog run in [0-9]+\.[0-9]* seconds\n/, 'progress' => 1.0}],
'expected_line_number' => 345
'expected_line_number' => 345,
'filename' => 'puppet-agent.log',
'path_format' => "<%= @pattern_spec['path_prefix'] %><%= node['fqdn'] %>/<%= @pattern_spec['filename'] %>"
},
'puppet-log-components-list-multinode-cinder' => {
'type' => 'count-lines',
'endlog_patterns' => [{'pattern' => /Finished catalog run in [0-9]+\.[0-9]* seconds\n/, 'progress' => 1.0}],
'expected_line_number' => 345
'expected_line_number' => 345,
'filename' => 'puppet-agent.log',
'path_format' => "<%= @pattern_spec['path_prefix'] %><%= node['fqdn'] %>/<%= @pattern_spec['filename'] %>"
},
'puppet-log-components-list-singlenode-cinder' => {
'type' => 'count-lines',
'endlog_patterns' => [{'pattern' => /Finished catalog run in [0-9]+\.[0-9]* seconds\n/, 'progress' => 1.0}],
'expected_line_number' => 345
'expected_line_number' => 345,
'filename' => 'puppet-agent.log',
'path_format' => "<%= @pattern_spec['path_prefix'] %><%= node['fqdn'] %>/<%= @pattern_spec['filename'] %>"
},
'default' => {
'type' => 'count-lines',
'endlog_patterns' => [{'pattern' => /Finished catalog run in [0-9]+\.[0-9]* seconds\n/, 'progress' => 1.0}],
'expected_line_number' => 345
'expected_line_number' => 345,
'filename' => 'puppet-agent.log',
'path_format' => "<%= @pattern_spec['path_prefix'] %><%= node['fqdn'] %>/<%= @pattern_spec['filename'] %>"
},
}
end
end
end
end