opennebula 5.10.5 → 5.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eef5944650d29d0900721fdddc245046d917db7
-  data.tar.gz: 16756369b4fbca3c7c1bf68aa34e844f74d20fd9
+  metadata.gz: 27c05d144109ae5a8e3995f035226e3cd5cf6adf
+  data.tar.gz: fa20b6ab2793fbce18a6e4f70cda6353edc61b95
 SHA512:
-  metadata.gz: cf9256eb072f826f61132a3b876b3aab2c8790fde690ffca9406bdf4d42853c151b94950fe6e186dd0f0d28360b0013cfbc7173c8f54260345ba25e22130e447
-  data.tar.gz: 346dd160e173e6f25279f65e2a57c253e4a942acb358803b91fa3de39fc8934922107d8d0f30bc9cdbb4b7162750f072cd4b52c5949e23d308baf0e87834eb19
+  metadata.gz: 425276a4cc8b3cc09132b444778dd4a1a58713d15aba34d30fd367819105b712bf50ebe5ba62c07156ef122173423c61481e647b164e08daef434fcc632b42b3
+  data.tar.gz: 9e1e231bf00191417afbcf6140ab6dc64f8180fe262076acfe632743df1fa13a1f9e8fa9a3fe80c1325ce135ecb2580be831bf1520a0c61cc1a9af60a106cdcf

data/lib/ActionManager.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- */
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    */
 # not use this file except in compliance with the License. You may obtain    */
 # a copy of the License at                                                   */

data/lib/CommandManager.rb

@@ -1,5 +1,5 @@
 # --------------------------------------------------------------------------
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
@@ -179,13 +179,23 @@ private
             i.write stdin_data
             i.close
 
-            out = [out_reader.value, err_reader.value, t.value]
+            # blocking wait for process termination
+            t.value
+
+            # if reader threads are not dead yet, kill them
+            [out_reader, err_reader].each do |reader|
+                next unless reader.status
+
+                reader.join(0.1)
+                reader.kill
+            end
 
             mutex.lock
             terminator.kill
             raise terminator_e if terminator_e
 
-            out
+            # return values
+            [out_reader.value, err_reader.value, t.value]
         }
     end
 

data/lib/DriverExecHelper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -28,15 +28,15 @@ module DriverExecHelper
         return rc_str == RESULT[:failure]
     end
 
-    #Initialize module variables
+    # Initialize module variables
     def initialize_helper(directory, options)
         @config = read_configuration
         @remote_scripts_base_path = @config['SCRIPTS_REMOTE_DIR']
 
         @local_actions = options[:local_actions]
 
-        if ENV['ONE_LOCATION'] == nil
-            @local_scripts_base_path = "/var/lib/one/remotes"
+        if ENV['ONE_LOCATION'].nil?
+            @local_scripts_base_path = '/var/lib/one/remotes'
         else
             @local_scripts_base_path = "#{ENV['ONE_LOCATION']}/var/remotes"
         end
@@ -176,37 +176,38 @@ module DriverExecHelper
             one_config = '/var/lib/one/config'
         end
 
-        config=Hash.new
-        cfg=''
+        config = {}
+        cfg    = ''
 
         begin
-            open(one_config) do |file|
+            File.open(one_config, 'r') do |file|
                 cfg=file.read
             end
 
             cfg.split(/\n/).each do |line|
                 m=line.match(/^([^=]+)=(.*)$/)
 
-                if m
-                    name=m[1].strip.upcase
-                    value=m[2].strip
+                next unless m
 
-                    if config[name]
-                        if config[name].instance_of? Array
-                            config[name] << value
-                        else
-                            config[name] = [config[name], value]
-                        end
+                name  = m[1].strip.upcase
+                value = m[2].strip
+
+                if config[name]
+                    if config[name].instance_of? Array
+                        config[name] << value
                     else
-                        config[name]=value
+                        config[name] = [config[name], value]
                     end
+                else
+                    config[name]=value
                 end
             end
-        rescue Exception => e
+        rescue StandardException => e
             STDERR.puts "Error reading config: #{e.inspect}"
             STDERR.flush
         end
 
         config
     end
+
 end

data/lib/OpenNebulaDriver.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -14,10 +14,10 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-require "ActionManager"
-require "CommandManager"
+require 'ActionManager'
+require 'CommandManager'
 
-require "DriverExecHelper"
+require 'DriverExecHelper'
 require 'base64'
 
 # This class provides basic messaging and logging functionality
@@ -29,6 +29,7 @@ require 'base64'
 # for each action it wants to receive. The method must be associated
 # with the action name through the register_action function
 class OpenNebulaDriver < ActionManager
+
     include DriverExecHelper
 
     # @return [String] Base path for scripts
@@ -48,13 +49,13 @@ class OpenNebulaDriver < ActionManager
     # @option options [Hash] :local_actions ({}) hash with the actions
     #   executed locally and the name of the script if it differs from the
     #   default one. This hash can be constructed using {parse_actions_list}
-    def initialize(directory, options={})
+    def initialize(directory, options = {})
         @options={
             :concurrency => 10,
-            :threaded    => true,
-            :retries     => 0,
+            :threaded => true,
+            :retries => 0,
             :local_actions => {},
-            :timeout     => nil
+            :timeout => nil
         }.merge!(options)
 
         super(@options[:concurrency], @options[:threaded])
@@ -62,14 +63,12 @@ class OpenNebulaDriver < ActionManager
         @retries = @options[:retries]
         @timeout = @options[:timeout]
 
-        #Set default values
+        # Set default values
         initialize_helper(directory, @options)
 
