opennebula 6.8.3 → 6.9.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e16a4dc8d312bf0f7363eb17802682cb72bae5fc5ffad65258d520306dfb97c
-  data.tar.gz: c9d4605aad6a1d5d2d2600b9b0919994496942789d65c4868b6e40ccb020307e
+  metadata.gz: 5cf888b9c95db4f557149408182752fb7de455cd59b3f5300b2401dcb9291852
+  data.tar.gz: 02fa72864a8859c132397c2a7d08e5dd831ff5be9743da486f0d782ae8e166b4
 SHA512:
-  metadata.gz: 49c4496d1a48dd35a7938f4dd9bf28c1edd75e200f2185d35f853c7db6d2a54fd5df874571248aff294ff4b9bb9b232aef6b752b1002cf3bdb7e337f6c292cd2
-  data.tar.gz: 268322ae279f3af5bf9e3681ead11d1553918b767ab20f68ad0c0b8ddfcf5223e1fe565b74baf4f804dac0a8e45b681dedc0454a6580eed7dd1b6328cca23786
+  metadata.gz: fa192365155396fe0719ef58c97ca01b94f06f0f6bd8d8fb8c87f70b69f85d7cc3b4abe1d2d4c39c63a5419d67351b25d1f0bfa6caf0bce3f09c76e720afa2f1
+  data.tar.gz: cc2141821c1dc205c592f2e7d8f9200ab1b963713b83580350b22f9c551fe3ba7d8cbd670fb174b6211c83529ed064ce6bcf4356a2e1a6c47ef815d8bc17a6ba

data/lib/cloud/CloudClient.rb

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

data/lib/models/role.rb

@@ -839,7 +839,11 @@ module OpenNebula
 
             rc = deploy
 
-            deployed_nodes.concat(rc[0]) if rc[1].nil?
+            unless rc[0]
+                return [false, "Error deploying nodes for role `#{name}`"]
+            end
+
+            deployed_nodes.concat(rc[0])
 
             deployed_nodes
         end

data/lib/models/service.rb

@@ -298,7 +298,7 @@ module OpenNebula
 
             @body['networks_values'].each do |vnet|
                 vnet.each do |_, net|
-                    next if net.keys.first == 'id' && !deploy
+                    next if net.key?('id') && !deploy
 
                     ret << net['id'].to_i
                 end
@@ -635,24 +635,21 @@ module OpenNebula
         end
 
         def deploy_networks(deploy = true)
-            if deploy
-                body = JSON.parse(self['TEMPLATE/BODY'])
-            else
-                body = @body
-            end
+            body = if deploy
+                       JSON.parse(self['TEMPLATE/BODY'])
+                   else
+                       @body
+                   end
 
             return if body['networks_values'].nil?
 
             body['networks_values'].each do |vnet|
                 vnet.each do |name, net|
-                    key = net.keys.first
+                    next if net.key?('id')
 
-                    case key
-                    when 'id'
-                        next
-                    when 'template_id'
+                    if net.key?('template_id')
                         rc = create_vnet(name, net)
-                    when 'reserve_from'
+                    elsif net.key?('reserve_from')
                         rc = reserve(name, net)
                     end
 
@@ -678,18 +675,14 @@ module OpenNebula
 
             vnets.each do |vnet|
                 vnet.each do |_, net|
-                    key = net.keys.first
-
-                    next unless ['template_id', 'reserve_from'].include?(key)
+                    next unless net.key?('template_id') || net.key?('reserve_from')
 
                     rc = OpenNebula::VirtualNetwork.new_with_id(
                         net['id'],
                         @client
                     ).delete
 
-                    next unless OpenNebula.is_error?(rc)
-
-                    vnets_failed << net['id']
+                    vnets_failed << net['id'] if OpenNebula.is_error?(rc)
                 end
             end
 
@@ -798,10 +791,7 @@ module OpenNebula
 
                     next if net.nil?
 
-                    role['vm_template_contents'].gsub!(
-                        '$'+key[0],
-                        net[net.keys[0]]['id'].to_s
-                    )
+                    role['vm_template_contents'].gsub!("$#{key[0]}", net[key[0]]['id'].to_s)
                 end
             end
         end

data/lib/opennebula/flow/service_template.rb

@@ -31,7 +31,7 @@ module OpenNebula
                 },
                 'cardinality' => {
                     :type => :integer,
-                    :default => 1,
+                    :default => 0,
                     :minimum => 0
                 },
                 'vm_template' => {

data/lib/opennebula/marketplaceapp_ext.rb

@@ -93,7 +93,6 @@ module OpenNebula::MarketPlaceAppExt
             # Exports an OpenNebula Image from this marketplace app
             #   @param options to export the image
             #     :vmtemplate_name [String] name of new image and template
-            #     :url_args [String] optional URL arguments
             #     :dsid [String] Datastore id to create the image
             #     :f_dsid [String] Files Datastore id
             #     :notemplate [Bool] if true do not create vm_template (if any)
@@ -126,10 +125,6 @@ module OpenNebula::MarketPlaceAppExt
                 FROM_APP = "#{self['ID']}"
                 EOT
 
-                if options[:url_args]
-                    tmpl << "URL_ARGS=\"#{options[:url_args]}\"\n"
-                end
-
                 #---------------------------------------------------------------
                 # Kernel or context images stored in a files datastore
                 #---------------------------------------------------------------

data/lib/opennebula/virtual_machine.rb

@@ -63,7 +63,8 @@ module OpenNebula
             :updatenic      => 'vm.updatenic',
             :backupcancel   => 'vm.backupcancel',
             :attachpci      => 'vm.attachpci',
-            :detachpci      => 'vm.detachpci'
+            :detachpci      => 'vm.detachpci',
+            :restore        => 'vm.restore'
         }
 
         VM_STATE=['INIT', 'PENDING', 'HOLD', 'ACTIVE', 'STOPPED', 'SUSPENDED', 'DONE', 'FAILED',
@@ -140,7 +141,8 @@ module OpenNebula
             'HOTPLUG_SAVEAS_UNDEPLOYED',
             'HOTPLUG_SAVEAS_STOPPED',
             'BACKUP',
-            'BACKUP_POWEROFF'
+            'BACKUP_POWEROFF',
+            'RESTORE'
         ]
 
         SHORT_VM_STATES={
@@ -227,7 +229,8 @@ module OpenNebula
             'HOTPLUG_SAVEAS_UNDEPLOYED'  => 'hotp',
             'HOTPLUG_SAVEAS_STOPPED'     => 'hotp',
             'BACKUP'            => 'back',
-            'BACKUP_POWEROFF'   => 'back'
+            'BACKUP_POWEROFF'   => 'back',
+            'RESTORE'           => 'rest'
         }
 
         HISTORY_ACTION=[
@@ -290,7 +293,8 @@ module OpenNebula
           'sg-attach',
           'sg-detach',
           'pci-attach',
-          'pci-detach'
+          'pci-detach',
+          'restore'
         ]
 
         EXTERNAL_IP_ATTRS = [
@@ -891,6 +895,14 @@ module OpenNebula
             call(VM_METHODS[:detachpci], @pe_id, pci_id)
         end
 
+        # Restore the VM from backup Image
+        #
+        # @return [nil, OpenNebula::Error] nil in case of sucess, Error
+        #  otherwise.
+        def restore(img_id, inc_id, disk_id)
+            @client.call(VM_METHODS[:restore], @pe_id, img_id, inc_id, disk_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.3'
+    VERSION = '6.9.80'
 end

data/lib/scripts_common.rb

@@ -104,9 +104,6 @@ module OpenNebula
         file_name = 'monitord.conf'
 
         begin
-            # Suppress augeas require warning message
-            $VERBOSE = nil
-
             require 'augeas'
 
             aug = Augeas.create(:no_modl_autoload => true,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.8.3
+  version: 6.9.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -258,11 +258,11 @@ 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
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: OpenNebula Client API