opennebula 6.0.3 → 6.1.80.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4c2d6ffef598e821e3b6bcc4a429f766caadbf
-  data.tar.gz: 2e65f273fb1f2d383d799fa4fd31e6d2fb66cb41
+  metadata.gz: 3ec17a7a8b4c347550f293bb4db7f82cee1f1daf
+  data.tar.gz: 55f73a012fe7fae60070f37afca0cfab81fad686
 SHA512:
-  metadata.gz: ce66ed43b8db71bcb0f8572a7e3a48de18b3e7c4819006d93333709e892718cd83c724a723c81870538b404ed3d80bc33786b1b1cc0bbd8a882412992c56bd17
-  data.tar.gz: e3694d73c467089a0ec6720c2ac22034bfcb49f273d14b607915d9aa1ba23abf6c5045a436ec08f47d7f87e5c394981c0e95d8b1614833f87c3666f64b731291
+  metadata.gz: 504d1fd56b5b115bf6d6f49b689791eaf238ef75be357dd1debac901e2495fccc43d9cabc9c174e25d307768454254468201643975ee1920f7aafa98d2e26109
+  data.tar.gz: 2b295c38fd943e500cb78890462a0e98f34289646422ce5092080b03ea694d99bd2d0240e6bb0a706854daa9848acb42702bb47a2c4d0156b895f5038e007015

data/lib/cloud/CloudClient.rb

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

data/lib/datastore.rb

@@ -558,8 +558,12 @@ module VCenterDriver
                 raise 'Could not get file size or capacity' if size.nil?
 
                 size
-            rescue StandardError
-                raise 'Could not find file.'
+            rescue StandardError => e
+                message = "Could not find file. Reason: \"#{e.message}\"."
+                if VCenterDriver::CONFIG[:debug_information]
+                    message += ' ' + e.backtrace
+                end
+                raise message
             end
         end
 

data/lib/models/role.rb

@@ -571,11 +571,20 @@ module OpenNebula
                 vm = OpenNebula::VirtualMachine.new_with_id(vm_id,
                                                             @service.client)
 
-                rc = vm.info
+                if do_offset
+                    offset = (index / vms_per_period.to_i).floor
+                    time_offset = offset * period.to_i
+                end
+
+                tmp_str = 'SCHED_ACTION = ['
+                tmp_str << "ACTION = #{action},"
+                tmp_str << "ARGS = \"#{args}\"," if args
+                tmp_str << "TIME = #{now + time_offset}]"
 
+                rc = vm.sched_action_add(tmp_str)
                 if OpenNebula.is_error?(rc)
-                    msg = "Role #{name} : VM #{vm_id} monitorization failed;"\
-                          " #{rc.message}"
+                    msg = "Role #{name} : VM #{vm_id} error scheduling "\
+                            "action; #{rc.message}"
 
                     error_msgs << msg
 
@@ -583,40 +592,7 @@ module OpenNebula
 
                     @service.log_error(msg)
                 else
-                    ids = vm.retrieve_elements('USER_TEMPLATE/SCHED_ACTION/ID')
-
-                    id = 0
-                    if !ids.nil? && !ids.empty?
-                        ids.map! {|e| e.to_i }
-                        id = ids.max + 1
-                    end
-
-                    tmp_str = vm.user_template_str
-
-                    if do_offset
-                        offset = (index / vms_per_period.to_i).floor
-                        time_offset = offset * period.to_i
-                    end
-
-                    tmp_str << "\nSCHED_ACTION = ["
-                    tmp_str << "ID = #{id},"
-                    tmp_str << "ACTION = #{action},"
-                    tmp_str << "ARGS = \"#{args}\"," if args
-                    tmp_str << "TIME = #{now + time_offset}]"
-
-                    rc = vm.update(tmp_str)
-                    if OpenNebula.is_error?(rc)
-                        msg = "Role #{name} : VM #{vm_id} error scheduling "\
-                              "action; #{rc.message}"
-
-                        error_msgs << msg
-
-                        Log.error LOG_COMP, msg, @service.id
-
-                        @service.log_error(msg)
-                    else
-                        vms_id << vm.id
-                    end
+                    vms_id << vm.id
                 end
             end
 

data/lib/opennebula/ldap_auth.rb

@@ -161,7 +161,8 @@ class OpenNebula::LdapAuth
     end
 
     def is_in_group?(user, group)
-        username = user.first.force_encoding(Encoding::UTF_8)
+        username = Net::LDAP::Filter.escape(
+            user.first.force_encoding(Encoding::UTF_8))
         result=@ldap.search(
                     :base   => group,
                     :attributes => [@options[:group_field]],
@@ -273,6 +274,7 @@ def get_server_order(opts, user)
                 user = m[1] if m[1]
 
                 order << to_array(server)
+                break
             end
         end
 

data/lib/opennebula/server_cipher_auth.rb

@@ -41,8 +41,10 @@ class OpenNebula::ServerCipherAuth
         if !srv_passwd.empty?
             # truncate token to 32-bytes for Ruby >= 2.4
             @key = Digest::SHA256.hexdigest(@srv_passwd)[0..31]
-        else
+            @iv = @key[0..15]
+          else
             @key = ""
+            @iv = ""
         end
 
         @cipher = OpenSSL::Cipher.new(CIPHER)
@@ -112,6 +114,7 @@ class OpenNebula::ServerCipherAuth
         begin
             # truncate token to 32-bytes for Ruby >= 2.4
             @key = srv_pass[0..31]
+            @iv = srv_pass[0..15]
 
             token_array = decrypt(signed_text).split(':')
 
@@ -133,7 +136,7 @@ class OpenNebula::ServerCipherAuth
     def encrypt(data)
         @cipher.encrypt
         @cipher.key = @key
-
+        @cipher.iv = @iv
         rc = @cipher.update(data)
         rc << @cipher.final
 
@@ -143,7 +146,7 @@ class OpenNebula::ServerCipherAuth
     def decrypt(data)
         @cipher.decrypt
         @cipher.key = @key
-
+        @cipher.iv = @iv
         rc = @cipher.update(Base64::decode64(data))
         rc << @cipher.final
 

data/lib/opennebula/virtual_machine.rb

@@ -50,8 +50,11 @@ module OpenNebula
             :disksnapshotrename => "vm.disksnapshotrename",
             :diskresize     => "vm.diskresize",
             :updateconf     => "vm.updateconf",
-            :lock     => "vm.lock",
-            :unlock     => "vm.unlock"
+            :lock           => "vm.lock",
+            :unlock         => "vm.unlock",
+            :schedadd       => "vm.schedadd",
+            :scheddelete    => "vm.scheddelete",
+            :schedupdate    => "vm.schedupdate"
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
@@ -260,7 +263,7 @@ module OpenNebula
         # +id+ the id of the vm
         #
         # Example:
-        #   vnet = VirtualMachine.new(VirtualMachine.build_xml(3),rpc_client)
+        #   vm = VirtualMachine.new(VirtualMachine.build_xml(3),rpc_client)
         #
         def VirtualMachine.build_xml(pe_id=nil)
             if pe_id
@@ -710,18 +713,49 @@ module OpenNebula
             end
         end
 
-        #  Changes the attributes of a VM in power off, failure and undeploy
-        #  states
-        #  @param new_conf, string describing the new attributes. Each attribute
+        # Changes the attributes of a VM in power off, failure and undeploy
+        #   states
+        #
+        # @param new_conf, string describing the new attributes. Each attribute
         #  will replace the existing ones or delete it if empty. Attributes that
         #  can be updated are: INPUT/{TYPE, BUS}; RAW/{TYPE, DATA, DATA_VMX},
         #  OS/{BOOT, BOOTLOADER, ARCH, MACHINE, KERNEL, INITRD},
         #  FEATURES/{ACPI, APIC, PAE, LOCALTIME, HYPERV, GUEST_AGENT},
         #  and GRAPHICS/{TYPE, LISTEN, PASSWD, KEYMAP}
+        # @param append, append template, do not delete empty attributes
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def updateconf(new_conf, append = false)
+            return call(VM_METHODS[:updateconf], @pe_id, new_conf, append ? 1 : 0)
+        end
+
+        # Add sched actions
+        #
+        # @param sched_template [String] Template with SCHED_ACTIONs
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def sched_action_add(sched_template)
+            return call(VM_METHODS[:schedadd], @pe_id, sched_template)
+        end
+
+        # Delete sched action
+        #
+        # @param sched_id [Int] id of the SCHED_ACTION
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def sched_action_delete(sched_id)
+            return call(VM_METHODS[:scheddelete], @pe_id, sched_id.to_i)
+        end
+
+        # Update sched_action
+        #
+        # @param sched_id [Int] id of the SCHED_ACTION
+        # @param sched_template [String] Template containing a SCHED_ACTION
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
-        def updateconf(new_conf)
-            return call(VM_METHODS[:updateconf], @pe_id, new_conf)
+        def sched_action_update(sched_id, sched_template)
+            return call(VM_METHODS[:schedupdate], @pe_id, sched_id.to_i,
+                sched_template)
         end
 
         ########################################################################

data/lib/opennebula/zone.rb

@@ -31,7 +31,15 @@ module OpenNebula
             :delete         => "zone.delete",
             :addserver      => "zone.addserver",
             :delserver      => "zone.delserver",
-            :resetserver    => "zone.resetserver"
+            :resetserver    => "zone.resetserver",
+            :enable         => "zone.enable"
+        }
+
+        ZONE_STATES=%w{ENABLED DISABLED}
+
+        SHORT_ZONE_STATES={
+            "ENABLED"              => "on",
+            "DISABLED"             => "off"
         }
 
         # Creates a Zone description with just its identifier
@@ -179,6 +187,37 @@ module OpenNebula
             return call(ZONE_METHODS[:resetserver], @pe_id, server_id)
         end
 
+        # Enable zone
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def enable()
+            return call(ZONE_METHODS[:enable], @pe_id, true)
+        end
+
+        # Disable zone, only readonly commands can be executed in disabled
+        # state
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def disable()
+            return call(ZONE_METHODS[:enable], @pe_id, false)
+        end
+
+        #######################################################################
+        # Helpers to get Zone information
+        #######################################################################
+
+        # Returns the state of the Zone (numeric value)
+        def state
+            self['STATE'].to_i
+        end
+
+        # Returns the state of the Zone (string value)
+        def state_str
+            ZONE_STATES[state]
+        end
+
         private
 
         # These methods adds elements to the given node of the zone

data/lib/opennebula.rb

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

data/lib/vcenter_importer.rb

@@ -369,9 +369,11 @@ module VCenterDriver
                 error_msg = "\nError: #{e.message}\n"
                 error_msg << "#{e.backtrace}\n" \
                               if VCenterDriver::CONFIG[:debug_information]
-                STDOUT.puts error_msg
+                STDERR.puts error_msg
+                raise_error = true
             ensure
                 vi_client.close_connection if vi_client
+                raise if raise_error
             end
         end
 

data/lib/virtual_machine.rb

@@ -1090,14 +1090,22 @@ end
         #
         # @return [Hash ("String" => self.Nic)] Model representation of nics
         def info_nics
+            keep_mac_on_imported = false
+            keep_mac_on_imported = CONFIG[:keep_mac_on_imported] \
+                                     unless CONFIG[:keep_mac_on_imported].nil?
+
             @nics = { :macs => {} }
 
             vc_nics  = vcenter_nics_list
             one_nics = one_nics_get
 
             one_nics.each do |one_nic|
-                index  = one_nic['NIC_ID']
-                mac    = one_nic['MAC']
+                index = one_nic['NIC_ID']
+                if keep_mac_on_imported && one_nic['MAC_IMPORTED']
+                    mac = one_nic['MAC_IMPORTED']
+                else
+                    mac = one_nic['MAC']
+                end
                 vc_dev = query_nic(mac, vc_nics)
 
                 if vc_dev
@@ -2419,7 +2427,7 @@ end
             # automatically cleans all system snapshots
             # https://github.com/OpenNebula/one/issues/5409
             if snapshots? || one_snapshots?
-                error_msg =  'Existing system snapshots, cannot change disks. '
+                error_msg =  'Existing sytem snapshots, cannot change disks. '
                 error_msg << 'Please remove all snapshots and try again.'
                 raise error_message
             end
@@ -2606,9 +2614,8 @@ end
             return unless disk.exists?
 
             if snapshots? || one_snapshots?
-                error_message =  'Existing system snapshots, cannot change '
-                error_message << 'disks . Please remove all snapshots and '
-                error_message << 'try again.'
+                error_message =  'Existing sytem snapshots, cannot change disks'
+                error_message << '. Please remove all snapshots and try again.'
                 raise error_message
             end
 

data/lib/vm_template.rb

@@ -733,6 +733,9 @@ module VCenterDriver
                                                  nic, true)
                 network_found.info
 
+                if nic[:mac]
+                    nic_tmp << "MAC_IMPORTED=\"#{nic[:mac]}\",\n"
+                end
                 # This is the existing nic info
                 if nic[:mac] && ipv4.empty? && ipv6.empty?
                     nic_tmp << "MAC=\"#{nic[:mac]}\",\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -126,6 +126,7 @@ files:
 - 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
@@ -134,7 +135,6 @@ files:
 - lib/vm_folder.rb
 - lib/vm_template.rb
 - lib/vmm_importer.rb
-- lib/virtual_machine.rb
 - lib/nsx_driver.rb
 - lib/distributed_firewall.rb
 - lib/logical_port.rb
@@ -164,8 +164,8 @@ files:
 - lib/DriverExecHelper.rb
 - lib/scripts_common.rb
 - lib/models.rb
-- lib/models/service.rb
 - lib/models/role.rb
+- lib/models/service.rb
 - lib/opennebula/acl.rb
 - lib/opennebula/acl_pool.rb
 - lib/opennebula/client.rb
@@ -208,6 +208,7 @@ files:
 - lib/opennebula/utils.rb
 - lib/opennebula/vdc.rb
 - lib/opennebula/vdc_pool.rb
+- lib/opennebula/virtual_machine.rb
 - lib/opennebula/virtual_machine_ext.rb
 - lib/opennebula/virtual_machine_pool.rb
 - lib/opennebula/virtual_network.rb
@@ -222,9 +223,8 @@ files:
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
-- lib/opennebula/zone_pool.rb
-- lib/opennebula/virtual_machine.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
@@ -255,9 +255,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: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1