nitos_testbed_rc 2.0.2 → 2.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTY1MzYzMzZlMDc0ZjBkMGJmNDczYTJjNmRmNjJhZDMwZThmZTE0MQ==
+    MmJiNmRhODcwNTk1Mzc5YmVjZmZlYWI1NmViYTY4ZDZiOGQ2NjUyNg==
   data.tar.gz: !binary |-
-    ODUwMjU1YmI4MGRmOGMyOGJhYjI0OWU0MTM4MGE3MDhlZGFmMzlkMg==
+    ZDYzOTU5YjM1MmVjMTNiMzkzZDEzOGE1ZDA0MWMwYjBhZjJhNTAzMg==
 SHA512:
   metadata.gz: !binary |-
-    NDllMjc5MzAwNTE0ZTNlOTkwY2Q2ODAzYmY5ZjhiOTY2N2E5NzA3NTlhNWE5
-    ZjliMzZhY2MyOGY5N2M1YWM4ZTZlNjI0NzNmOGNiZDk2NTZlZWYxZGZmMTVj
-    ZDkzODg0MDJkZjMzODlkMzVjMjg4OGQwMWVhODBlZTEyZWI5NGE=
+    ZmNjMDVlZDQ4YTMyZGI4MTg2NDM4MjJiNjIxZTRmMjZiMzlkZjZjMzkwZDlh
+    YTQ1OGViMzU3ZjkzYjE2Y2ZiZWUwYjFjYzRlZDE3YjlkZmZlOGY4ZjNjZWI3
+    ZGU1ZDlhNjA5MGFkYjZjMjlmZTYyNWUwODlmYzNlNjJiZDViZjc=
   data.tar.gz: !binary |-
-    ZTdhM2Y3NDVlMWY1ZTA2NzRhNTczNjRjZGQxYjYzYzM4NTMwMzBmOTk1YjU0
-    ZjczYjM3YWE1MjIyZTM1NTMxYjhiMmYzMzNlMGIwZjgzZmVjYWZjYmNjNWY3
-    ODQzODg0MjNjM2M3ZTcyNmQyNDNjOTQ3ZWQ1OWZiZTk4MzMyNDQ=
+    NjUzMWZlOWRkMTc1YmJkZmVhYzAzOWRjMTA1ZmIwOWZmYTk1YjRiMjhjZDJk
+    NTBiMmM1OTgzYWY5MzdkYzEyZTgwZmE5M2I5MDUyZGVkMjZiMjdjMGEzOTVj
+    ZDc3OWVkZGI0M2EwOTEzYzI5NmFiNTFmZmYwNjMyNDNjZDYyMDE=

data/README.md

@@ -36,6 +36,10 @@ Then you need to run the install_ntrc script to generate the configuration files
 
     $ install_ntrc
 
+Hint: If you have an installed nitos_testbed_rc gem and want to keep the configuration files, execute install_ntrc script with --no_conf flag.
+
+    $ install_ntrc --no_conf
+
 Create certificates
 -------------------
 

data/bin/install_ntrc

@@ -1,5 +1,16 @@
 #!/usr/bin/env ruby
 require 'fileutils'
+require 'optparse'
+
+options = {}
+
+optparse = OptionParser.new do |opts|
+  opts.on('-nc', '--no_conf', "Skip installation of configuration files") do |f|
+    options[:no_conf] = true
+  end
+end
+
+optparse.parse!
 
 spec = Gem::Specification.find_by_name("nitos_testbed_rc")
 gem_root = spec.gem_dir
@@ -18,28 +29,32 @@ unless File.directory?(log_path)
   FileUtils.mkdir_p(log_path)
 end
 
-puts "Installing configuration files."
-conf_files = []
-conf_files << "cm_proxy_conf.yaml"
-conf_files << "frisbee_proxy_conf.yaml"
-conf_files << "user_proxy_conf.yaml"
-conf_files << "omf_script_conf.yaml"
-
-conf_files.each do |file|
-  puts "Copying configuration file '#{gem_root}/etc/#{file}' to '#{config_path}'."
-  FileUtils.cp "#{gem_root}/etc/#{file}", "#{config_path}/#{file}"
-  FileUtils.chmod 0644, "#{config_path}/#{file}"
-end
-puts "All configuration files have been installed, browse folder '#{config_path}' to alternate them appropriatly."
+if options[:no_conf]
+  puts "Skipping installation of configuration files."
+else
+  puts "Installing configuration files."
+  conf_files = []
+  conf_files << "cm_proxy_conf.yaml"
+  conf_files << "frisbee_proxy_conf.yaml"
+  conf_files << "user_proxy_conf.yaml"
+  conf_files << "omf_script_conf.yaml"
 
-config_path = File.expand_path("~/.omf/etc")
-unless File.directory?(config_path)
-  puts "Generating directory '#{config_path}'."
-  FileUtils.mkdir_p(config_path)
-end
+  conf_files.each do |file|
+    puts "Copying configuration file '#{gem_root}/etc/#{file}' to '#{config_path}'."
+    FileUtils.cp "#{gem_root}/etc/#{file}", "#{config_path}/#{file}"
+    FileUtils.chmod 0644, "#{config_path}/#{file}"
+  end
+  puts "All configuration files have been installed, browse folder '#{config_path}' to alternate them appropriatly."
 
-FileUtils.cp "#{gem_root}/etc/omf_script_conf.yaml", "#{config_path}/omf_script_conf.yaml"
-FileUtils.chmod 0644, "#{config_path}/omf_script_conf.yaml"
+  config_path = File.expand_path("~/.omf/etc")
+  unless File.directory?(config_path)
+    puts "Generating directory '#{config_path}'."
+    FileUtils.mkdir_p(config_path)
+  end
+
+  FileUtils.cp "#{gem_root}/etc/omf_script_conf.yaml", "#{config_path}/omf_script_conf.yaml"
+  FileUtils.chmod 0644, "#{config_path}/omf_script_conf.yaml"
+end
 
 puts "Copying initialization script 'run_ntrc.sh'."
 FileUtils.cp "#{gem_root}/init/run_ntrc.sh", "/usr/local/bin/run_ntrc.sh"

data/bin/omf6

@@ -63,12 +63,13 @@ def create_frisbeed(comm, fcontroller, port, options)
       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
@@ -124,7 +125,7 @@ def create_frisbee(comm, fcontroller, node, port, options, progress_bar)
                             # fcontroller.release(@@server) do |reply_msg|
                             #   shut_down(comm)
                             # end
-                            stop_loading(comm, fcontroller)
+                            stop_loading(comm)
                           end
                         end
                       end
@@ -135,7 +136,7 @@ def create_frisbee(comm, fcontroller, node, port, options, progress_bar)
                         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")}"

data/lib/nitos_testbed_rc/frisbeed.rb

@@ -41,11 +41,15 @@ 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."
-      res.inform(:error, {
-        event_type: 'ERROR',
-        exit_code: -1,
-        msg: "File '#{server.property.image}' does not exist."
-      }, :ALL)
+      Thread.new do
+        sleep 1
+        server.inform(:error, {
+          event_type: 'ERROR',
+          exit_code: -1,
+          msg: "File '#{server.property.image}' does not exist."
+        }, :ALL)
+      end
+      next
     end
     debug "Frisbee server is loading image: #{server.property.image}"
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - NITOS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common