opennebula 5.12.10 → 5.13.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff1a53938f41ec6f52353853f4d1e48ca3c4ff6b
-  data.tar.gz: 6b62337e8bd1aa3bdc2942daca2532b0449cfec4
+  metadata.gz: cc16996ef3b6218367420d87066688a52ee86042
+  data.tar.gz: dae462f84f7ec7bfed459506c56981be1e27974e
 SHA512:
-  metadata.gz: 127520928ca1eb09a66a7fdbf421183e40f8a67415f5e28129d31a77f6f4bfc431e6ba03815f03c43e338a390bbed36b54722c0090872c83b2748530947b6eea
-  data.tar.gz: 670f0bc8cd97ee2744049606a924db762e8bdf37d1fa6dd1c44194dedfce0d1fe3fd86b2ae01343f2cda5cdd9c74608b9210cb244ff1c281cf94e684f77c36a5
+  metadata.gz: d6a40c0cbf0a2125a07d18348d0d13471562d81581c06318126a7d671025bdcf34a30c5228af30bd37014af65329714ada099de91fcde70db29198b2731c0fc8
+  data.tar.gz: 4a53d311862746b7712066d355120306a5b3d4311315dabf24513f5e20dc509acb4254e5d58556090b768f3aa33e89df2311c10127d87c918f7c0befe2b6c8a1

data/lib/ActionManager.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- */
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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-2020, OpenNebula Project, OpenNebula Systems
+# Copyright 2002-2021, 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/DriverExecHelper.rb

@@ -1,5 +1,6 @@
+# rubocop:disable Naming/FileName
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -18,14 +19,15 @@
 # OpenNebula Drivers. The module has been designed to be included as part
 # of a driver and not to be used standalone.
 module DriverExecHelper
+
     # Action result strings for messages
     RESULT = {
-        :success => "SUCCESS",
-        :failure => "FAILURE"
+        :success => 'SUCCESS',
+        :failure => 'FAILURE'
     }
 
     def self.failed?(rc_str)
-        return rc_str == RESULT[:failure]
+        rc_str == RESULT[:failure]
     end
 
     # Initialize module variables
@@ -34,6 +36,7 @@ module DriverExecHelper
         @remote_scripts_base_path = @config['SCRIPTS_REMOTE_DIR']
 
         @local_actions = options[:local_actions]
+        @per_drvr_local_actions = options[:per_drvr_local_actions] || []
 
         if ENV['ONE_LOCATION'].nil?
             @local_scripts_base_path = '/var/lib/one/remotes'
@@ -57,62 +60,74 @@ module DriverExecHelper
     # actions is remote or local. If the local actions has defined an special
     # script name this is used, otherwise the action name in downcase is
     # used as the script name.
+    # When action is a String starting with '/' it's considered alreay full
+    # path command and no modification is performed apart from adding params.
     #
     # @param [String, Symbol] action name of the action
     # @param [String] parameters arguments for the script
     # @param [String, nil] default_name alternative name for the script
     # @param [String, ''] directory to append to the scripts path for actions
     # @return [String] command line needed to execute the action
-    def action_command_line(action, parameters, default_name=nil, directory='')
-        if action_is_local? action
+    def action_command_line(action, parameters,
+                            default_name = nil, directory = '')
+
+        if action.is_a?(String) && action[0] == '/'
+            return action + ' ' + parameters if parameters
+
+            return action
+        elsif action_is_local?(action, directory)
             script_path=File.join(@local_scripts_path, directory)
         else
             script_path=File.join(@remote_scripts_path, directory)
         end
 
         File.join(script_path, action_script_name(action, default_name))+
-            " "+parameters
+            ' '+parameters
     end
 
     # True if the action is meant to be executed locally
     #
     # @param [String, Symbol] action name of the action
-    def action_is_local?(action)
-        @local_actions.include? action.to_s.upcase
+    # @param [String, Symbol] driver name
+    def action_is_local?(action, driver = '')
+        @local_actions.include? action.to_s.upcase if driver.empty?
+
+        @local_actions.include? action.to_s.upcase or
+            @per_drvr_local_actions.include? "#{driver}-#{action}"
     end
 
     # Name of the script file for the given action
     #
     # @param [String, Symbol] action name of the action
     # @param [String, nil] default_name alternative name for the script
-    def action_script_name(action, default_name=nil)
+    def action_script_name(action, default_name = nil)
         name=@local_actions[action.to_s.upcase]
 
-        if name
-            name
-        else
-            default_name || action.to_s.downcase
-        end
+        name || default_name || action.to_s.downcase
     end
 
     #
     #                METHODS FOR LOGS & COMMAND OUTPUT
     #
     # Sends a message to the OpenNebula core through stdout
