nitos_testbed_rc 1.0.0.pre.12 → 1.0.0.pre.13

data/bin/omf6

@@ -102,7 +102,11 @@ def create_frisbee(comm, fcontroller, node, port, options, progress_bar)
               overall = @load_complete.values.inject(:+)
               progress_bar.count = ( overall / @nodes_up_pxe.length) 
               progress_bar.write
-              msg = client_msg.read_property("msg").split("\n")
+              if client_msg.read_property("msg")
+                msg = client_msg.read_property("msg").split("\n")
+              else
+                puts "ERROR: Frisbee client exit with no msg."
+              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|
@@ -416,8 +420,12 @@ def create_imagezip_client(comm, fcontroller, node, port, options)
             elsif client_msg.read_property("event") == "EXIT"
               stop_saving()
               puts "INFO:"
-              client_msg.read_property("msg").split("\n").each do |line|
-                puts "INFO: #{line}"
+              if client_msg.read_property("msg")
+                client_msg.read_property("msg").split("\n").each do |line|
+                  puts "INFO: #{line}"
+                end 
+              else
+                puts "ERROR: Imagezip stopped with no msg."
               end
               puts "INFO: Image was saved in '#{@frisbee[:imageDir]}/#{@image}'"
               puts "INFO:"
@@ -506,7 +514,6 @@ def save(comm, options)
                     start_saving()
                     puts "INFO: Starting Imagezip Server on port '#{port}'"
                     create_imagezip_server(comm, fcontroller, port, options)
-                    sleep 1
                     puts "INFO: Starting Imagezip Client on node '#{options[:node]}'"
                     create_imagezip_client(comm, fcontroller, options[:node], port, options)
                     print "INFO: Saving Image for node '#{options[:node]}'..."

data/etc/omf_script_conf.yaml

@@ -1,7 +1,7 @@
 :xmpp:
   :script_user: script_user
   :password: pw
-  :server: <% Socket.gethostname %>.inf.uth.gr
+  :server: <%= Socket.gethostname %>.inf.uth.gr
 :auth:
   :root_cert_dir: /etc/nitos_testbed_rc/trusted_roots
   :entity_cert: ~/.omf/user_cert.pem

data/lib/nitos_testbed_rc/frisbee.rb

@@ -58,8 +58,7 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
 
       command = "#{client.property.binary_path} -i #{client.property.multicast_interface} -m #{client.property.multicast_address} -p #{client.property.port} #{client.property.hardrive}"
-      debug "Executing command #{command}"
-
+      
       output = ''
       host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => 200, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
       host.cmd(command.to_s) do |c|

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -3,6 +3,9 @@
 #used in save command
 
 #$domain = @config[:domain][:ip]
+require 'net/telnet'
+require 'socket'
+require 'timeout'
 
 module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
   include OmfRc::ResourceProxyDSL
@@ -29,6 +32,7 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
   hook :after_initial_configured do |client|
     Thread.new do
       debug "Received message '#{client.opts.inspect}'"
+      sleep 1
       if error_msg = client.opts.error_msg
         res.inform(:error,{
           event_type: "AUTH",
@@ -38,58 +42,97 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
         }, :ALL)
         next
       end
-      # if client.opts.ignore_msg
-      #   #just ignore this message, another resource controller should take care of this message
-      #   next
-      # end
-
-      # nod = {}
-      # nod[:node_name] = client.opts.node.name
-      # client.opts.node.interfaces.each do |i|
-      #   if i[:role] == "control"
-      #     nod[:node_ip] = i[:ip][:address]
-      #     nod[:node_mac] = i[:mac]
-      #   elsif i[:role] == "cm_network"
-      #     nod[:node_cm_ip] = i[:ip][:address]
-      #   end
-      # end
-      # nod[:node_cm_ip] = client.opts.node.cmc.ip.address
 
       nod = client.opts.node
+      client.property.multicast_interface = nod[:node_ip]
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
 
-      command = "#{client.property.binary_path} -o -z1 -d #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
-      #     nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
-      summary = ''
-      debug "Telnet on: '#{nod[:node_ip]}'"
-      host = Net::Telnet.new("Host" => nod[:node_ip], "Timeout" => false)#, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
-      debug "Telnet successfull"
-      debug "Executing command #{command.to_s}"
+      command = "#{client.property.binary_path} -o -z1 #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
+      debug "Executing command #{command} - host #{client.property.multicast_interface.to_s}"
+      host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => false, "Telnetmode" => true)
+
+      output = ''
       host.cmd(command.to_s) do |c|
         print "#{c}"
-        # if c.to_s !=  "\n" && c[0,5] != "\n/usr" && c.to_s != "." && c.to_s != ".." && c.to_s != "..."
-          # puts '---------(' + c.to_s + ')-----------'
         if c.include? 'compressed'
-          summary = c
-          # client.inform(:status, {
-          #   status_type: 'IMAGEZIP',
-          #   event: "STDOUT",
-          #   app: client.property.app_id,
-          #   node: client.property.node_topic,
-          #   msg: "#{c.to_s}"
-          # }, :ALL)
+          output = c
         end
       end
-      debug "imagezip client finished"
 
       client.inform(:status, {
-        status_type: 'IMAGEZIP',
+        status_type: 'FRISBEE',
         event: "EXIT",
         app: client.property.app_id,
         node: client.property.node_topic,
-        msg: summary
+        msg: output
       }, :ALL)
       host.close
     end
+
+    # Thread.new do
+    #   debug "Received message '#{client.opts.inspect}'"
+    #   sleep 2
+    #   if error_msg = client.opts.error_msg
+    #     res.inform(:error,{
+    #       event_type: "AUTH",
+    #       exit_code: "-1",
+    #       node_name: client.property.node_topic,
+    #       msg: error_msg
+    #     }, :ALL)
+    #     next
+    #   end
+    #   # if client.opts.ignore_msg
+    #   #   #just ignore this message, another resource controller should take care of this message
+    #   #   next
+    #   # end
+
+    #   # nod = {}
+    #   # nod[:node_name] = client.opts.node.name
+    #   # client.opts.node.interfaces.each do |i|
+    #   #   if i[:role] == "control"
+    #   #     nod[:node_ip] = i[:ip][:address]
+    #   #     nod[:node_mac] = i[:mac]
+    #   #   elsif i[:role] == "cm_network"
+    #   #     nod[:node_cm_ip] = i[:ip][:address]
+    #   #   end
+    #   # end
+    #   # nod[:node_cm_ip] = client.opts.node.cmc.ip.address
+
+    #   nod = client.opts.node
+    #   client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
+
+    #   command = "#{client.property.binary_path} -o -z1 -d -d #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
+    #   #     nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
+    #   summary = ''
+    #   debug "Telnet on: '#{nod[:node_ip]}'"
+    #   host = Net::Telnet.new("Host" => nod[:node_ip], "Timeout" => 200, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)#, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
+    #   debug "Telnet successfull"
+    #   debug "Executing command #{command.to_s}"
+    #   host.cmd(command.to_s) do |c|
+    #     print "#{c}"
+    #     # if c.to_s !=  "\n" && c[0,5] != "\n/usr" && c.to_s != "." && c.to_s != ".." && c.to_s != "..."
+    #       # puts '---------(' + c.to_s + ')-----------'
+    #     if c.include? 'compressed'
+    #       summary = c
+    #       # client.inform(:status, {
+    #       #   status_type: 'IMAGEZIP',
+    #       #   event: "STDOUT",
+    #       #   app: client.property.app_id,
+    #       #   node: client.property.node_topic,
+    #       #   msg: "#{c.to_s}"
+    #       # }, :ALL)
+    #     end
+    #   end
+    #   debug "imagezip client finished"
+
+    #   client.inform(:status, {
+    #     status_type: 'IMAGEZIP',
+    #     event: "EXIT",
+    #     app: client.property.app_id,
+    #     node: client.property.node_topic,
+    #     msg: summary
+    #   }, :ALL)
+    #   host.close
+    # end
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "1.0.0.pre.12"
+    VERSION = "1.0.0.pre.13"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.12
+  version: 1.0.0.pre.13
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common