openstack
/
fuel-astute
Code Issues Proposed changes

Return 'error' status for check_dhcp task if failed nodes 

* Fix processing of net_probe client response in 'format_dhcp_response'
hepler function;
* Make check_dhcp routine return 'error' as task status in case DHCP
  check failed for any node from given set;
* Update tests for check_dhcp.

Change-Id: I2e89f4a95289328128d33a8d079b09f6fbfa8d5e
Closes-Bug: #1569339
This commit is contained in:
Artem Roma 2016-05-16 16:56:56 +03:00
parent 94c96e3582
commit 1c29ced74b
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/astute/network.rb
View File

@ -84,7 +84,9 @@ module Astute
format_dhcp_response(response)
end
{'nodes' => result, 'status'=> 'ready'}
status = result.any?{|node| node[:status] == 'error'} && 'error' || 'ready'
{'nodes' => result, 'status'=> status}
end
def self.multicast_verification(ctx, nodes)
@ -221,7 +223,7 @@ 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][:error].present?
elsif 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'

26
spec/unit/network_spec.rb
View File

@ -109,6 +109,14 @@ describe Astute::Network do
describe '.check_dhcp' do
it "dhcp check should return expected info" do
def mock_and_verify_check_dhcp(nodes, result, expected)
rpcclient = mock_rpcclient(nodes)
rpcclient.expects(:dhcp_discover).at_least_once.returns(result)
Astute::MClient.any_instance.stubs(:rpcclient).returns(rpcclient)
actual = Astute::Network.check_dhcp(Astute::Context.new('task_uuid', reporter), nodes)
actual.should eql(expected)
end
nodes = make_nodes(1, 2)
expected_data = [{'iface'=>'eth1',
'mac'=> 'ff:fa:1f:er:ds:as'},
@ -122,17 +130,19 @@ describe Astute::Network do
:data => {:out => json_output},
:sender => "2"})
rpcclient = mock_rpcclient(nodes)
rpcclient.expects(:dhcp_discover).at_least_once.returns([res1, res2])
Astute::MClient.any_instance.stubs(:rpcclient).returns(rpcclient)
res = Astute::Network.check_dhcp(Astute::Context.new('task_uuid', reporter), nodes)
expected = {"nodes" => [{:status=>"ready", :uid=>"1", :data=>expected_data},
{:status=>"ready", :uid=>"2", :data=>expected_data}],
"status"=> "ready"}
res.should eql(expected)
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",
:error_msg => "Error in dhcp checker. Check logs for details"}],
"status" => "error"}
mock_and_verify_check_dhcp([nodes[0]], [err_res], expected)
end
end