nitos_testbed_rc 1.0.0.pre.13 → 1.0.0.pre.14

data/bin/omf6

@@ -67,6 +67,8 @@ def create_frisbeed(comm, fcontroller, port, options)
               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
@@ -104,10 +106,10 @@ def create_frisbee(comm, fcontroller, node, port, options, progress_bar)
               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
@@ -799,7 +801,7 @@ def shut_down(comm)
   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

data/etc/frisbee_proxy_conf.yaml

@@ -29,7 +29,7 @@
   :defaultImage: baseline.ndz
 
   # max bandwidth for frisbee server
-  :bandwidth: 50000000
+  :bandwidth: 170000000
 
   # Multicast address to use for servicing images
   #mcAddress: 224.0.0.2
@@ -44,7 +44,7 @@
   :frisbeedBin: /usr/sbin/frisbeed
   :frisbeeBin: /usr/sbin/frisbee
   :imagezipClientBin: /usr/bin/imagezip
-  :imagezipClientNC: /bin/nc
+  :imagezipClientNC: /bin/nc -q 0
   :imagezipServerBin: /bin/nc
 
   # Local interface to bind to for frisbee traffic

data/lib/nitos_testbed_rc/frisbee.rb

@@ -58,6 +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} on host #{client.property.multicast_interface.to_s}"
       
       output = ''
       host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => 200, "Prompt" => /[\w().-]*[\$#>:.]\s?(?:\(enable\))?\s*$/)
@@ -77,6 +78,13 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
         elsif c[0,6] == "\nWrote"
           c = c.split("\n")
           output = "#{c[1]}\n#{c.last}"
+        elsif c.strip == "Short write!"
+          res.inform(:error,{
+            event_type: "ERROR",
+            exit_code: "-1",
+            node_name: client.property.node_topic,
+            msg: "Load ended with 'Short write' error msg!"
+          }, :ALL)
         end
       end
 

data/lib/nitos_testbed_rc/frisbeed.rb

@@ -41,7 +41,11 @@ module OmfRc::ResourceProxy::Frisbeed
     server.property.image = server.property.image.start_with?('/') ? server.property.image : @fconf[:imageDir] + '/' + server.property.image
     unless File.file?(server.property.image)
       debug "File '#{server.property.image}' does not exist."
-      raise "FILE NOT FOUND."
+      res.inform(:error, {
+        event_type: 'ERROR',
+        exit_code: -1,
+        msg: "File '#{server.property.image}' does not exist."
+      }, :ALL)
     end
     debug "Frisbee server is loading image: #{server.property.image}"
 

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -47,8 +47,8 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
       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 #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
-      debug "Executing command #{command} - host #{client.property.multicast_interface.to_s}"
+      command = "#{client.property.binary_path} -o -z1 #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} #{client.property.ip} #{client.property.port}"
+      debug "Executing command #{command} on host #{client.property.multicast_interface.to_s}"
       host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => false, "Telnetmode" => true)
 
       output = ''

data/lib/nitos_testbed_rc/user.rb

@@ -30,11 +30,22 @@ module OmfRc::ResourceProxy::User
       FileUtils.mkdir_p(path)
     end
 
-    conf_file = File.read('/etc/nitos_testbed_rc/omf_script_conf.yaml')
-    conf_file.sub!(' script_user', " #{res.property.username}")
-    conf_file.sub!(' testserver', " #{res.topics.first.address.split('@').last}")
+    # conf_file = File.read('/etc/nitos_testbed_rc/omf_script_conf.yaml')
+    # conf_file.sub!(' script_user', " #{res.property.username}")
+    # conf_file.sub!(' testserver', " #{res.topics.first.address.split('@').last}")
+
+    # File.write("#{path}/omf_script_conf.yaml", conf_file)
+    require 'yaml'
+    opts = begin
+      YAML.load(File.open("/etc/nitos_testbed_rc/omf_script_conf.yaml"))
+    rescue ArgumentError => e
+      debug "Could not parse YAML: #{e.message}"
+    end
+
+    opts[:xmpp][:script_user] = res.property.username
+    opts[:xmpp][:server] = res.topics.first.address.split('@').last
 
-    File.write("#{path}/omf_script_conf.yaml", conf_file)
+    File.open("#{path}/omf_script_conf.yaml", "w") {|f| f.write(opts.to_yaml) }
 
     cmd = "chown -R #{res.property.username}:#{res.property.username} /home/#{res.property.username}"
     system(cmd)
@@ -42,7 +53,7 @@ module OmfRc::ResourceProxy::User
 
   configure :auth_keys do |res, value|
     path = "/home/#{res.property.username}/.ssh"
-    unless File.directory?(path)#create the directory if it doesn't exist (it will never exist)
+    unless File.directory?(path)#create the directory if it doesn't exist
       FileUtils.mkdir_p(path)
     end
     File.open("#{path}/authorized_keys", 'w') do |file|

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "1.0.0.pre.13"
+    VERSION = "1.0.0.pre.14"
   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.13
+  version: 1.0.0.pre.14
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common