opennebula 6.10.2 → 6.99.85.pre

data/lib/opennebula/user_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/utils.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -59,7 +59,7 @@ module OpenNebula
                     "\t#{ex.backtrace.join("\n\t")}" +
                     "\n*******************************\n")
 
-        OpenNebula.error_message("There is a problem: #{ex.message}")
+        OpenNebula::DriverLogger.report("There is a problem: #{ex.message}")
         exit (-1)
     end
 

data/lib/opennebula/vdc.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vdc_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/virtual_machine.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -297,15 +297,6 @@ module OpenNebula
           'restore'
         ]
 
-        EXTERNAL_IP_ATTRS = [
-            'GUEST_IP',
-            'AWS_IP_ADDRESS',
-            'AWS_PUBLIC_IP_ADDRESS',
-            'AWS_PRIVATE_IP_ADDRESS',
-            'AZ_IPADDRESS',
-            'SL_PRIMARYIPADDRESS'
-        ]
-
         # VirtualMachineDriver constants
         module Driver
 
@@ -863,8 +854,8 @@ module OpenNebula
         # Generate a backup for the VM (backup config must be set)
         #
         # @param ds_id  [Integer] Id of the datastore to save the backup
-        # @return [Integer, OpenNebula::Error] ID of the resulting BACKUP image
-        # in case of success, Error otherwise.
+        # @return [Integer, OpenNebula::Error] ID of the VM in case of success,
+        #   Error otherwise.
         def backup(ds_id = -1, reset = false)
             @client.call(VM_METHODS[:backup], @pe_id, ds_id, reset)
         end

data/lib/opennebula/virtual_machine_ext.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -51,12 +51,13 @@ module OpenNebula::VirtualMachineExt
                                  'NETWORK_ID', 'VN_MAD', 'SECURITY_GROUPS', 'VLAN_ID',
                                  'BRIDGE_TYPE']
 
-            REMOVE_IMAGE_ATTRS = ['DEV_PREFIX', 'SOURCE', 'ORIGINAL_SIZE', 'SIZE',
-                                  'DISK_SNAPSHOT_TOTAL_SIZE', 'DRIVER', 'IMAGE_STATE', 'SAVE',
+            REMOVE_IMAGE_ATTRS = ['DEV_PREFIX', 'SOURCE', 'DRIVER', 'FORMAT', 'ORIGINAL_SIZE',
+                                  'DISK_SNAPSHOT_TOTAL_SIZE', 'IMAGE_STATE', 'SAVE',
                                   'CLONE', 'READONLY', 'PERSISTENT', 'TARGET', 'ALLOW_ORPHANS',
                                   'CLONE_TARGET', 'CLUSTER_ID', 'DATASTORE', 'DATASTORE_ID',
                                   'DISK_ID', 'DISK_TYPE', 'IMAGE_ID', 'IMAGE', 'IMAGE_UNAME',
-                                  'IMAGE_UID', 'LN_TARGET', 'TM_MAD', 'TYPE', 'OPENNEBULA_MANAGED']
+                                  'IMAGE_UID', 'LN_TARGET', 'TM_MAD', 'TM_MAD_SYSTEM',
+                                  'OPENNEBULA_MANAGED', 'PERSISTENT_SNAPSHOTS']
 
             def save_as_template(name, desc, opts = {})
                 opts = {
@@ -93,35 +94,6 @@ module OpenNebula::VirtualMachineExt
                     raise rc.message if OpenNebula.is_error?(rc)
                 end
 
-                # --------------------------------------------------------------
-                # Ask if source VM is linked clone
-                # --------------------------------------------------------------
-                use_linked_clones = self['USER_TEMPLATE/VCENTER_LINKED_CLONES']
-
-                if use_linked_clones && use_linked_clones.downcase == 'yes'
-                    # Delay the require until it is strictly needed
-                    # This way we can avoid the vcenter driver dependency
-                    # in no vCenter deployments
-                    require 'vcenter_driver'
-
-                    deploy_id = self['DEPLOY_ID']
-                    vm_id = self['ID']
-                    host_id = self['HISTORY_RECORDS/HISTORY[last()]/HID']
-                    vi_client = VCenterDriver::VIClient.new_from_host(host_id)
-
-                    vm = VCenterDriver::VirtualMachine.new(
-                        vi_client,
-                        deploy_id,
-                        vm_id
-                    )
-
-                    error, vm_template_ref = vm.save_as_linked_clones(name)
-
-                    raise error unless error.nil?
-
-                    return vm_template_ref
-                end
-
                 # --------------------------------------------------------------
                 # Clone the source template
                 # --------------------------------------------------------------
@@ -171,17 +143,17 @@ module OpenNebula::VirtualMachineExt
                     if !valid?(image_id)
                         logger.info 'Adding volatile disk' if logger
 
-                        disk_str = template_like_str(
-                            'TEMPLATE',
-                            true,
-                            "DISK [ DISK_ID = #{disk_id} ]"
-                        )
+                        disk_str = disk.template_like_str('.').tr("\n", ",\n")
 
-                        replace << "#{disk_str}\n"
+                        replace << "DISK = [ #{disk_str} ]\n"
 
                         next
                     end
 
+                    # SIZE, TYPE is important for volatile disk, remove them now
+                    disk.delete_element('SIZE')
+                    disk.delete_element('TYPE')
+
                     # CDROM disk, copy definition
                     if type == 'CDROM'
                         logger.info 'Adding CDROM disk' if logger
@@ -272,7 +244,7 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Rollback. Delete the template and the images created
                 # --------------------------------------------------------------
-                if ntid
+                if ntid && !OpenNebula.is_error?(ntid)
                     ntmpl = OpenNebula::Template.new_with_id(ntid, @client)
                     ntmpl.delete
                 end

data/lib/opennebula/virtual_machine_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/virtual_network.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/virtual_network_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/virtual_router.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/virtual_router_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vm_group.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vm_group_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vntemplate.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vntemplate_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/wait_ext.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/x509_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/xml_element.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -90,7 +90,7 @@ module OpenNebula
             else
                 element=@xml.elements[key.to_s]
 
-                return "" if element && !element.has_text?
+                return '' if element && !element.has_text?
             end
 
             element.text if element
@@ -294,6 +294,8 @@ module OpenNebula
         end
 
         # Returns elements in text form
+        # Known bug: For some older versions of REXML, the xpath expression
+        #            returns more nodes than expected
         # root_element:: _String_ base element
         # indent:: _Boolean_ indents the resulting string, default true
         # xpath_exp:: _String_ filter elements with a XPath

data/lib/opennebula/xml_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/xml_utils.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/zone.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/zone_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2024, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2025, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -79,5 +79,5 @@ require 'opennebula/backupjob_pool'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.10.2'
+    VERSION = '6.99.85'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.10.2
+  version: 6.99.85.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-17 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbvmomi2
-  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
@@ -116,42 +102,12 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - NOTICE
-- lib/ActionManager.rb
-- lib/CommandManager.rb
-- lib/DriverExecHelper.rb
-- lib/HostSyncManager.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/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
-- lib/nsxt_dfw.rb
-- lib/nsxt_logical_port.rb
-- lib/nsxt_rule.rb
-- lib/nsxt_tz.rb
-- lib/nsxv_client.rb
-- lib/nsxv_dfw.rb
-- lib/nsxv_logical_port.rb
-- lib/nsxv_rule.rb
-- lib/nsxv_tz.rb
-- lib/opaque_network.rb
+- lib/models/vmrole.rb
+- lib/models/vrrole.rb
 - lib/opennebula.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
@@ -226,23 +182,6 @@ files:
 - lib/opennebula/xml_utils.rb
 - lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
-- 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
@@ -258,9 +197,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.3.5
 signing_key: