omf6 in nitos_testbed_rc-1.0.0.pre.14

- old
+ new

@@ -65,10 +65,12 @@
           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")}"
             end
           end
         end
       end
     else
@@ -102,14 +104,14 @@
               overall = @load_complete.values.inject(:+)
               progress_bar.count = ( overall / @nodes_up_pxe.length) 
               progress_bar.write
               if client_msg.read_property("msg")
                 msg = client_msg.read_property("msg").split("\n")
+                @load_end_msg += "#{client_msg.read_property("node")}: #{"#{msg[0]} #{msg[1][14..29]}"}\n"
               else
-                puts "ERROR: Frisbee client exit with no msg."
+                puts "ERROR: Frisbee client stopped unexpectedly with no error message."
               end
-              @load_end_msg += "#{client_msg.read_property("node")}: #{"#{msg[0]} #{msg[1][14..29]}"}\n"
               comm.subscribe('cm_factory') do |controller|
                 controller.on_message do |cm_msg|
                   if cm_msg.operation == :inform
                     case cm_msg.read_content("itype")
                     when 'STATUS'
@@ -797,10 +799,10 @@
   puts "INFO: "
   # sleep 1
   comm.disconnect
 end
 
-OmfCommon.init(@config[:operationMode], {communication: { url: "xmpp://#{@xmpp[:script_user]}:#{@xmpp[:password]}@#{@xmpp[:server]}", auth: {}}, logging: {}}) do
+OmfCommon.init(@config[:operationMode], {communication: { url: "xmpp://#{@xmpp[:script_user]}:#{@xmpp[:password]}@#{@xmpp[:server]}", auth: {}}, logging: nil }) do
   OmfCommon.comm.on_connected do |comm|
     OmfCommon::Auth::CertificateStore.instance.register_default_certs(trusted_roots)
     entity.resource_id = OmfCommon.comm.local_topic.address
     OmfCommon::Auth::CertificateStore.instance.register(entity)
 
\ No newline at end of file