opennebula 6.1.80.pre → 6.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3ec17a7a8b4c347550f293bb4db7f82cee1f1daf
-  data.tar.gz: 55f73a012fe7fae60070f37afca0cfab81fad686
+SHA256:
+  metadata.gz: 386d417b0331ab8ad16270e5ae78b27efc0a319a45dc3cbad2805c6eef0f638b
+  data.tar.gz: d27b0d68fdb8382d94b5b5dcd6d1139214147783e146496014edaa7c9b870f08
 SHA512:
-  metadata.gz: 504d1fd56b5b115bf6d6f49b689791eaf238ef75be357dd1debac901e2495fccc43d9cabc9c174e25d307768454254468201643975ee1920f7aafa98d2e26109
-  data.tar.gz: 2b295c38fd943e500cb78890462a0e98f34289646422ce5092080b03ea694d99bd2d0240e6bb0a706854daa9848acb42702bb47a2c4d0156b895f5038e007015
+  metadata.gz: 177d4446ad29cdcf12b7485010909ba6954155cfe83a9948c6fd0673fe2c260470b41c512b279872212355bb3435c74a1762bc8ea39c028623b809df0cf83167
+  data.tar.gz: 7ba61e9e6c83aaeffc1f62e772be95028f8dba3bf7000397f8cf27d322fef9cee4c9c745d81d80c6763df336609b9aeebfbf23c5003507559726cef432f6a7d7

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.1.80'
+    VERSION = '6.2.0.1'
 
     # #########################################################################
     # 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.2.0.1'
 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,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.1.80.pre
+  version: 6.2.0.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: xmlrpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Libraries needed to talk to OpenNebula
@@ -114,34 +114,30 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/opennebula.rb
-- lib/vcenter_driver.rb
+- LICENSE
+- NOTICE
+- lib/ActionManager.rb
+- lib/CommandManager.rb
+- lib/DriverExecHelper.rb
+- lib/OpenNebulaDriver.rb
+- lib/VirtualMachineDriver.rb
+- lib/cloud/CloudClient.rb
 - lib/datacenter.rb
 - lib/datastore.rb
+- lib/distributed_firewall.rb
 - lib/file_helper.rb
 - lib/host.rb
-- lib/memoize.rb
-- lib/network.rb
-- lib/rest_client.rb
-- lib/vcenter_importer.rb
-- lib/vi_client.rb
-- lib/vi_helper.rb
-- lib/virtual_machine.rb
-- lib/vm_device.rb
-- lib/vm_disk.rb
-- lib/vm_nic.rb
-- lib/vm_helper.rb
-- lib/vm_monitor.rb
-- lib/vm_folder.rb
-- lib/vm_template.rb
-- lib/vmm_importer.rb
-- lib/nsx_driver.rb
-- lib/distributed_firewall.rb
 - lib/logical_port.rb
 - lib/logical_switch.rb
+- lib/memoize.rb
+- lib/models.rb
+- lib/models/role.rb
+- lib/models/service.rb
+- lib/network.rb
 - lib/nsx_client.rb
 - lib/nsx_component.rb
 - lib/nsx_constants.rb
+- lib/nsx_driver.rb
 - lib/nsx_error.rb
 - lib/nsx_rule.rb
 - lib/nsxt_client.rb
@@ -155,17 +151,7 @@ files:
 - lib/nsxv_rule.rb
 - lib/nsxv_tz.rb
 - lib/opaque_network.rb
-- lib/transport_zone.rb
-- lib/virtual_wire.rb
-- lib/VirtualMachineDriver.rb
-- lib/OpenNebulaDriver.rb
-- lib/CommandManager.rb
-- lib/ActionManager.rb
-- lib/DriverExecHelper.rb
-- lib/scripts_common.rb
-- lib/models.rb
-- lib/models/role.rb
-- lib/models/service.rb
+- lib/opennebula.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
 - lib/opennebula/client.rb
@@ -179,6 +165,12 @@ files:
 - lib/opennebula/document_pool_json.rb
 - lib/opennebula/error.rb
 - lib/opennebula/flow.rb
+- lib/opennebula/flow/grammar.rb
+- lib/opennebula/flow/service_pool.rb
+- lib/opennebula/flow/service_template.rb
+- lib/opennebula/flow/service_template_ext.rb
+- lib/opennebula/flow/service_template_pool.rb
+- lib/opennebula/flow/validator.rb
 - lib/opennebula/group.rb
 - lib/opennebula/group_pool.rb
 - lib/opennebula/hook.rb
@@ -188,6 +180,8 @@ files:
 - lib/opennebula/host_pool.rb
 - lib/opennebula/image.rb
 - lib/opennebula/image_pool.rb
+- lib/opennebula/ldap_auth.rb
+- lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/lockable_ext.rb
 - lib/opennebula/marketplace.rb
 - lib/opennebula/marketplace_pool.rb
@@ -199,6 +193,9 @@ files:
 - lib/opennebula/pool_element.rb
 - lib/opennebula/security_group.rb
 - lib/opennebula/security_group_pool.rb
+- lib/opennebula/server_cipher_auth.rb
+- lib/opennebula/server_x509_auth.rb
+- lib/opennebula/ssh_auth.rb
 - lib/opennebula/system.rb
 - lib/opennebula/template.rb
 - lib/opennebula/template_ext.rb
@@ -220,26 +217,29 @@ files:
 - lib/opennebula/vntemplate.rb
 - lib/opennebula/vntemplate_pool.rb
 - lib/opennebula/wait_ext.rb
+- lib/opennebula/x509_auth.rb
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
 - lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
-- lib/opennebula/flow/grammar.rb
-- lib/opennebula/flow/service_pool.rb
-- lib/opennebula/flow/service_template.rb
-- lib/opennebula/flow/service_template_ext.rb
-- lib/opennebula/flow/service_template_pool.rb
-- lib/opennebula/flow/validator.rb
-- lib/opennebula/ldap_auth.rb
-- lib/opennebula/ldap_auth_spec.rb
-- lib/opennebula/server_cipher_auth.rb
-- lib/opennebula/server_x509_auth.rb
-- lib/opennebula/ssh_auth.rb
-- lib/opennebula/x509_auth.rb
-- lib/cloud/CloudClient.rb
-- NOTICE
-- LICENSE
+- lib/rest_client.rb
+- lib/scripts_common.rb
+- lib/transport_zone.rb
+- lib/vcenter_driver.rb
+- lib/vcenter_importer.rb
+- lib/vi_client.rb
+- lib/vi_helper.rb
+- lib/virtual_machine.rb
+- lib/virtual_wire.rb
+- lib/vm_device.rb
+- lib/vm_disk.rb
+- lib/vm_folder.rb
+- lib/vm_helper.rb
+- lib/vm_monitor.rb
+- lib/vm_nic.rb
+- lib/vm_template.rb
+- lib/vmm_importer.rb
 homepage: http://opennebula.io
 licenses:
 - Apache-2.0
@@ -250,17 +250,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: OpenNebula Client API