bin/omf6 in nitos_testbed_rc-2.0.2 vs bin/omf6 in nitos_testbed_rc-2.0.3

- old
+ new

@@ -61,16 +61,17 @@ server = reply_msg.resource @@server = server server.on_subscribed do server.on_message do |m| if m.operation == :inform - if m.read_content("event") == "STDOUT" - puts "INFO: #{m.read_content("msg")}" - elsif m.read_content("event") == "EXIT" - puts "INFO: #{m.read_content("msg")}" - elsif m.read_content("event") == "ERROR" - puts "ERROR: #{m.read_content("msg")}" + if m.read_content("itype") == "STDOUT" + puts "INFO: #{m.read_property("msg")}" + elsif m.read_content("itype") == "EXIT" + puts "INFO: #{m.read_property("msg")}" + elsif m.read_content("itype") == "ERROR" + puts "ERROR: #{m.read_property("msg")}" + stop_loading(comm) end end end end else @@ -122,21 +123,21 @@ if @nodes_up_pxe.length == (@nodes_up_without_pxe.length + @nodes_failed_without_pxe.length) # puts "INFO: Load proccess completed." # fcontroller.release(@@server) do |reply_msg| # shut_down(comm) # end - stop_loading(comm, fcontroller) + stop_loading(comm) end end end when 'ERROR' case cm_msg.read_property("event_type") when "AUTH" puts "ERROR AUTH: #{cm_msg.read_property("msg")}" n = cm_msg.read_property("node_name") @nodes_failed_without_pxe << n if (@nodes_up_without_pxe.length + @nodes_failed_without_pxe.length) == options[:target_nodes].length - stop_loading(comm, fcontroller) + stop_loading(comm) end when "HTTP" puts "ERROR HTTP: #{cm_msg.read_property("msg")}" n = cm_msg.read_property("node_name") if @nodes_retrying_without_pxe.include?(n) \ No newline at end of file