-    def send_message(action="-", result=RESULT[:failure], id="-", info="-")
-        @send_mutex.synchronize {
+    # rubocop:disable Metrics/ParameterLists
+    def send_message(action = '-', result = RESULT[:failure],
+                     id = '-', info = '-')
+
+        @send_mutex.synchronize do
             STDOUT.puts "#{action} #{result} #{id} #{info}"
             STDOUT.flush
-        }
+        end
     end
+    # rubocop:enable Metrics/ParameterLists
 
     # Sends a log message to ONE. The +message+ can be multiline, it will
     # be automatically splitted by lines.
-    def log(number, message, all=true)
+    def log(number, message, all = true)
         in_error_message=false
         msg=message.strip
-        msg.each_line {|line|
-            severity=all ? 'I' : nil
+        msg.each_line do |line|
+            all ? severity='I' : severity=nil
             l=line.strip
 
             if l=='ERROR MESSAGE --8<------'
@@ -125,8 +140,8 @@ module DriverExecHelper
                 if in_error_message
                     severity='E'
                 elsif line.match(/^(ERROR|DEBUG|INFO):(.*)$/)
-                    line=$2
-                    case $1
+                    line=Regexp.last_match(2)
+                    case Regexp.last_match(1)
                     when 'ERROR'
                         severity='E'
                     when 'DEBUG'
@@ -137,19 +152,19 @@ module DriverExecHelper
                 end
             end
 
-            send_message("LOG", severity, number, line.strip) if severity
-        }
+            send_message('LOG', severity, number, line.strip) if severity
+        end
     end
 
     # Generates a proc with that calls log with a hardcoded number. It will
     # be used to add loging to command actions
     def log_method(num)
-        lambda {|message, all=true|
+        lambda {|message, all = true|
             log(num, message, all)
         }
     end
 
-    #This method returns the result in terms
+    # This method returns the result in terms
     def get_info_from_execution(command_exe)
         if command_exe.code == 0
             result = RESULT[:success]
@@ -159,7 +174,7 @@ module DriverExecHelper
             info   = command_exe.get_error_message
         end
 
-        info = "-" if info == nil || info.empty?
+        info = '-' if info.nil? || info.empty?
 
         [result, info]
     end
@@ -211,3 +226,4 @@ module DriverExecHelper
     end
 
 end
+# rubocop:enable Naming/FileName

data/lib/OpenNebulaDriver.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -90,13 +90,17 @@ class OpenNebulaDriver < ActionManager
             :respond => true,
             :ssh_stream => nil,
             :base64 => false,
-            :zip => false
+            :zip => false,
+            :no_extra_params => false
         }.merge(ops)
 
-        params  = parameters + " #{id} #{host}"
+        params = parameters
+        params = "#{params} #{id} #{host}" unless options[:no_extra_params]
         command = action_command_line(aname, params, options[:script_name])
 
-        if action_is_local?(aname)
+        # if options[:is_local] is not specified (nil)
+        # we rely uniquely in actions_is_local?
+        if action_is_local?(aname) or options[:is_local]
             stdin = Base64.strict_encode64(options[:stdin].to_s)
             execution = LocalCommand.run(command,
                                          log_method(id),

data/lib/VirtualMachineDriver.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -52,7 +52,8 @@ class VirtualMachineDriver < OpenNebulaDriver
         :disk_snapshot_create => "DISKSNAPSHOTCREATE",
         :resize_disk => "RESIZEDISK",
         :update_sg   => "UPDATESG",
-        :update_conf => "UPDATECONF"
+        :update_conf => "UPDATECONF",
+        :resize      => "RESIZE"
     }
 
     POLL_ATTRIBUTE = OpenNebula::VirtualMachine::Driver::POLL_ATTRIBUTE
@@ -98,6 +99,7 @@ class VirtualMachineDriver < OpenNebulaDriver
         register_action(ACTION[:resize_disk].to_sym, method("resize_disk"))
         register_action(ACTION[:update_sg].to_sym, method("update_sg"))
         register_action(ACTION[:update_conf].to_sym, method("update_conf"))
+        register_action(ACTION[:resize].to_sym, method("resize"))
     end
 
     # Decodes the encoded XML driver message received from the core
@@ -227,6 +229,11 @@ class VirtualMachineDriver < OpenNebulaDriver
         send_message(ACTION[:update_conf],RESULT[:failure],id,error)
     end
 
+    def resize(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:resize],RESULT[:failure],id,error)
+    end
+
 private
 
     # Interface to handle the pending events from the ActionManager Interface

data/lib/cloud/CloudClient.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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.12.10'
+    VERSION = '5.13.80'
 
     # #########################################################################
     # Default location for the authentication file
@@ -229,7 +229,7 @@ module CloudCLI
     def version_text
         version=<<EOT
 OpenNebula #{CloudClient::VERSION}
-Copyright 2002-2020, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2021, 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