opennebula 6.1.80.pre → 6.1.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ec17a7a8b4c347550f293bb4db7f82cee1f1daf
-  data.tar.gz: 55f73a012fe7fae60070f37afca0cfab81fad686
+  metadata.gz: 2297734850551fc2c89b8d6bbccd43408724e330
+  data.tar.gz: e7bc524512feaa2dd9215214aa2b273dd6a9f8d5
 SHA512:
-  metadata.gz: 504d1fd56b5b115bf6d6f49b689791eaf238ef75be357dd1debac901e2495fccc43d9cabc9c174e25d307768454254468201643975ee1920f7aafa98d2e26109
-  data.tar.gz: 2b295c38fd943e500cb78890462a0e98f34289646422ce5092080b03ea694d99bd2d0240e6bb0a706854daa9848acb42702bb47a2c4d0156b895f5038e007015
+  metadata.gz: 6df4eefbb624baa5f43f4959d188f43ef1ad36cb25814f76b829480bd26b60946489029d0623727d96881eff87efe9755a823884a7988fe68206d43fe86442af
+  data.tar.gz: 547a06b4424a0f2dfaeec1a2c4c9ac4a5fa8854665338fe34e7ebc9b6cbd0de3682c6ade82b9360fb7e68a9c9bbb2d4fb3a89c05757652e8e98c732951e52447

data/lib/cloud/CloudClient.rb

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

data/lib/models/service.rb

@@ -522,31 +522,40 @@ module OpenNebula
 
         # Check that changes values are correct
         #
-        # @param template_json [String] New template
+        # @param template_json [String]  New template
+        # @param append        [Boolean] True to append template to the current
         #
         # @return [Boolean, String] True, nil if everything is correct
         #                           False, attr if attr was changed
-        def check_new_template(template_json)
+        def check_new_template(template_json, append)
             template = JSON.parse(template_json)
 
-            if template['roles'].size != @roles.size
-                return [false, 'service/roles size']
-            end
+            if append
+                IMMUTABLE_ATTRS.each do |attr|
+                    next if template[attr].nil?
 
-            IMMUTABLE_ATTRS.each do |attr|
-                next if template[attr] == @body[attr]
+                    return [false, "service/#{attr}"]
+                end
+            else
+                if template['roles'].size != @roles.size
+                    return [false, 'service/roles size']
+                end
 
-                return [false, "service/#{attr}"]
-            end
+                IMMUTABLE_ATTRS.each do |attr|
+                    next if template[attr] == @body[attr]
 
-            template['roles'].each do |role|
-                # Role name can't be changed, if it is changed some problems
-                # may appear, as name is used to reference roles
-                return [false, 'name'] unless @roles[role['name']]
+                    return [false, "service/#{attr}"]
+                end
 
-                rc = @roles[role['name']].check_new_template(role)
+                template['roles'].each do |role|
+                    # Role name can't be changed, if it is changed some problems
+                    # may appear, as name is used to reference roles
+                    return [false, 'name'] unless @roles[role['name']]
 
-                return rc unless rc[0]
+                    rc = @roles[role['name']].check_new_template(role)
+
+                    return rc unless rc[0]
+                end
             end
 
             [true, nil]

data/lib/opennebula/flow/service_template.rb

@@ -307,10 +307,18 @@ module OpenNebula
 
             template = JSON.parse(template_json)
 
-            IMMUTABLE_ATTRS.each do |attr|
-                next if template[attr] == @body[attr]
+            if append
+                IMMUTABLE_ATTRS.each do |attr|
+                    unless template[attr].nil?
+                        return [false, "service_template/#{attr}"]
+                    end
+                end
+            else
+                IMMUTABLE_ATTRS.each do |attr|
+                    next if template[attr] == @body[attr]
 
-                return [false, "service_template/#{attr}"]
+                    return [false, "service_template/#{attr}"]
+                end
             end
 
             template = @body.merge(template) if append

data/lib/opennebula/pool.rb

@@ -261,6 +261,8 @@ module OpenNebula
                 size = OpenNebula.pool_page_size if (!size || size == 0)
                 rc   = @client.call(method, @user_id, current, -size, state)
 
+                return rc if OpenNebula.is_error?(rc)
+
                 initialize_xml(rc, @pool_name)
             else
                 rc = info
@@ -276,11 +278,11 @@ module OpenNebula
             page    = OpenNebula::XMLElement.new
 
             loop do
-                page.initialize_xml(get_page(size,
-                                             current,
-                                             extended,
-                                             state),
-                                             @pool_name)
+                rc = get_page(size, current, extended, state)
+
+                break rc if OpenNebula.is_error?(rc)
+
+                page.initialize_xml(rc, @pool_name)
 
                 break if page["//#{element}"].nil?
 

data/lib/opennebula.rb

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

data/lib/vm_template.rb

@@ -40,7 +40,7 @@ module VCenterDriver
         def lock
             return unless @locking
 
-            @locking_file = File.open('/tmp/vcenter-importer-lock', 'w')
+            @locking_file = File.open('/var/tmp/vcenter-importer-lock', 'w')
             @locking_file.flock(File::LOCK_EX)
         end
 
@@ -50,9 +50,9 @@ module VCenterDriver
 
             @locking_file.close
 
-            return unless File.exist?('/tmp/vcenter-importer-lock')
+            return unless File.exist?('/var/tmp/vcenter-importer-lock')
 
-            File.delete('/tmp/vcenter-importer-lock')
+            File.delete('/var/tmp/vcenter-importer-lock')
         end
 
         def vm?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.1.80.pre
+  version: 6.1.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri