opennebula 6.0.1 → 6.1.90.pre

data/lib/nsx_constants.rb

@@ -6,7 +6,7 @@
 # a copy of the License at                                                   #
 #                                                                            #
 # http://www.apache.org/licenses/LICENSE-2.0                                 #
-#                                                                             #
+#                                                                            #
 # Unless required by applicable law or agreed to in writing, software        #
 # distributed under the License is distributed on an "AS IS" BASIS,          #
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsx_driver.rb

@@ -36,14 +36,27 @@ end
 
 ENV['LANG'] = 'C'
 
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
 if File.directory?(GEMS_LOCATION)
     real_gems_path = File.realpath(GEMS_LOCATION)
     if !defined?(Gem) || Gem.path != [real_gems_path]
         $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-        require 'rubygems'
-        Gem.use_paths(real_gems_path)
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
+            require 'rubygems'
+            Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
+        end
     end
 end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
 $LOAD_PATH << LIB_LOCATION + '/ruby'
 $LOAD_PATH << LIB_LOCATION + '/ruby/nsx_driver'

data/lib/nsx_rule.rb

@@ -33,14 +33,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsxt_client.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

data/lib/nsxv_client.rb

@@ -29,14 +29,27 @@ module NSXDriver
             unless defined?(GEMS_LOCATION)
     end
 
-    if File.directory?(GEMS_LOCATION)
-        real_gems_path = File.realpath(GEMS_LOCATION)
-        if !defined?(Gem) || Gem.path != [real_gems_path]
-            $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+# rubocop: disable all
+# %%RUBYGEMS_SETUP_BEGIN%%
+if File.directory?(GEMS_LOCATION)
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+
+        # Suppress warnings from Rubygems
+        # https://github.com/OpenNebula/one/issues/5379
+        begin
+            verb = $VERBOSE
+            $VERBOSE = nil
             require 'rubygems'
             Gem.use_paths(real_gems_path)
+        ensure
+            $VERBOSE = verb
         end
     end
+end
+# %%RUBYGEMS_SETUP_END%%
+# rubocop: enable all
 
     $LOAD_PATH << RUBY_LIB_LOCATION
 

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
@@ -361,8 +369,8 @@ module OpenNebula
                 # exceeds the limit
                 new_name = "#{template.name}-#{name}"
 
-                if new_name.size > 128
-                    new_name = "#{template.name[0..(126 - name.size)]}-#{name}"
+                if new_name.size > 119
+                    new_name = "#{template.name[0..(119 - name.size)]}-#{name}"
                 end
 
                 rc = template.clone(new_name, recursive)
@@ -451,6 +459,16 @@ module OpenNebula
             validate_values(template)
         end
 
+        def self.validate_role(template)
+            validator = Validator::Validator.new(
+                :default_values => true,
+                :delete_extra_properties => false,
+                :allow_extra_properties => true
+            )
+
+            validator.validate!(template, ROLE_SCHEMA)
+        end
+
         def instantiate(merge_template)
             rc = nil
 

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/marketplace.rb

@@ -29,7 +29,15 @@ module OpenNebula
             :update     => "market.update",
             :chown      => "market.chown",
             :chmod      => "market.chmod",
-            :rename     => "market.rename"
+            :rename     => "market.rename",
+            :enable     => "market.enable"
+        }
+
+        MARKETPLACE_STATES=%w{ENABLED DISABLED}
+
+        SHORT_MARKETPLACE_STATES={
+            "ENABLED"              => "on",
+            "DISABLED"             => "off"
         }
 
         # Creates a MarketPlace description with just its identifier
@@ -130,13 +138,33 @@ module OpenNebula
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
         def rename(name)
-            return call(MARKETPLACE_METHODS[:rename], @pe_id, name)
+            call(MARKETPLACE_METHODS[:rename], @pe_id, name)
+        end
+
+        # Enables this marketplace
+        def enable
+            call(MARKETPLACE_METHODS[:enable], @pe_id, true)
+        end
+
+        # Enables this marketplace
+        def disable
+            call(MARKETPLACE_METHODS[:enable], @pe_id, false)
         end
 
         # ---------------------------------------------------------------------
         # Helpers to get 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
+            MARKETPLACE_STATES[state]
+        end
+
         # Returns whether or not the marketplace app with id 'id' is part of
         # this marketplace
         def contains(id)

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/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/virtual_machine_ext.rb

@@ -267,17 +267,20 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Check backup consistency
                 # --------------------------------------------------------------
-                unless binfo
-                    rc = info
-                    raise rc.message if OpenNebula.is_error?(rc)
+                rc = info
 
-                    binfo = backup_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
 
                 # --------------------------------------------------------------
@@ -319,19 +322,12 @@ module OpenNebula::VirtualMachineExt
                 # --------------------------------------------------------------
                 # Cleanup
                 # --------------------------------------------------------------
-                logger.info "Deleting template #{tmp.id}" if logger
-
-                tmp.delete(true)
-
-                binfo[:apps].each do |id|
-                    logger.info "Deleting applicance #{id}" if logger
-
-                    papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
-
-                    papp.delete
-                end if !keep && binfo[:apps]
+                backup_cleanup(keep, logger, binfo, tmp)
             rescue Error, StandardError => e
+                backup_cleanup(keep, logger, binfo, tmp)
+
                 logger.fatal(e.inspect) if logger
+
                 raise
             end
 
@@ -421,9 +417,9 @@ module OpenNebula::VirtualMachineExt
 
             private
 
-            # --------------------------------------------------------------
+            #-------------------------------------------------------------------
             # Check an attribute is defined and valid
-            # --------------------------------------------------------------
+            #-------------------------------------------------------------------
             def valid?(att)
                 return false if att.nil?
 
@@ -454,6 +450,9 @@ module OpenNebula::VirtualMachineExt
                 binfo
             end
 
+            #-------------------------------------------------------------------
+            # Generate backup information string
+            #-------------------------------------------------------------------
             def backup_attr(binfo, ids)
                 'BACKUP=[' \
                 "  MARKETPLACE_APP_IDS = \"#{ids.join(',')}\"," \
@@ -462,6 +461,25 @@ module OpenNebula::VirtualMachineExt
                 "  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 applicance #{id}" if logger
+
+                    papp = OpenNebula::MarketPlaceApp.new_with_id(id, @client)
+
+                    papp.delete
+                end if !keep && binfo[:apps]
+            end
+
         end
     end