openstack
/
fuel-astute
Code Issues Proposed changes

Save error status if err data is present in dhcp checker response 

Change-Id: I7cb0d9b575edf08b5051ea01cee97c3d574b8439
Related-Bug: #1569339
This commit is contained in:
Artem Roma 2016-05-27 17:27:44 +03:00
parent 4df5a45042
commit 230c096c45
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/astute/network.rb
View File

@ -223,7 +223,8 @@ module Astute
if response.results[:data][:out].present?
Astute.logger.debug("DHCP checker received:\n#{response.pretty_inspect}")
node_result[:data] = JSON.parse(response.results[:data][:out])
elsif response.results[:data][:err].present?
end
if response.results[:data][:err].present?
Astute.logger.debug("DHCP checker errred with:\n#{response.pretty_inspect}")
node_result[:status] = 'error'
node_result[:error_msg] = 'Error in dhcp checker. Check logs for details'

5
spec/unit/network_spec.rb
View File

@ -137,8 +137,9 @@ describe Astute::Network do
mock_and_verify_check_dhcp(nodes, [res1, res2], expected)
# check case when the check failed for one of the nodes
err_res = mock_mc_result({:sender => "1", :data => {:err => 'Test err'}})
expected = {"nodes" => [{:uid => "1", :status => "error",
err_res = mock_mc_result(
{:sender => "1", :data => {:err => 'Test err', :out => json_output}})
expected = {"nodes" => [{:uid => "1", :status => "error", :data=>expected_data,
:error_msg => "Error in dhcp checker. Check logs for details"}],
"status" => "error"}
mock_and_verify_check_dhcp([nodes[0]], [err_res], expected)