opennebula 6.6.1.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d82e15d5ec4c50fc681010bbb3f80be515bb250a074c81f71947af45902e38e
-  data.tar.gz: 8c45829d942be1ea53f9655950f3338fca21d476c15ff772c99d708abb2a4c42
+  metadata.gz: d0911e0ad571781c4b94ee39d8459948d92ef8eb0d95aa9e06387bf402d2abd9
+  data.tar.gz: 98c66b223bdf54a82a8d4524288067b9b41045781ff90d4828328db18066d67f
 SHA512:
-  metadata.gz: 98d4c469ae9bd579ab84a68f0126d9ea998a4656e9fa3d20c6854db47ef0f224abd0f9820aa227f075dfb8a9877ce520907e6a248825560e053e26d878fd17be
-  data.tar.gz: 8a745dc0a6e307140d661d23d22e3e1608cb6d14c07454367c61ceeba7f965bef1c2ea3bd1af2c0fab67106270312f511af455cf934dea3eea9bb3fae6d70849
+  metadata.gz: 9fc7ce19570b9ee1c5b3047e4d0503bd7028b4cee025fd37b8c42526fbe440fb0398ca2c9ba7a803e524e4fd9415f54c971e6be8aaa16a3513df91677cb1f557
+  data.tar.gz: 6e39b6567ce933244ddcedb2700abb82e002ccf3ed6199b78cccd064330fd93e7774d44defa7d6901b6a9d08ffd0abc798cd17f1706088f24897d7efcaaaeef5

data/lib/VirtualMachineDriver.rb

@@ -55,7 +55,8 @@ class VirtualMachineDriver < OpenNebulaDriver
         :update_conf => "UPDATECONF",
         :resize      => "RESIZE",
         :backup      => "BACKUP",
-        :update_nic   => "UPDATENIC"
+        :update_nic   => "UPDATENIC",
+        :backup_cancel=> "BACKUPCANCEL"
     }
 
     POLL_ATTRIBUTE = OpenNebula::VirtualMachine::Driver::POLL_ATTRIBUTE
@@ -104,6 +105,7 @@ class VirtualMachineDriver < OpenNebulaDriver
         register_action(ACTION[:resize].to_sym, method("resize"))
         register_action(ACTION[:backup].to_sym, method("backup"))
         register_action(ACTION[:update_nic].to_sym, method("update_nic"))
+        register_action(ACTION[:backup_cancel].to_sym, method("backup_cancel"))
     end
 
     # Decodes the encoded XML driver message received from the core
@@ -248,6 +250,11 @@ class VirtualMachineDriver < OpenNebulaDriver
         send_message(ACTION[:update_nic],RESULT[:failure],id,error)
     end
 
+    def backup_cancel(id, drv_message)
+        error = "Action not implemented by driver #{self.class}"
+        send_message(ACTION[:backup_cancel],RESULT[:failure],id,error)
+    end
+
 private
 
     # Interface to handle the pending events from the ActionManager Interface

data/lib/cloud/CloudClient.rb

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

data/lib/models/service.rb

@@ -323,6 +323,9 @@ module OpenNebula
 
             template['start_time'] = Integer(Time.now)
 
+            # Replace $attibute by the corresponding value
+            resolve_attributes(template)
+
             super(template.to_json, template['name'])
         end
 
@@ -660,7 +663,7 @@ module OpenNebula
             end if deploy
 
             # Replace $attibute by the corresponding value
-            resolve_attributes(body)
+            resolve_networks(body)
 
             # @body = template.to_hash
 
@@ -784,31 +787,49 @@ module OpenNebula
         end
 
         # rubocop:disable Layout/LineLength
+        def resolve_networks(template)
+            template['roles'].each do |role|
+                next unless role['vm_template_contents']
+
+                # $CUSTOM1_VAR Any word character
+                # (letter, number, underscore)
+                role['vm_template_contents'].scan(/\$(\w+)/).each do |key|
+                    net = template['networks_values'].find {|att| att.key? key[0] }
+
+                    next if net.nil?
+
+                    role['vm_template_contents'].gsub!(
+                        '$'+key[0],
+                        net[net.keys[0]]['id'].to_s
+                    )
+                end
+            end
+        end
+
         def resolve_attributes(template)
             template['roles'].each do |role|
                 if role['vm_template_contents']
                     # $CUSTOM1_VAR Any word character
                     # (letter, number, underscore)
                     role['vm_template_contents'].scan(/\$(\w+)/).each do |key|
-                        # Check if $ var value is in custom_attrs_values
-                        if !template['custom_attrs_values'].nil? &&
-                           template['custom_attrs_values'].key?(key[0])
+                        # Check if $ var value is in custom_attrs_values within the role
+                        if !role['custom_attrs_values'].nil? && \
+                            role['custom_attrs_values'].key?(key[0])
                             role['vm_template_contents'].gsub!(
                                 '$'+key[0],
-                                template['custom_attrs_values'][key[0]]
+                                role['custom_attrs_values'][key[0]]
                             )
                             next
                         end
 
-                        # Check if $ var value is in networks
-                        net = template['networks_values']
-                              .find {|att| att.key? key[0] }
+                        # Check if $ var value is in custom_attrs_values
 
-                        next if net.nil?
+                        next unless !template['custom_attrs_values'].nil? && \
+                                     template['custom_attrs_values'].key?(key[0])
 
                         role['vm_template_contents'].gsub!(
                             '$'+key[0],
-                            net[net.keys[0]]['id'].to_s
+                            template['custom_attrs_values'][key[0]]
                         )
                     end
                 end

data/lib/opennebula/flow/service_template.rb

@@ -42,6 +42,16 @@ module OpenNebula
                     :type => :string,
                     :required => false
                 },
+                'custom_attrs' => {
+                    :type => :object,
+                    :properties => {},
+                    :required => false
+                },
+                'custom_attrs_values' => {
+                    :type => :object,
+                    :properties => {},
+                    :required => false
+                },
                 'parents' => {
                     :type => :array,
                     :items => {
@@ -487,7 +497,7 @@ module OpenNebula
                 instantiate_template = JSON.parse(@body.to_json)
             else
                 instantiate_template = JSON.parse(@body.to_json)
-                                           .merge(merge_template)
+                                           .deep_merge(merge_template)
             end
 
             begin

data/lib/opennebula/virtual_machine.rb

@@ -58,7 +58,8 @@ module OpenNebula
             :attachsg       => "vm.attachsg",
             :detachsg       => "vm.detachsg",
             :backup         => "vm.backup",
-            :updatenic      => "vm.updatenic"
+            :updatenic      => "vm.updatenic",
+            :backupcancel   => "vm.backupcancel"
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
@@ -807,6 +808,14 @@ module OpenNebula
             return @client.call(VM_METHODS[:backup], @pe_id, ds_id, reset)
         end
 
+        # Cancel ongoing backup operation for the VM
+        #
+        # @return [nil, OpenNebula::Error] nil in case of sucess, Error
+        #  otherwise.
+        def backup_cancel()
+            return @client.call(VM_METHODS[:backupcancel], @pe_id)
+        end
+
         ########################################################################
         # Helpers to get VirtualMachine information
         ########################################################################

data/lib/opennebula.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.6.1.1
+  version: 6.6.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri