opennebula 6.4.4 → 6.5.80.pre

data/lib/opennebula/virtual_machine_ext.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -47,16 +47,17 @@ module OpenNebula::VirtualMachineExt
             # @return [Integer, OpenNebula::Error] the new Template ID in case
             #   of success, error otherwise
             #-------------------------------------------------------------------
-            REMOVE_VNET_ATTRS = ['AR_ID', 'BRIDGE', 'CLUSTER_ID', 'IP', 'MAC', 'TARGET', 'NIC_ID',
-                                 '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',
-                                  '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']
+            REMOVE_VNET_ATTRS = %w[AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID
+                                   NETWORK_ID VN_MAD SECURITY_GROUPS VLAN_ID
+                                   BRIDGE_TYPE]
+
+            REMOVE_IMAGE_ATTRS = %w[DEV_PREFIX SOURCE ORIGINAL_SIZE SIZE
+                                    DISK_SNAPSHOT_TOTAL_SIZE DRIVER 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]
 
             def save_as_template(name, desc, opts = {})
                 opts = {
@@ -285,160 +286,6 @@ module OpenNebula::VirtualMachineExt
                 raise
             end
 
-            #-------------------------------------------------------------------
-            #  Backups a VM. TODO Add final description
-            #  @param keep [Bool]
-            #  @param logger[Logger]
-            #  @param binfo[Hash] Oneshot
-            #-------------------------------------------------------------------
-            def backup(keep = false, logger = nil, binfo = nil)
-                # --------------------------------------------------------------
-                # Check backup consistency
-                # --------------------------------------------------------------
-                rc = info
-
-                raise rc.message if OpenNebula.is_error?(rc)
-
-                binfo.merge!(backup_info) do |_key, old_val, new_val|
-                    new_val.nil? ? old_val : new_val
-                end
-
-                raise 'No backup information' if binfo.nil?
-
-                raise 'No frequency defined' unless valid?(binfo[:freq])
-
-                raise 'No marketplace defined' unless valid?(binfo[:market])
-
-                return if Time.now.to_i - binfo[:last].to_i < binfo[:freq].to_i
-
-                # --------------------------------------------------------------
-                # Save VM as new template
-                # --------------------------------------------------------------
-                logger.info 'Saving VM as template' if logger
-
-                tid = save_as_template(
-                    binfo[:name], '', :poweroff => true, :logger => logger
-                )
-
-                tmp = OpenNebula::Template.new_with_id(tid, @client)
-                rc  = tmp.info
-
-                raise rc.message if OpenNebula.is_error?(rc)
-
-                # --------------------------------------------------------------
-                # Import template into Marketplace & update VM info
-                # --------------------------------------------------------------
-                logger.info "Importing template #{tmp.id} to marketplace "\
-                    "#{binfo[:market]}" if logger
-
-                tmp.extend(OpenNebula::TemplateExt)
-
-                rc, ids = tmp.mp_import(binfo[:market], true, binfo[:name],
-                                        :wait => true, :logger => logger)
-
-                raise rc.message if OpenNebula.is_error?(rc)
-
-                logger.info "Imported app ids: #{ids.join(',')}" if logger
-
-                rc = update(backup_attr(binfo, ids), true)
-
-                if OpenNebula.is_error?(rc)
-                    raise 'Could not update the backup reference: ' \
-                      " #{rc.message}. New backup ids are #{ids.join(',')}."
-                end
-
-                # --------------------------------------------------------------
-                # Cleanup
-                # --------------------------------------------------------------
-                backup_cleanup(keep, logger, binfo, tmp)
-            rescue Error, StandardError => e
-                backup_cleanup(keep, logger, binfo, tmp)
-
-                logger.fatal(e.inspect) if logger
-
-                raise
-            end
-
-            #-------------------------------------------------------------------
-            # Restores VM information from previous backup
-            #
-            # @param datastore [Integer] Datastore ID to import app backup
-            # @param logger    [Logger]  Logger instance to print debug info
-            #
-            # @return [Integer] VM ID
-            #-------------------------------------------------------------------
-            def restore(datastore, logger = nil)
-                rc = info
-
-                if OpenNebula.is_error?(rc)
-                    raise "Error getting VM: #{rc.message}"
-                end
-
-                logger.info 'Reading backup information' if logger
-
-                backup_ids = backup_info[:apps]
-
-                # highest (=last) of the app ids is the template id
-                app_id = backup_ids.last
-
-                app = OpenNebula::MarketPlaceApp.new_with_id(app_id, @client)
-                rc  = app.info
-
-                if OpenNebula.is_error?(rc)
-                    raise "Can not find appliance #{app_id}: #{rc.message}."
-                end
-
-                if logger
-                    logger.info "Restoring VM #{self['ID']} from " \
-                                "saved appliance #{app_id}"
-                end
-
-                app.extend(OpenNebula::MarketPlaceAppExt)
-
-                exp = app.export(:dsid => Integer(datastore),
-                                 :name => "#{self['NAME']} - RESTORED")
-
-                if OpenNebula.is_error?(exp)
-                    raise "Can not restore app: #{exp.message}."
-                end
-
-                # Check possible errors when exporting apps
-                exp[:image].each do |image|
-                    next unless OpenNebula.is_error?(image)
-
-                    raise "Error restoring image: #{image.message}."
-                end
-
-                template = exp[:vmtemplate].first
-
-                if OpenNebula.is_error?(template)
-                    raise "Error restoring template: #{template.message}."
-                end
-
-                if logger
-                    logger.info(
-                        "Backup restored, VM template: #{exp[:vmtemplate]}, " \
-                        "images: #{exp[:image]}"
-                    )
-
-                    logger.info(
-                        "Instantiating the template #{exp[:vmtemplate]}"
-                    )
-                end
-
-                tmpl = OpenNebula::Template.new_with_id(template, @client)
-                rc   = tmpl.instantiate
-
-                if OpenNebula.is_error?(rc)
-                    raise "Can not instantiate the template: #{rc.message}."
-                end
-
-                rc
-            rescue Error, StandardError => e
-                logger.fatal(e.inspect) if logger
-                raise
-            end
-
             ####################################################################
             # Private extended interface
             ####################################################################
@@ -456,58 +303,6 @@ module OpenNebula::VirtualMachineExt
                 !att.nil?
             end
 
-            #-------------------------------------------------------------------
-            #  Get backup information from the VM
-            #-------------------------------------------------------------------
-            def backup_info
-                base  = '//USER_TEMPLATE/BACKUP'
-                binfo = {}
-
-                app_ids = self["#{base}/MARKETPLACE_APP_IDS"] || ''
-
-                binfo[:name] = "#{self['NAME']} - BACKUP " \
-                               " - #{Time.now.strftime('%Y%m%d_%k%M')}"
-
-                binfo[:freq]   = self["#{base}/FREQUENCY_SECONDS"]
-                binfo[:last]   = self["#{base}/LAST_BACKUP_TIME"]
-                binfo[:market] = Integer(self["#{base}/MARKETPLACE_ID"])
-                binfo[:apps]   = app_ids.split(',')
-
-                binfo
-            rescue StandardError
-                binfo
-            end
-
-            #-------------------------------------------------------------------
-            # Generate backup information string
-            #-------------------------------------------------------------------
-            def backup_attr(binfo, ids)
-                'BACKUP=[' \
-                "  MARKETPLACE_APP_IDS = \"#{ids.join(',')}\"," \
-                "  FREQUENCY_SECONDS   = \"#{binfo[:freq]}\"," \
-                "  LAST_BACKUP_TIME    = \"#{Time.now.to_i}\"," \
-                "  MARKETPLACE_ID      = \"#{binfo[:market]}\" ]"
-            end
-
-            #-------------------------------------------------------------------
-            # Cleanup backup leftovers in case of failure
-            #-------------------------------------------------------------------
-            def backup_cleanup(keep, logger, binfo, template)
-                if template
-                    logger.info "Deleting template #{template.id}" if logger
-
-                    template.delete(true)
-                end
-
-                binfo[:apps].each do |id|
-                    logger.info "Deleting appliance #{id}" if logger
-
-                    papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
-
-                    papp.delete
-                end if !keep && binfo[:apps]
-            end
-
         end
     end
 

data/lib/opennebula/virtual_machine_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -44,7 +44,7 @@ module OpenNebula
             :recover    => "vn.recover"
         }
 
-        VN_STATES=%w{INIT READY LOCK_CREATE LOCK_DELETE DONE ERROR}
+        VN_STATES=%w{INIT READY LOCK_CREATE LOCK_DELETE DONE ERROR UPDATE_FAILURE}
 
         SHORT_VN_STATES={
             "INIT"          => "init",
@@ -52,7 +52,8 @@ module OpenNebula
             "LOCK_CREATE"   => "lock",
             "LOCK_DELETE"   => "lock",
             "DONE"          => "done",
-            "ERROR"         => "err"
+            "ERROR"         => "err",
+            "UPDATE_FAILURE"=> "fail"
         }
 
         # Creates a VirtualNetwork description with just its identifier
@@ -326,7 +327,7 @@ module OpenNebula
         # Recovers an stuck Virtual Network
         #
         # @param result [Integer] Recover with failure (0), success (1),
-        # delete (2)
+        # delete (2), retry (3)
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def recover(result)
@@ -377,6 +378,34 @@ module OpenNebula
             SHORT_VN_STATES[state_str]
         end
 
+        # Returns three arrays with the numeric VM IDs for VMs updated,
+        # outdated (include updating) and error
+        def vm_ids
+            updated = Array.new
+
+            self.each('UPDATED_VMS/ID') do |id|
+                updated << id.text.to_i
+            end
+
+            outdated = Array.new
+
+            self.each('OUTDATED_VMS/ID') do |id|
+                outdated << id.text.to_i
+            end
+
+            self.each('UPDATING_VMS/ID') do |id|
+                outdated << id.text.to_i
+            end
+
+            error = Array.new
+
+            self.each('ERROR_VMS/ID') do |id|
+                error << id.text.to_i
+            end
+
+            [updated, outdated, error]
+        end
+
     private
         def set_publish(published)
             group_u = published ? 1 : 0

data/lib/opennebula/virtual_network_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.4.4'
+    VERSION = '6.5.80'
 end

data/lib/rest_client.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #
@@ -69,21 +69,25 @@ module VCenterDriver
         end
 
         def self.new_from_host(host_id)
-            client = OpenNebula::Client.new
-            host = OpenNebula::Host.new_with_id(host_id, client)
-            rc = host.info(true)
-            if OpenNebula.is_error?(rc)
-                raise "Could not get host info for ID: \
-                       #{host_id} - #{rc.message}"
-            end
+            begin
+                client = OpenNebula::Client.new
+                host = OpenNebula::Host.new_with_id(host_id, client)
+                rc = host.info(true)
+                if OpenNebula.is_error?(rc)
+                    raise "Could not get host info for ID: \
+                           #{host_id} - #{rc.message}"
+                end
 
-            connection = {
-                :hostname => host['TEMPLATE/VCENTER_HOST'],
-                :username => host['TEMPLATE/VCENTER_USER'],
-                :password => host['TEMPLATE/VCENTER_PASSWORD']
-            }
+                connection = {
+                    :hostname => host['TEMPLATE/VCENTER_HOST'],
+                    :username => host['TEMPLATE/VCENTER_USER'],
+                    :password => host['TEMPLATE/VCENTER_PASSWORD']
+                }
 
-            new(connection)
+                new(connection)
+            rescue StandardError => e
+                raise e
+            end
         end
 
         def get_or_create_tag(

data/lib/scripts_common.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/transport_zone.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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/vcenter_driver.rb

@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                  #
+# Copyright 2002-2022, 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/vcenter_importer.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #