opennebula 6.8.0 → 6.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eedefbb85b95ea6fab4348f1a05bb71ef05532659c49a388cecf0ba3662afb75
-  data.tar.gz: 10a3856b4e5794727d67687446ef420c8b0eb05b9f15ada412467d8e3da8b15a
+  metadata.gz: 5759fbb07bfb063ffa52b37dab6435776ed9d3fa2e14c686df1920d4012b7242
+  data.tar.gz: 602088834190d1305ad873f000bab5afe75858b87ab5c9891d2d869d518bf0bc
 SHA512:
-  metadata.gz: ce540f42a07049fd4088692b31b3651dce29db28cee3bd199a3c67f17998aad1677a8aceb4d29a75deb93e9c5d7d985b9246cc7fa6c55721f9e3411e5779dd85
-  data.tar.gz: c751b6ad361a43f7d87ef93734f881715b95c1b2c8c385b565c10ae7ce62b8d3d69db42d4ed2365cb4449d1ed1e2ea8a1958a38ab5705e4c755a6ef135e7249c
+  metadata.gz: 89b9a4ac5491c5b443d30692cd198bbe4176823df5b81fcc914cbb96be8d72d19b9ca6c4ae3e8c97f8754bd745273888cedfa094a71aae9c366cca75987ed152
+  data.tar.gz: 40f49cf1a941abc8f5e4f081393f10ec902229704c6ff24e033753b184007d5eaef8bf8d2c0dbeb255c30985b32e07508a36a1b0a2ab531c4437920dcfb436da

data/lib/DriverExecHelper.rb

@@ -207,7 +207,7 @@ module DriverExecHelper
                     config[name]=value
                 end
             end
-        rescue StandardException => e
+        rescue StandardError => e
             STDERR.puts "Error reading config: #{e.inspect}"
             STDERR.flush
         end

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.8.0'
+    VERSION = '6.8.2'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/models/role.rb

@@ -468,8 +468,7 @@ module OpenNebula
                 @body['last_vmname'] += 1
 
                 Log.debug LOG_COMP,
-                          "Role #{name} : Trying to instantiate " \
-                          "template #{template_id}, with name #{vm_name}",
+                          "Role #{name} : Instantiate template #{template_id}, name #{vm_name}",
                           @service.id
 
                 vm_id = template.instantiate(vm_name, on_hold?, extra_template)
@@ -481,33 +480,52 @@ module OpenNebula
                           "#{template_id}; #{vm_id.message}"
 
                     Log.error LOG_COMP, msg, @service.id
+
                     @service.log_error(msg)
 
-                    return [false, 'Error trying to instantiate the VM ' \
-                                   "Template #{template_id} in Role " \
+                    return [false, "Error instantiating VM Template #{template_id} in Role " \
                                    "#{name}: #{vm_id.message}"]
                 end
 
-                Log.debug LOG_COMP, "Role #{name} : Instantiate success," \
-                                    " VM ID #{vm_id}", @service.id
-                node = {
-                    'deploy_id' => vm_id
-                }
+                Log.debug LOG_COMP,
+                          "Role #{name} : Instantiate success, VM ID #{vm_id}",
+                          @service.id
 
-                vm = OpenNebula::VirtualMachine.new_with_id(vm_id,
-                                                            @service.client)
-                rc = vm.info
+                node = { 'deploy_id' => vm_id }
+                vm   = OpenNebula::VirtualMachine.new_with_id(vm_id, @service.client)
 
-                if OpenNebula.is_error?(rc)
+                tries = 0
+                loop do
+                    break if tries == 3
+
+                    tries += 1
+
+                    rc = vm.info
+
+                    break unless OpenNebula.is_error?(rc)
+
+                    sleep(tries * 0.5)
+                end
+
+                if tries == 3
                     node['vm_info'] = nil
-                else
-                    hash_vm       = vm.to_hash['VM']
-                    vm_info       = {}
-                    vm_info['VM'] = hash_vm.select {|v| VM_INFO.include?(v) }
 
-                    node['vm_info'] = vm_info
+                    msg = "Role #{name} : Cannot get info for VM #{vm_id}"
+
+                    Log.error LOG_COMP, msg, @service.id
+
+                    @service.log_error(msg)
+
+                    return [false,
+                            "Error getting VM #{vm_id} info in Role #{name}: #{vm_id.message}"]
                 end
 
+                hash_vm       = vm.to_hash['VM']
+                vm_info       = {}
+                vm_info['VM'] = hash_vm.select {|v| VM_INFO.include?(v) }
+
+                node['vm_info'] = vm_info
+
                 @body['nodes'] << node
             end
 
@@ -637,8 +655,8 @@ module OpenNebula
                 return OpenNebula::Error.new("Role #{name} is in DONE state")
             end
 
-            do_offset = (!period.nil? && period.to_i > 0 &&
-                !vms_per_period.nil? && vms_per_period.to_i > 0)
+            do_offset = !period.nil? && period.to_i > 0 &&
+                        !vms_per_period.nil? && vms_per_period.to_i > 0
 
             nodes.each_with_index do |node, index|
                 vm_id = node['deploy_id']

data/lib/opennebula/document.rb

@@ -38,16 +38,16 @@ module OpenNebula
         #######################################################################
 
         DOCUMENT_METHODS = {
-            :allocate   => "document.allocate",
-            :delete     => "document.delete",
-            :info       => "document.info",
-            :update     => "document.update",
-            :chown      => "document.chown",
-            :chmod      => "document.chmod",
-            :clone      => "document.clone",
-            :rename     => "document.rename",
-            :lock       => "document.lock",
-            :unlock     => "document.unlock"
+            :allocate   => 'document.allocate',
+            :delete     => 'document.delete',
+            :info       => 'document.info',
+            :update     => 'document.update',
+            :chown      => 'document.chown',
+            :chmod      => 'document.chmod',
+            :clone      => 'document.clone',
+            :rename     => 'document.rename',
+            :lock       => 'document.lock',
+            :unlock     => 'document.unlock'
         }
 
         # Creates a Document Object description with just its identifier
@@ -55,14 +55,14 @@ module OpenNebula
         # @param [Integer] pe_id the id of the object
         #
         # @return [Nokogiri::XML::Node, REXML::Element] the empty xml
-        def Document.build_xml(pe_id=nil)
+        def self.build_xml(pe_id = nil)
             if pe_id
                 obj_xml = "<DOCUMENT><ID>#{pe_id}</ID></DOCUMENT>"
             else
-                obj_xml = "<DOCUMENT></DOCUMENT>"
+                obj_xml = '<DOCUMENT></DOCUMENT>'
             end
 
-            XMLElement.build_xml(obj_xml,'DOCUMENT')
+            XMLElement.build_xml(obj_xml, 'DOCUMENT')
         end
 
         # Class constructor
@@ -78,7 +78,7 @@ module OpenNebula
         def initialize(xml, client)
             LockableExt.make_lockable(self, DOCUMENT_METHODS)
 
-            super(xml,client)
+            super(xml, client)
         end
 
         #######################################################################
@@ -99,7 +99,7 @@ module OpenNebula
             return rc
         end
 
-        alias_method :info!, :info
+        alias info! info
 
         # Allocates a new Document in OpenNebula
         #
@@ -111,14 +111,14 @@ module OpenNebula
             super(DOCUMENT_METHODS[:allocate], description, document_type)
         end
 
-        alias_method :allocate_xml, :allocate
+        alias allocate_xml allocate
 
         # Deletes the Document
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def delete()
-            rc = check_type()
+        def delete
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
             return call(DOCUMENT_METHODS[:delete], @pe_id)
@@ -132,8 +132,8 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def update(new_template, append=false)
-            rc = check_type()
+        def update(new_template, append = false)
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
             super(DOCUMENT_METHODS[:update], new_template, append ? 1 : 0)
@@ -147,8 +147,8 @@ module OpenNebula
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def update_raw(template_raw, append=false)
-            rc = check_type()
+        def update_raw(template_raw, append = false)
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
             return call(DOCUMENT_METHODS[:update], @pe_id, template_raw, append ? 1 : 0)
@@ -162,7 +162,7 @@ module OpenNebula
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def chown(uid, gid)
-            rc = check_type()
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
             super(DOCUMENT_METHODS[:chown], uid, gid)
@@ -175,7 +175,7 @@ module OpenNebula
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def chmod_octet(octet)
-            rc = check_type()
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
             super(DOCUMENT_METHODS[:chmod], octet)
@@ -187,8 +187,8 @@ module OpenNebula
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
-                other_m, other_a)
-            rc = check_type()
+                  other_m, other_a)
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
             super(DOCUMENT_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
@@ -202,10 +202,10 @@ module OpenNebula
         # @return [Integer, OpenNebula::Error] The new Document ID in case
         #   of success, Error otherwise
         def clone(name)
-            rc = check_type()
+            rc = check_type
             return rc if OpenNebula.is_error?(rc)
 
-            return Error.new('ID not defined') if !@pe_id
+            return Error.new('ID not defined') unless @pe_id
 
             rc = @client.call(DOCUMENT_METHODS[:clone], @pe_id, name)
 
@@ -241,7 +241,7 @@ module OpenNebula
         # Returns true if the GROUP_U permission bit is set
         # @return [true, false] true if the GROUP_U permission bit is set
         def public?
-            if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+            if self['PERMISSIONS/GROUP_U'] == '1' || self['PERMISSIONS/OTHER_U'] == '1'
                 true
             else
                 false
@@ -252,7 +252,7 @@ module OpenNebula
             self.class::DOCUMENT_TYPE
         end
 
-    private
+        private
 
         def set_publish(published)
             group_u = published ? 1 : 0
@@ -260,7 +260,7 @@ module OpenNebula
             chmod(-1, -1, -1, group_u, -1, -1, -1, -1, -1)
         end
 
-        def check_type()
+        def check_type
             type = self['TYPE']
 
             if type.nil? && @pe_id
@@ -276,10 +276,13 @@ module OpenNebula
 
             if !type.nil? && type.to_i != document_type
                 return OpenNebula::Error.new(
-                    "[DocumentInfo] Error getting document [#{@pe_id}].")
+                    "[DocumentInfo] Error getting document [#{@pe_id}]."
+                )
             end
 
-            return nil
+            return
         end
+
     end
+
 end

data/lib/opennebula/document_pool.rb

@@ -41,7 +41,7 @@ module OpenNebula
         #######################################################################
 
         DOCUMENT_POOL_METHODS = {
-            :info => "documentpool.info"
+            :info => 'documentpool.info'
         }
 
         #######################################################################
@@ -55,10 +55,10 @@ module OpenNebula
         #   http://docs.opennebula.io/stable/integration/system_interfaces/api.html
         #
         # @return [DocumentPool] the new object
-        def initialize(client, user_id=-1)
-            super('DOCUMENT_POOL','DOCUMENT',client)
+        def initialize(client, user_id = -1)
+            super('DOCUMENT_POOL', 'DOCUMENT', client)
 
-            @user_id  = user_id
+            @user_id = user_id
         end
 
         #######################################################################
@@ -99,4 +99,5 @@ module OpenNebula
             self.class::DOCUMENT_TYPE
         end
     end
+
 end

data/lib/opennebula/marketplaceapp_ext.rb

@@ -450,9 +450,7 @@ module OpenNebula::MarketPlaceAppExt
                 ds = OpenNebula::Datastore.new_with_id(dsid, @client)
                 rc = ds.info
 
-                is_vcenter =
-                    !OpenNebula.is_error?(rc) &&
-                        (ds['TEMPLATE/DRIVER'] == 'vcenter')
+                is_vcenter = !OpenNebula.is_error?(rc) && ds['TEMPLATE/DRIVER'] == 'vcenter'
 
                 if is_vcenter
                     if options[:template].nil?
@@ -592,7 +590,7 @@ module OpenNebula::MarketPlaceAppExt
                 pool = OpenNebula::MarketPlaceAppPool.new(@client)
                 rc   = pool.info_all
 
-                return rc if OpenNebula.is_error?(rc)
+                return [rc, [], []] if OpenNebula.is_error?(rc)
 
                 # Apps that have been already exported
                 #
@@ -676,9 +674,7 @@ module OpenNebula::MarketPlaceAppExt
                 end
 
                 if OpenNebula.is_error?(rc)
-                    rc_rbck = rollback_export(exported, xpath != '//DISK')
-
-                    return rc_rbck if OpenNebula.is_error?(rc_rbck)
+                    rollback_export(exported, xpath != '//DISK')
                 end
 
                 [rc, images, templates]

data/lib/opennebula/oneflow_client.rb

@@ -461,6 +461,10 @@ module Service
 
             req['User-Agent'] = @user_agent
 
+            if !@uri.path.nil?
+                req.instance_variable_set(:@path, @uri.path + req.path)
+            end
+
             CloudClient.http_start(@uri, @timeout) do |http|
                 http.request(req)
             end

data/lib/opennebula/virtual_machine.rb

@@ -61,7 +61,9 @@ module OpenNebula
             :detachsg       => 'vm.detachsg',
             :backup         => 'vm.backup',
             :updatenic      => 'vm.updatenic',
-            :backupcancel   => 'vm.backupcancel'
+            :backupcancel   => 'vm.backupcancel',
+            :attachpci      => 'vm.attachpci',
+            :detachpci      => 'vm.detachpci'
         }
 
         VM_STATE=['INIT', 'PENDING', 'HOLD', 'ACTIVE', 'STOPPED', 'SUSPENDED', 'DONE', 'FAILED',
@@ -228,8 +230,68 @@ module OpenNebula
             'BACKUP_POWEROFF'   => 'back'
         }
 
-        HISTORY_ACTION=['none', 'migrate', 'live-migrate', 'shutdown', 'shutdown-hard', 'undeploy',
-                        'undeploy-hard', 'hold', 'release', 'stop', 'suspend', 'resume', 'boot', 'delete', 'delete-recreate', 'reboot', 'reboot-hard', 'resched', 'unresched', 'poweroff', 'poweroff-hard', 'disk-attach', 'disk-detach', 'nic-attach', 'nic-detach', 'disk-snapshot-create', 'disk-snapshot-delete', 'terminate', 'terminate-hard', 'disk-resize', 'deploy', 'chown', 'chmod', 'updateconf', 'rename', 'resize', 'update', 'snapshot-resize', 'snapshot-delete', 'snapshot-revert', 'disk-saveas', 'disk-snapshot-revert', 'recover', 'retry', 'monitor', 'disk-snapshot-rename', 'alias-attach', 'alias-detach', 'poweroff-migrate', 'poweroff-hard-migrate', 'backup', 'nic-update']
+        HISTORY_ACTION=[
+          'none',
+          'migrate',
+          'live-migrate',
+          'shutdown',
+          'shutdown-hard',
+          'undeploy',
+          'undeploy-hard',
+          'hold',
+          'release',
+          'stop',
+          'suspend',
+          'resume',
+          'boot',
+          'delete',
+          'delete-recreate',
+          'reboot',
+          'reboot-hard',
+          'resched',
+          'unresched',
+          'poweroff',
+          'poweroff-hard',
+          'disk-attach',
+          'disk-detach',
+          'nic-attach',
+          'nic-detach',
+          'disk-snapshot-create',
+          'disk-snapshot-delete',
+          'terminate',
+          'terminate-hard',
+          'disk-resize',
+          'deploy',
+          'chown',
+          'chmod',
+          'updateconf',
+          'rename',
+          'resize',
+          'update',
+          'snapshot-resize',
+          'snapshot-delete',
+          'snapshot-revert',
+          'disk-saveas',
+          'disk-snapshot-revert',
+          'recover',
+          'retry',
+          'monitor',
+          'disk-snapshot-rename',
+          'alias-attach',
+          'alias-detach',
+          'poweroff-migrate',
+          'poweroff-hard-migrate',
+          'backup',
+          'nic-update',
+          'backup-cancel',
+          'sched-add',
+          'sched-update',
+          'sched-delete',
+          'sg-attach',
+          'sg-detach',
+          'pci-attach',
+          'pci-detach'
+        ]
 
         EXTERNAL_IP_ATTRS = [
             'GUEST_IP',
@@ -755,7 +817,7 @@ module OpenNebula
         #  will replace the existing ones or delete it if empty. Attributes that
         #  can be updated are: INPUT/{TYPE, BUS}; RAW/{TYPE, DATA, DATA_VMX},
         #  OS/{BOOT, BOOTLOADER, ARCH, MACHINE, KERNEL, INITRD},
-        #  FEATURES/{ACPI, APIC, PAE, LOCALTIME, HYPERV, GUEST_AGENT},
+        #  FEATURES/{ACPI, APIC, PAE, LOCALTIME, HYPERV, GUEST_AGENT, VIRTIO_SCSI_QUEUES, VIRTIO_BLK_QUEUES, IOTHREADS},
         #  GRAPHICS/{TYPE, LISTEN, PASSWD, KEYMAP},
         #  and VIDEO/{TYPE, IOMMU, ATS, VRAM, RESOLUTION}
         # @param append, append template, do not delete empty attributes
@@ -811,6 +873,24 @@ module OpenNebula
             @client.call(VM_METHODS[:backupcancel], @pe_id)
         end
 
+        # Attaches a PCI to a VM
+        #
+        # @param pci [String] Template containing a PCI element
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def pci_attach(pci)
+            call(VM_METHODS[:attachpci], @pe_id, pci)
+        end
+
+        # Detaches a PCI from a VM
+        #
+        # @param pci_id [Integer] Id of the PCI to be detached
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def pci_detach(pci_id)
+            call(VM_METHODS[:detachpci], @pe_id, pci_id)
+        end
+
         ########################################################################
         # Helpers to get VirtualMachine information
         ########################################################################

data/lib/opennebula.rb

@@ -79,5 +79,5 @@ require 'opennebula/backupjob_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.8.0'
+    VERSION = '6.8.2'
 end

data/lib/virtual_machine.rb

@@ -2028,7 +2028,7 @@ end
                 :unitNumber  => unumber
             }
             if @vi_client.vim.serviceContent.about.apiVersion.to_f >= 7.0
-                card_spec[:key] = Time.now.utc.strftime('%m%d%M%S%L').to_i
+                card_spec[:key] = -100 - card_num.to_i
             end
 
             if (limit || rsrv) && (limit > 0)
@@ -2175,7 +2175,7 @@ end
                 :addressType => 'generated'
             }
             if @vi_client.vim.serviceContent.about.apiVersion.to_f >= 7.0
-                card_spec[:key] = Time.now.utc.strftime('%m%d%M%S%L').to_i
+                card_spec[:key] = -100 - card_num.to_i
             end
 
             if (limit || rsrv) && (limit > 0)
@@ -2720,7 +2720,7 @@ end
             img_name = VCenterDriver::FileHelper.unescape_path(img_name_escaped)
 
             vc_disks.each do |d|
-                key_matches  = (unmanaged_key && d[:key] == unmanaged_key.to_i)
+                key_matches  = unmanaged_key && d[:key] == unmanaged_key.to_i
                 path_matches = (d[:path_wo_ds] == img_name)
 
                 if key_matches || path_matches

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.8.0
+  version: 6.8.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbvmomi
+  name: rbvmomi2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="