nitos_testbed_rc 2.0.5 → 2.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDg1M2ZkMDhiZDYzNjljNWNjNjQyMjBjMTc3MTcxMmE4ODMxODVkOA==
+    OWY5MDliODZjNmY3N2NiYWM2MWU5ZDMzYTk5MTZhZDNmY2JjMTQzOA==
   data.tar.gz: !binary |-
-    MmI4ODcxNmQzZjM5ZGMyZDk1OWQxZjE0YTM4ZjY1NTgwNDhlODA4MA==
+    MDJjZjQ1YzU4MjhiNDhlYzQ0ZmU4ODc3YTI2NTkyMzE0MjFhODY4OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGMyNjhkNzExNGRjMDUyZmY0ODA2ZTFiMzgwNDEzZDg0OGU0ZjZmMWQ4OTUw
-    OGI4NjNiZTc5MWE1OGNjOTUzMzA5OWI4NjY5MTQ1ZTJlYmEzZWNmNjljNTZk
-    ZGU2YTFkZjRkNWMxOTU1NTdjZGJiZjc4NDQ1YmJiYjAxZjBhMTM=
+    ZmIyM2YwZDU2ZGQ4MTZjNTM1MzlmYzUzMDA3OTM1MmUzNjY0YWNmYTExN2Ey
+    OTQ2NjhiYTQ5ZTU4ODk4NzI3ZDc3N2U1ZTc0MTA1NWZhYmMzNTAzMzRlZGZm
+    NjJmYzkyYTIwY2U3NjYwOTJiMDNkYjY5M2VjZTYyMWQ5M2ExODE=
   data.tar.gz: !binary |-
-    MTA2OTc3MmVkMmVhNmMyMjg2NDUxNzBmYWQzMjY1ZjgzM2QxOTVkYjVjMDMw
-    NWU4OWE4YTExOTliMjJjOGE5NjQwYzllODQ4MWMzNmYzOWNkZDYwNjliYTlk
-    YTg2YTI1ODY4N2EzNjhjMWU3NGEzODU4MGQ3Mzk0YjYxZTAzZTM=
+    NzRkYWI3ZmNjYjg3NjJmYWIzNzg5NjA5OTcwMmNkM2ZiODY3OGY0YjI2ZTY1
+    ODEyMGRlMTdjM2U2MWVjODRkMTk1NTMxMDk3MzkwZmNlOTg2ZWI5NTc1ZjM4
+    ZjYyNDFhODBmZjIwOWFjNmI2M2M1MDQ3MTNiNWM2ZjI2OGIyOTA=

data/bin/omf6

@@ -425,9 +425,14 @@ def create_imagezip_client(comm, fcontroller, cm_controller, node, port, options
       client = reply_msg.resource
       client.on_subscribed do
         client.on_message do |client_msg|
+          puts "==== #{client_msg.inspect}"
           if client_msg.operation == :inform
             if client_msg.read_property("event") == "STDOUT"
               # print "#{client_msg.read_property("msg")}"
+            elsif client_msg.read_property("event") == 'BAD_FORMAT'
+              puts "ERROR: #{client_msg.read_property("msg")}"
+              cm_controller.configure(state: {node: node.to_sym, status: :stop, last_action: options[:last_action]})
+              shut_down(comm)
             elsif client_msg.read_property("event") == "EXIT"
               stop_saving()
               puts "INFO:"
@@ -497,6 +502,8 @@ def create_imagezip_client(comm, fcontroller, cm_controller, node, port, options
                 cm_controller.configure(state: {node: node.to_sym, status: :start_without_pxe, last_action: options[:last_action]})
               end
             end
+          elsif client_msg.operation == :error
+            puts "aaa"            
           end
         end
       end

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -34,7 +34,7 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
       debug "Received message '#{client.opts.inspect}'"
       sleep 1
       if error_msg = client.opts.error_msg
-        res.inform(:error,{
+        client.inform(:error,{
           event_type: "AUTH",
           exit_code: "-1",
           node_name: client.property.node_topic,
@@ -52,20 +52,34 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
       host = Net::Telnet.new("Host" => client.property.multicast_interface.to_s, "Timeout" => false, "Telnetmode" => true)
 
       output = ''
+      error = nil
       host.cmd(command.to_s) do |c|
         print "#{c}"
         if c.include? 'compressed'
           output = c
+        elsif c.include?("Filesystem specific error")
+          error = 'Filesystem not supported by the save mechanism (ext4 not supported).'
         end
       end
 
-      client.inform(:status, {
-        status_type: 'FRISBEE',
-        event: "EXIT",
-        app: client.property.app_id,
-        node: client.property.node_topic,
-        msg: output
-      }, :ALL)
+      if error
+        puts "****"
+        client.inform(:error,{
+          event_type: "ERROR",
+          event: "BAD_FORMAT",
+          exit_code: "-2",
+          node_name: client.property.node_topic,
+          msg: error
+        }, :ALL)
+      else
+        client.inform(:status, {
+          status_type: 'FRISBEE',
+          event: "EXIT",
+          app: client.property.app_id,
+          node: client.property.node_topic,
+          msg: output
+        }, :ALL)
+      end
       host.close
     end
 

data/lib/nitos_testbed_rc/user.rb

@@ -43,7 +43,7 @@ module OmfRc::ResourceProxy::User
     end
 
     opts[:xmpp][:script_user] = res.property.username
-    opts[:xmpp][:server] = res.topics.first.address.split('@').last
+    # opts[:xmpp][:server] = res.topics.first.address.split('@').last
 
     File.open("#{path}/omf_script_conf.yaml", "w") {|f| f.write(opts.to_yaml) }
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "2.0.5"
+    VERSION = "2.0.6"
   end
 end

data/nitos_testbed_rc.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency "omf_common", "~> 6.1.3"
-  s.add_runtime_dependency "omf_rc", "~> 6.1.3"
-  s.add_runtime_dependency "nokogiri", "~> 1.6.0"
-  s.add_runtime_dependency "progress_bar", "~> 1.0.3"
-  s.add_runtime_dependency "net-ssh", "~> 2.8.0"
+  s.add_runtime_dependency "omf_common", "= 6.2.3"
+  s.add_runtime_dependency "omf_rc", "= 6.2.3"
+  s.add_runtime_dependency "nokogiri", "= 1.6.0"
+  s.add_runtime_dependency "progress_bar", "= 1.0.3"
+  s.add_runtime_dependency "net-ssh", "= 2.8.0"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - NITOS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.2.3
 - !ruby/object:Gem::Dependency
   name: omf_rc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3
+        version: 6.2.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.8.0
 description: NITOS testbed resource controllers that support a. Chassis manager cards,
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nitos_testbed_rc
-rubygems_version: 2.1.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: NITOS testbed resource controllers.