-        register_action(:INIT, method("init"))
+        register_action(:INIT, method('init'))
     end
 
-
-
     # Calls remotes or local action checking the action name and
     # @local_actions. Optional arguments can be specified as a hash
     #
@@ -83,20 +82,22 @@ class OpenNebulaDriver < ActionManager
     #   action name is used by defaults
     # @option ops [Bool] :respond if defined will send result to ONE core
     # @option ops [Bool] :base64 encode the information sent to ONE core
-    def do_action(parameters, id, host, aname, ops={})
-        options={
-            :stdin       => nil,
+    # @option ops [Bool] :zip compress the information sent to ONE core
+    def do_action(parameters, id, host, aname, ops = {})
+        options = {
+            :stdin => nil,
             :script_name => nil,
-            :respond     => true,
-            :ssh_stream  => nil,
-            :base64      => false
+            :respond => true,
+            :ssh_stream => nil,
+            :base64 => false,
+            :zip => false
         }.merge(ops)
 
         params  = parameters + " #{id} #{host}"
         command = action_command_line(aname, params, options[:script_name])
 
         if action_is_local?(aname)
-            stdin = Base64::encode64(options[:stdin].to_s.gsub("\n",""))
+            stdin = Base64.strict_encode64(options[:stdin].to_s)
             execution = LocalCommand.run(command,
                                          log_method(id),
                                          stdin,
@@ -114,7 +115,6 @@ class OpenNebulaDriver < ActionManager
                                                  stdin,
                                                  command,
                                                  @timeout)
-
         else
             execution = RemotesCommand.run(command,
                                            host,
@@ -128,20 +128,20 @@ class OpenNebulaDriver < ActionManager
         result, info = get_info_from_execution(execution)
 
         if options[:respond]
-            info = Base64::encode64(info).strip.delete("\n") if options[:base64]
+            info = Zlib::Deflate.deflate(info, Zlib::BEST_COMPRESSION) if options[:zip]
+            info = Base64.strict_encode64(info) if options[:base64]
+
             send_message(aname, result, id, info)
         end
 
         [result, info]
     end
 
-
     # Start the driver. Reads from STDIN and executes methods associated with
     # the messages
     def start_driver
-        loop_thread = Thread.new { loop }
+        Thread.new { loop }
         start_listener
-        loop_thread.kill
     end
 
     # This function parses a string with this form:
@@ -156,12 +156,12 @@ class OpenNebulaDriver < ActionManager
     # @param [String] str imput string to parse
     # @return [Hash] parsed actions
     def self.parse_actions_list(str)
-        actions=Hash.new
-        str_splitted=str.split(/\s*,\s*/).map {|s| s.strip }
+        actions = {}
+        str_splitted = str.split(/\s*,\s*/).map {|s| s.strip }
 
         str_splitted.each do |a|
             m=a.match(/([^=]+)(=(.*))?/)
-            next if !m
+            next unless m
 
             action=m[1].upcase
 
@@ -178,21 +178,21 @@ class OpenNebulaDriver < ActionManager
         actions
     end
 
-private
+    private
 
     def init
-        send_message("INIT",RESULT[:success])
+        send_message('INIT', RESULT[:success])
     end
 
     def loop
-        while true
-            exit(-1) if STDIN.eof?
+        Kernel.loop do
+            exit!(-1) if STDIN.eof?
 
-            str=STDIN.gets
-            next if !str
+            str = STDIN.gets
+            next unless str
 
-            args   = str.split(/\s+/)
-            next if args.length == 0
+            args = str.split(/\s+/)
+            next if args.empty?
 
             if args.first.empty?
                 STDERR.puts "Malformed message: #{str.inspect}"
@@ -201,7 +201,7 @@ private
 
             action = args.shift.upcase.to_sym
 
-            if (args.length == 0) || (!args[0])
+            if args.empty? || !args[0]
                 action_id = 0
             else
                 action_id = args[0].to_i
@@ -209,35 +209,11 @@ private
 
             if action == :DRIVER_CANCEL
                 cancel_action(action_id)
-                log(action_id,"Driver command for #{action_id} cancelled")
+                log(action_id, "Driver command for #{action_id} cancelled")
             else
-                trigger_action(action,action_id,*args)
+                trigger_action(action, action_id, *args)
             end
         end
     end
-end
-
-################################################################
-################################################################
-
-if __FILE__ == $0
-
-    class SampleDriver < OpenNebulaDriver
-        def initialize
-            super(15,true)
-
-            register_action(:SLEEP,method("my_sleep"))
-        end
-
-        def my_sleep(num, timeout)
-            log(num,"Sleeping #{timeout} seconds")
-            sleep(timeout.to_i)
-            log(num,"Done with #{num}")
-
-            send_message("SLEEP",RESULT[:success],num.to_s)
-        end
-    end
 
-    sd = SampleDriver.new
-    sd.start_driver
 end

data/lib/VirtualMachineDriver.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/cloud/CloudClient.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.10.5'
+    VERSION = '5.12.1'
 
     # #########################################################################
     # Default location for the authentication file
@@ -229,7 +229,7 @@ module CloudCLI
     def version_text
         version=<<EOT
 OpenNebula #{CloudClient::VERSION}
-Copyright 2002-2019, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2020, OpenNebula Project, OpenNebula Systems
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain

data/lib/opennebula.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -74,5 +74,5 @@ require 'opennebula/hook_log'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.10.5'
+    VERSION = '5.12.1'
 end

data/lib/opennebula/acl.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/acl_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/client.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/cluster.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/cluster_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/datastore.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/datastore_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #