opennebula 6.2.2 → 6.3.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9492453d246b5d413a5902766bda7526160e953c1e6072d242509ebff8df73bc
-  data.tar.gz: eb349b7f7f2a87b29cbbae06ec35db4131db8baf96e5cbf4cf9875f3815e2db3
+  metadata.gz: cbf5d10fd120f0a5f41abc59d743f38b1080002271e2ecbb131463a0e145cfba
+  data.tar.gz: e3de025f53033170cea9ca52871dd4c0c2ef417d8ca0637b861fe9f495b9d011
 SHA512:
-  metadata.gz: 546bd3075e73b2e73be4abe53dad5af5d27956dbb896182fd828a2794b510b5df71ea615915b82abbba506ff824f31091fb54afee8d8e67b3b50092714a15ffb
-  data.tar.gz: 6476073b7b334c8e746350760a0de9082770f45df57ee3c9db318b72ee9f1c72c86f8626d892e313c4d92387920e367a063878ac24237b017b66fecb7dc3d7fb
+  metadata.gz: d02e4f443085e4e797b09252a9583c7b59255335abcc51a3a50b0f4f82d2007ab17f7fc13df49bfc7214dd92ba68bc07f4282c019807a3237af1cb0675bf07b1
+  data.tar.gz: 86fede32beb5965879433a8808237d17765da216125ef7b312649f6b6707a337fe3783c7cde67aa90cc9feef413c73d69817ff5cb7cee0dec42b3a91f3b5abb9

data/lib/cloud/CloudClient.rb

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

data/lib/datastore.rb

@@ -561,7 +561,7 @@ module VCenterDriver
             rescue StandardError => e
                 message = "Could not find file. Reason: \"#{e.message}\"."
                 if VCenterDriver::CONFIG[:debug_information]
-                    message += ' ' + e.backtrace
+                    message += ' ' + e.backtrace.to_s
                 end
                 raise message
             end

data/lib/file_helper.rb

@@ -98,7 +98,7 @@ module VCenterDriver
         end
 
         def self.get_type(file)
-            type = `file -b --mime-type #{file}`
+            type = `file -P bytes=256 -b --mime-type #{file}`
             if $?.exitstatus != 0 # rubocop:disable Style/SpecialGlobalVars
                 STDERR.puts "Can not read file #{file}"
                 exit(-1)

data/lib/opennebula/marketplaceapp_ext.rb

@@ -186,6 +186,7 @@ module OpenNebula::MarketPlaceAppExt
                 # Created an associated VMTemplate if needed
                 #---------------------------------------------------------------
                 if is_vcenter &&
+                    !options[:notemplate] &&
                     (!options[:template] || options[:template] == -1)
                     tmpl = create_vcenter_template(ds, options, image)
 

data/lib/opennebula/virtual_machine.rb

@@ -54,7 +54,9 @@ module OpenNebula
             :unlock         => "vm.unlock",
             :schedadd       => "vm.schedadd",
             :scheddelete    => "vm.scheddelete",
-            :schedupdate    => "vm.schedupdate"
+            :schedupdate    => "vm.schedupdate",
+            :attachsg       => "vm.attachsg",
+            :detachsg       => "vm.detachsg"
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
@@ -460,6 +462,25 @@ module OpenNebula
             return call(VM_METHODS[:detachnic], @pe_id, nic_id)
         end
 
+        # Attaches a Security Groupt to a running VM
+        #
+        # @param nic_id [Integer] Id of the NIC, where to attach SG
+        # @param sg_id [Integer] Id of the SG to be attached
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def sg_attach(nic_id, sg_id)
+            return call(VM_METHODS[:attachsg], @pe_id, nic_id, sg_id)
+        end
+
+        # Detaches a Security Group from a running VM
+        #
+        # @param sg_id [Integer] Id of the SG to be detached
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def sg_detach(nic_id, sg_id)
+            return call(VM_METHODS[:detachsg], @pe_id, nic_id, sg_id)
+        end
+
         # Sets the re-scheduling flag for the VM
         def resched
             action('resched')

data/lib/opennebula.rb

@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.2.2'
+    VERSION = '6.3.80'
 end

data/lib/vi_helper.rb

@@ -97,7 +97,12 @@ module VCenterDriver
 
         def self.one_item(the_class, id, exit_if_fail = true)
             item = the_class.new_with_id(id, client)
-            rc = item.info
+            rc=nil
+            if the_class == OpenNebula::VirtualMachine
+                rc = item.info(true)
+            else
+                rc = item.info
+            end
             return_if_error(rc, item, exit_if_fail)
         end
 

data/lib/virtual_machine.rb

@@ -1784,6 +1784,8 @@ end
         end
 
         def extraconfig_context
+            one_item.info(true)
+
             context_text = "# Context variables generated by OpenNebula\n"
             one_item.each('TEMPLATE/CONTEXT/*') do |context_element|
                 # next if !context_element.text
@@ -3076,10 +3078,10 @@ end
             @item.ReconfigVM_Task(:spec => vm_config_spec).wait_for_completion
 
             devices.each do |device|
-                next unless first_condition &&
+                valid_device =
+                    device.class == RbVmomi::VIM::VirtualLsiLogicController &&
                     device.key == scsi_key
-
-                controller = device.deviceInfo.label
+                controller = device.deviceInfo.label if valid_device
             end
 
             controller

data/lib/vm_monitor.rb

@@ -275,6 +275,10 @@ module VirtualMachineMonitor
         info_disks.each do |disk|
             next if disk[1].no_exists?
 
+            # disk[0] contains the disk ID in OpenNebula or the disk path if
+            #         there is no corresponding OpenNebula disk
+            # disk[1] contains the vcenter resource corresponding to the VM disk
+
             # Delete special characters
             name = disk[0].gsub(/[^0-9A-Za-z]/, '_')
 

data/lib/vm_template.rb

@@ -408,13 +408,25 @@ module VCenterDriver
                         break
                     end
 
+                    # Read configuration for imported images, taking
+                    # into account if we are importing a VM Tempalte
+                    # or a Wild VM
+                    image_persistency = nil
+                    if vm?
+                        image_persistency = :wild_vm_persistent_images
+                    else
+                        image_persistency = :vm_template_persistent_images
+                    end
+
+                    image_persistency = VCenterDriver::CONFIG[image_persistency]
+
                     params = {
                         :disk => disk,
                         :ipool => ipool,
                         :_type => type,
                         :ds_id => datastore_found['ID'],
                         :opts => {
-                            :persistent => vm? ? 'YES':'NO'
+                            :persistent => image_persistency ? 'YES':'NO'
                         },
                         :images => images
                     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.2.2
+  version: 6.3.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -255,9 +255,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: []
 rubygems_version: 3.1.2
 signing_key: