opennebula 5.8.5 → 5.9.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06fd52885b4ac9a83d900172dc8625ff912aba51
-  data.tar.gz: 7fa11854188fba2ce445964b4a4e35d19b8b1565
+  metadata.gz: 321f13bb3966469aa1b7b07f8b83287985be6841
+  data.tar.gz: 204f2304bdecee1142c845ee78d6c676de6c4456
 SHA512:
-  metadata.gz: 5a578dff3928c681eb3628dde9f8caa21d9e129b3fdeef6645d87c2f1bd19c7caac63d81a23a80b7d92a3f8c7ac6c901a54a07c4ac9a58e6f5736e6220d0fe16
-  data.tar.gz: 7d3ec63493e2f8dc81bf5cb82f00c12d6f76fd769d640f7de55367d28b7961e579351a657d59134bec9781a484eab6ccab4abb2e90a751829feb0447dc1e099f
+  metadata.gz: e358e112f2e6f689f45d8aaab0608b972b15165bf1e17e66346df051027faa676d6ed69355f2305832ae024c7088d243d38206248dd709df6d6557520492dd2c
+  data.tar.gz: a299a7153acfb2a60d3dd7731d23c33bd4e2f7685e4e40459ca8f77275c9b42d42dfbef87aa53a9439f72d569f3554be45741f30ee74601ba818ad4ddb7eb607

data/lib/CommandManager.rb

@@ -17,6 +17,7 @@
 require 'pp'
 require 'open3'
 require 'timeout'
+require 'base64'
 
 # Generic command executor that holds the code shared by all the command
 # executors.
@@ -106,6 +107,18 @@ class GenericCommand
         tmp[0].join(' ').strip
     end
 
+    def to_xml
+        stdout = @stdout.nil? ? '' : @stdout
+        stderr = @stderr.nil? ? '' : @stderr
+
+        '<EXECUTION_RESULT>' \
+            "<COMMAND>#{@command}</COMMAND>" \
+            "<STDOUT>#{Base64.encode64(stdout)}</STDOUT>" \
+            "<STDERR>#{Base64.encode64(stderr)}</STDERR>" \
+            "<CODE>#{@code}</CODE>" \
+        '</EXECUTION_RESULT>'
+    end
+
 private
 
     # Low level command execution. This method has to be redefined

data/lib/VirtualMachineDriver.rb

@@ -51,7 +51,8 @@ class VirtualMachineDriver < OpenNebulaDriver
         :detach_nic  => "DETACHNIC",
         :disk_snapshot_create => "DISKSNAPSHOTCREATE",
         :resize_disk => "RESIZEDISK",
-        :update_sg   => "UPDATESG"
+        :update_sg   => "UPDATESG",
+        :update_conf => "UPDATECONF"
     }
 
     POLL_ATTRIBUTE = OpenNebula::VirtualMachine::Driver::POLL_ATTRIBUTE
@@ -96,6 +97,7 @@ class VirtualMachineDriver < OpenNebulaDriver
         register_action(ACTION[:disk_snapshot_create].to_sym, method("disk_snapshot_create"))
         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"))
     end
 
     # Decodes the encoded XML driver message received from the core
@@ -220,6 +222,11 @@ class VirtualMachineDriver < OpenNebulaDriver
         send_message(ACTION[:cleanup],RESULT[:failure],id,error)
     end
 
+    def update_conf(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:update_conf],RESULT[:failure],id,error)
+    end
+
 private
 
     # Interface to handle the pending events from the ActionManager Interface

data/lib/cloud/CloudClient.rb

@@ -50,7 +50,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.8.5'
+    VERSION = '5.9.80'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula.rb

@@ -67,9 +67,12 @@ require 'opennebula/vm_group'
 require 'opennebula/vm_group_pool'
 require 'opennebula/vntemplate'
 require 'opennebula/vntemplate_pool'
+require 'opennebula/hook'
+require 'opennebula/hook_pool'
+require 'opennebula/hook_log'
 
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.8.5'
+    VERSION = '5.9.80'
 end

data/lib/opennebula/cluster.rb

@@ -64,8 +64,8 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given Cluster.
-        def info()
-            super(CLUSTER_METHODS[:info], 'CLUSTER')
+        def info(decrypt = false)
+            super(CLUSTER_METHODS[:info], 'CLUSTER', decrypt)
         end
 
         alias_method :info!, :info

data/lib/opennebula/datastore.rb

@@ -76,8 +76,8 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given Datastore.
-        def info()
-            super(DATASTORE_METHODS[:info], 'DATASTORE')
+        def info(decrypt = false)
+            super(DATASTORE_METHODS[:info], 'DATASTORE', decrypt)
         end
 
         alias_method :info!, :info

data/lib/opennebula/hook.rb

@@ -0,0 +1,161 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, 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                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require 'opennebula/pool_element'
+
+module OpenNebula
+
+    # Class for representing a Hook object.
+    class Hook < PoolElement
+
+        #######################################################################
+        # Constants and Class Methods
+        #######################################################################
+        HOOK_METHODS = {
+            :allocate => 'hook.allocate',
+            :delete   => 'hook.delete',
+            :update   => 'hook.update',
+            :rename   => 'hook.rename',
+            :info     => 'hook.info',
+            :lock     => 'hook.lock',
+            :unlock   => 'hook.unlock',
+            :retry    => 'hook.retry'
+        }
+
+        # Creates a Hook description with just its identifier
+        # this method should be used to create plain Hook objects.
+        # +id+ the id of the user
+        #
+        # Example:
+        #   hook = Hook.new(Hook.build_xml(3),rpc_client)
+        #
+        def self.build_xml(pe_id = nil)
+            if pe_id
+                obj_xml = "<HOOK><ID>#{pe_id}</ID></HOOK>"
+            else
+                obj_xml = '<HOOK></HOOK>'
+            end
+
+            XMLElement.build_xml(obj_xml, 'HOOK')
+        end
+
+        # Class constructor
+        def initialize(xml, client)
+            super(xml, client)
+
+            @client = client
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the Template Object
+        #######################################################################
+
+        # Retrieves the information of the given Hook.
+        def info
+            return Error.new('ID not defined') unless @pe_id
+
+            rc = @client.call(HOOK_METHODS[:info], @pe_id, false)
+
+            if !OpenNebula.is_error?(rc)
+                initialize_xml(rc, 'HOOK')
+                rc = nil
+
+                @pe_id = self['ID'].to_i if self['ID']
+                @name  = self['NAME'] if self['NAME']
+            end
+
+            rc
+        end
+
+        alias :info! info
+
+        # Allocates a new Hook in OpenNebula
+        #
+        # @param template [String] The contents of the Hook template.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def allocate(template)
+            super(HOOK_METHODS[:allocate], template)
+        end
+
+        # Deletes the Hook
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def delete
+            call(HOOK_METHODS[:delete], @pe_id)
+        end
+
+        # Replaces the Hook contents
+        #
+        # @param new_template [String] New Hook contents
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update(new_template, append = false)
+            super(HOOK_METHODS[:update], new_template, append ? 1 : 0)
+        end
+
+        # Renames this Hook
+        #
+        # @param name [String] New name for the Hook.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            call(HOOK_METHODS[:rename], @pe_id, name)
+        end
+
+        # Retry a previous execution of the hook.
+        #
+        # @param exec_id [int] Hook execution id.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def retry(exec_id)
+            call(HOOK_METHODS[:retry], @pe_id, exec_id)
+        end
+
+        #######################################################################
+        # Helpers to get Hook information
+        #######################################################################
+
+        # Returns the group identifier
+        # [return] _Integer_ the element's group ID
+        def gid
+            self['GID'].to_i
+        end
+
+        def owner_id
+            self['UID'].to_i
+        end
+
+        # Lock a Hook
+        def lock(level)
+            call(HOOK_METHODS[:lock], @pe_id, level)
+        end
+
+        # Unlock a Hook
+        def unlock
+            call(HOOK_METHODS[:unlock], @pe_id)
+        end
+
+    end
+
+end

data/lib/opennebula/hook_log.rb

@@ -0,0 +1,69 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, 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                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require 'opennebula/xml_utils'
+
+module OpenNebula
+
+    # Class representing the HookLog
+    class HookLog < XMLElement
+
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+        HOOK_LOG_METHODS = {
+            :info     => 'hooklog.info'
+        }
+
+        ROOT_NAME = 'HOOKLOG'
+
+        #######################################################################
+        # Class constructor & Methods
+        #######################################################################
+
+        # +client+ a Client object that represents an XML-RPC connection
+        def initialize(client)
+            super(nil)
+
+            @client = client
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the HookLog object
+        #######################################################################
+
+        def info(min_ts, max_ts, hook_id, rc)
+            rc = @client.call(HOOK_LOG_METHODS[:info],
+                              min_ts,
+                              max_ts,
+                              hook_id,
+                              rc)
+
+            if !OpenNebula.is_error?(rc)
+                initialize_xml(rc, ROOT_NAME)
+
+                rc = nil
+            end
+
+            rc
+        end
+
+        alias :info! info
+
+    end
+
+end

data/lib/opennebula/hook_pool.rb

@@ -0,0 +1,82 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, 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                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require 'opennebula/pool'
+
+module OpenNebula
+
+    # Class representing a HookPool
+    class HookPool < Pool
+
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+
+        HOOK_POOL_METHODS = {
+            :info => 'hookpool.info'
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents an XML-RPC connection
+        # +user_id+ used to refer to a Pool with Templates from that user
+        def initialize(client, user_id = -1)
+            super('HOOK_POOL', 'HOOK', client)
+
+            @user_id = user_id
+        end
+
+        # Factory method to create Template objects
+        def factory(element_xml)
+            OpenNebula::Hook.new(element_xml, @client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the Template Object
+        #######################################################################
+
+        # Retrieves all or part of the Templates in the pool.
+        def info(*args)
+            case args.size
+            when 0
+                info_filter(HOOK_POOL_METHODS[:info], @user_id, -1, -1)
+            when 3
+                info_filter(HOOK_POOL_METHODS[:info], args[0], args[1], args[2])
+            end
+        end
+
+        def info_all
+            super(HOOK_POOL_METHODS[:info])
+        end
+
+        def info_mine
+            super(HOOK_POOL_METHODS[:info])
+        end
+
+        def info_group
+            super(HOOK_POOL_METHODS[:info])
+        end
+
+        alias :info! info
+        alias :info_all! info_all
+        alias :info_mine! info_mine
+        alias :info_group! info_group
+
+    end
+
+end

data/lib/opennebula/host.rb

@@ -86,8 +86,8 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given Host.
-        def info()
-            super(HOST_METHODS[:info], 'HOST')
+        def info(decrypt = false)
+            super(HOST_METHODS[:info], 'HOST', decrypt)
         end
 
         alias_method :info!, :info

data/lib/opennebula/pool_element.rb

@@ -65,10 +65,10 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def info(xml_method, root_element)
+        def info(xml_method, root_element, decrypt = false)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(xml_method, @pe_id)
+            rc = @client.call(xml_method, @pe_id, decrypt)
 
             if !OpenNebula.is_error?(rc)
                 initialize_xml(rc, root_element)

data/lib/opennebula/server_cipher_auth.rb

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'openssl'
-require 'digest/sha1'
+require 'digest/sha2'
 
 require 'base64'
 require 'fileutils'
@@ -40,7 +40,7 @@ class OpenNebula::ServerCipherAuth
 
         if !srv_passwd.empty?
             # truncate token to 32-bytes for Ruby >= 2.4
-            @key = Digest::SHA1.hexdigest(@srv_passwd)[0..31]
+            @key = Digest::SHA256.hexdigest(@srv_passwd)[0..31]
         else
             @key = ""
         end

data/lib/opennebula/template.rb

@@ -69,10 +69,10 @@ module OpenNebula
         # Retrieves the information of the given Template.
         # @param extended [true,false] optional flag to process the template and
         # include extended information, such as the SIZE for each DISK
-        def info(extended=false)
+        def info(extended=false, decrypt=false)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(TEMPLATE_METHODS[:info], @pe_id, extended)
+            rc = @client.call(TEMPLATE_METHODS[:info], @pe_id, extended, decrypt)
 
             if !OpenNebula.is_error?(rc)
                 initialize_xml(rc, 'VMTEMPLATE')
@@ -98,10 +98,10 @@ module OpenNebula
         end
 
         # Deletes the Template
-        # 
+        #
         # @param recursive [true,false] optional, deletes the template plus
         # any image defined in DISK.
-        # 
+        #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def delete(recursive=false)

data/lib/opennebula/virtual_machine.rb

@@ -277,8 +277,8 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given VirtualMachine.
-        def info()
-            super(VM_METHODS[:info], 'VM')
+        def info(decrypt = false)
+            super(VM_METHODS[:info], 'VM', decrypt)
         end
 
         alias_method :info!, :info
@@ -468,7 +468,7 @@ module OpenNebula
         #   overcommited. Defaults to false
         # @param ds_id [Integer] The System Datastore where to migrate the VM.
         #   To use the current one, set it to -1
-        # @param mtype [Integer] How to perform the cold migration: 
+        # @param mtype [Integer] How to perform the cold migration:
         #     - 0: save - restore,
         #     - 1: power off - boot
         #     - 2: power off hard - boot

data/lib/opennebula/virtual_machine_pool.rb

@@ -50,13 +50,6 @@ module OpenNebula
             @user_id  = user_id
         end
 
-        # Get info extended VM
-        def get_hash_extended
-            rc = info_search(:extended => true)
-            return rc if OpenNebula.is_error?(rc)
-            to_hash
-        end
-
         # Default Factory Method for the Pools
         def factory(element_xml)
             OpenNebula::VirtualMachine.new(element_xml,@client)

data/lib/opennebula/virtual_network.rb

@@ -70,8 +70,8 @@ module OpenNebula
         #######################################################################
 
         # Retrieves the information of the given VirtualNetwork.
-        def info()
-            super(VN_METHODS[:info], 'VNET')
+        def info(decrypt = false)
+            super(VN_METHODS[:info], 'VNET', decrypt)
         end
 
         alias_method :info!, :info

data/lib/opennebula/vntemplate.rb

@@ -68,10 +68,10 @@ module OpenNebula
 
         # Retrieves the information of the given VNTemplate.
         # include extended information, such as the SIZE for each DISK
-        def info()
+        def info(decrypt = false)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(TEMPLATE_METHODS[:info], @pe_id, false)
+            rc = @client.call(TEMPLATE_METHODS[:info], @pe_id, decrypt)
 
             if !OpenNebula.is_error?(rc)
                 initialize_xml(rc, 'VNTEMPLATE')
@@ -97,7 +97,7 @@ module OpenNebula
         end
 
         # Deletes the Template
-        # 
+        #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def delete()

data/lib/vcenter_driver.rb

@@ -21,19 +21,25 @@
 ONE_LOCATION = ENV['ONE_LOCATION'] unless defined?(ONE_LOCATION)
 
 if !ONE_LOCATION
-    BIN_LOCATION = '/usr/bin'     unless defined?(BIN_LOCATION)
-    LIB_LOCATION = '/usr/lib/one' unless defined?(LIB_LOCATION)
-    ETC_LOCATION = '/etc/one/'    unless defined?(ETC_LOCATION)
-    VAR_LOCATION = '/var/lib/one' unless defined?(VAR_LOCATION)
+    BIN_LOCATION  = '/usr/bin'     unless defined?(BIN_LOCATION)
+    LIB_LOCATION  = '/usr/lib/one' unless defined?(LIB_LOCATION)
+    ETC_LOCATION  = '/etc/one/'    unless defined?(ETC_LOCATION)
+    VAR_LOCATION  = '/var/lib/one' unless defined?(VAR_LOCATION)
+    GEMS_LOCATION = '/usr/share/one/gems' unless defined?(GEMS_LOCATION)
 else
-    BIN_LOCATION = ONE_LOCATION + '/bin' unless defined?(BIN_LOCATION)
-    LIB_LOCATION = ONE_LOCATION + '/lib'  unless defined?(LIB_LOCATION)
-    ETC_LOCATION = ONE_LOCATION + '/etc/' unless defined?(ETC_LOCATION)
-    VAR_LOCATION = ONE_LOCATION + '/var/' unless defined?(VAR_LOCATION)
+    BIN_LOCATION  = ONE_LOCATION + '/bin' unless defined?(BIN_LOCATION)
+    LIB_LOCATION  = ONE_LOCATION + '/lib'  unless defined?(LIB_LOCATION)
+    ETC_LOCATION  = ONE_LOCATION + '/etc/' unless defined?(ETC_LOCATION)
+    VAR_LOCATION  = ONE_LOCATION + '/var/' unless defined?(VAR_LOCATION)
+    GEMS_LOCATION = ONE_LOCATION + '/share/gems' unless defined?(GEMS_LOCATION)
 end
 
 ENV['LANG'] = 'C'
 
+if File.directory?(GEMS_LOCATION)
+    Gem.use_paths(GEMS_LOCATION)
+end
+
 $LOAD_PATH << LIB_LOCATION + '/ruby/vendors/rbvmomi/lib'
 $LOAD_PATH << LIB_LOCATION + '/ruby'
 $LOAD_PATH << LIB_LOCATION + '/ruby/vcenter_driver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.8.5
+  version: 5.9.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-24 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -79,6 +79,9 @@ files:
 - lib/opennebula/error.rb
 - lib/opennebula/group.rb
 - lib/opennebula/group_pool.rb
+- lib/opennebula/hook.rb
+- lib/opennebula/hook_log.rb
+- lib/opennebula/hook_pool.rb
 - lib/opennebula/host.rb
 - lib/opennebula/host_pool.rb
 - lib/opennebula/image.rb
@@ -139,9 +142,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1