opennebula 6.0.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c860bdde4c2e7184d75f0433181a5aa485d39296
-  data.tar.gz: 7b773535ac63930fb85252435814b4f4e81adcf0
+  metadata.gz: 62addc3c6ca7a2d64f362b69e78d5249a8c580ca
+  data.tar.gz: 753aea24a283602fad7c6e7171164a8c6af9ee00
 SHA512:
-  metadata.gz: 0b23945ca645beba28c3e898a13ef254b4a78ecdc63dec03922c808914233d550a3503efef499a521d2aa6fbfaeff795789976105ccb93eb80614ef3686662e1
-  data.tar.gz: 3337709c1791f07680d40dcb8c4a012139e93af38546fc200dacb07fea81b3890405a80f48a596f72465c4bb08e28f02b6c729801e8c414ba55559d1b2f7a097
+  metadata.gz: afd9480704e6bfce7e708729ef75ad7457ce713b0e85b235b23373e94867b40713aef2a032b191d52f3567b2ca8de4a361e5baaf757228aa131eb32ceda2b12e
+  data.tar.gz: 0b319949a9cfad08f13f6ecd1040b28d5edaf1a11c46f5fadbd0ea3ee90af97f239a48fa85809789eec9805cb269ad44f9f72c63b5809e6fea8e273acda7f1c5

data/lib/CommandManager.rb

@@ -34,17 +34,9 @@ require 'base64'
 # * Log messages will be sent to STDOUT
 # * The script will return 0 if it succeded or any other value
 #   if there was a failure
-# * In case of failure the cause of the error will be written to STDERR
-#   wrapped by start and end marks as follows:
-#
-#     ERROR MESSAGE --8<------
-#     error message for the failure
-#     ERROR MESSAGE ------>8--
-
+# * In case of failure the cause of the error will be written to STDERR.
 
 class GenericCommand
-    ERROR_OPEN  = "ERROR MESSAGE --8<------"
-    ERROR_CLOSE = "ERROR MESSAGE ------>8--"
 
     attr_reader :code, :stdout, :stderr, :command
 
@@ -93,8 +85,9 @@ class GenericCommand
             end
 
             log(error_message)
-            @stderr = ERROR_OPEN + "\n" + error_message + "\n" + ERROR_CLOSE
-            @code = 255
+
+            @stderr = error_message
+            @code   = 255
         end
 
         return @code
@@ -102,9 +95,9 @@ class GenericCommand
 
     # Parses error message from +stderr+ output
     def get_error_message
-        tmp=@stderr.scan(/^#{ERROR_OPEN}\n(.*?)#{ERROR_CLOSE}$/m)
-        return "-" if !tmp[0]
-        tmp[0].join(' ').strip
+        return '-' if @stderr.empty?
+
+        @stderr.tr("\n",' ').strip
     end
 
     def to_xml
@@ -176,8 +169,12 @@ private
                 end
             }
 
-            i.write stdin_data
-            i.close
+            begin
+                i.write stdin_data
+                i.close
+            rescue Errno::EPIPE
+                # the cmd doesn't read the input, ignore error
+            end
 
             # blocking wait for process termination
             t.value

data/lib/DriverExecHelper.rb

@@ -124,31 +124,21 @@ module DriverExecHelper
     # Sends a log message to ONE. The +message+ can be multiline, it will
     # be automatically splitted by lines.
     def log(number, message, all = true)
-        in_error_message=false
-        msg=message.strip
+        msg = message.strip
+
         msg.each_line do |line|
             all ? severity='I' : severity=nil
-            l=line.strip
-
-            if l=='ERROR MESSAGE --8<------'
-                in_error_message=true
-                next
-            elsif l=='ERROR MESSAGE ------>8--'
-                in_error_message=false
-                next
-            else
-                if in_error_message
+
+            if line.match(/^(ERROR|DEBUG|INFO):(.*)$/)
+                line=Regexp.last_match(2)
+
+                case Regexp.last_match(1)
+                when 'ERROR'
                     severity='E'
-                elsif line.match(/^(ERROR|DEBUG|INFO):(.*)$/)
-                    line=Regexp.last_match(2)
-                    case Regexp.last_match(1)
-                    when 'ERROR'
-                        severity='E'
-                    when 'DEBUG'
-                        severity='D'
-                    when 'INFO'
-                        severity='I'
-                    end
+                when 'DEBUG'
+                    severity='D'
+                when 'INFO'
+                    severity='I'
                 end
             end
 

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.0.2'
+    VERSION = '6.2.0'
 
     # #########################################################################
     # 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/file_helper.rb

@@ -81,6 +81,10 @@ module VCenterDriver
             file.match(%r{^https?://}) || file.match(%r{^s3?://})
         end
 
+        def self.from_s3?(file)
+            file.match(%r{^s3?://})
+        end
+
         def self.vmdk?(file)
             type = `file #{file}`
 

data/lib/host.rb

@@ -1145,14 +1145,14 @@ module VCenterDriver
             vswitchspec =
                 RbVmomi::VIM::HostVirtualSwitchSpec(
                     :bridge => hostbridge,
-                     :mtu => mtu,
-                      :numPorts => num_ports
+                    :mtu => mtu,
+                    :numPorts => num_ports
                 )
             begin
                 nws
                     .UpdateVirtualSwitch(
                         :vswitchName => name,
-                         :spec => vswitchspec
+                        :spec => vswitchspec
                     )
             rescue StandardError => e
                 raise "The standard switch with name #{name} \
@@ -1463,7 +1463,7 @@ module VCenterDriver
                         nws
                             .UpdatePortGroup(
                                 :pgName => nr[:name],
-                                 :portgrp => nr[:spec]
+                                :portgrp => nr[:spec]
                             )
                     rescue StandardError => e
                         raise "A rollback operation for standard \

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/models/service.rb

@@ -140,12 +140,14 @@ module OpenNebula
         # Return true if the service can be undeployed
         # @return true if the service can be undeployed, false otherwise
         def can_undeploy?
+            # rubocop:disable Style/IfWithBooleanLiteralBranches
             if (transient_state? && state != Service::STATE['UNDEPLOYING']) ||
-               state == Service::STATE['DONE'] || failed_state?
+                state == Service::STATE['DONE'] || failed_state?
                 false
             else
                 true
             end
+            # rubocop:enable Style/IfWithBooleanLiteralBranches
         end
 
         # Return true if the service can be updated
@@ -166,6 +168,12 @@ module OpenNebula
             RECOVER_SCALE_STATES.include? STATE_STR[state]
         end
 
+        # Return true if the service is running
+        # @return true if the service is runnning, false otherwise
+        def running?
+            state_str == 'RUNNING'
+        end
+
         # Returns the running_status_vm option
         # @return [true, false] true if the running_status_vm option is enabled
         def report_ready?
@@ -323,6 +331,36 @@ module OpenNebula
             nil
         end
 
+        # Adds a role to the service
+        #
+        # @param template [Hash] Role information
+        #
+        # @return [OpenNebula::Role] New role
+        def add_role(template)
+            template['state'] ||= Role::STATE['PENDING']
+            role                = Role.new(template, self)
+
+            if @roles[role.name]
+                return OpenNebula::Error.new("Role #{role.name} already exists")
+            end
+
+            @roles[role.name] = role
+            @body['roles'] << template if @body && @body['roles']
+
+            role
+        end
+
+        # Removes a role from the service
+        #
+        # @param name [String] Role name to delete
+        def remove_role(name)
+            @roles.delete(name)
+
+            @body['roles'].delete_if do |role|
+                role['name'] == name
+            end
+        end
+
         # Retrieves the information of the Service and all its Nodes.
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
@@ -484,38 +522,51 @@ 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
+
+                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']]
 
-                rc = @roles[role['name']].check_new_template(role)
+                    rc = @roles[role['name']].check_new_template(role)
 
-                return rc unless rc[0]
+                    return rc unless rc[0]
+                end
             end
 
             [true, nil]
         end
 
-        def deploy_networks
-            body = JSON.parse(self['TEMPLATE/BODY'])
+        def deploy_networks(deploy = true)
+            if deploy
+                body = JSON.parse(self['TEMPLATE/BODY'])
+            else
+                body = @body
+            end
 
             return if body['networks_values'].nil?
 
@@ -531,7 +582,7 @@ module OpenNebula
                 if OpenNebula.is_error?(rc)
                     return rc
                 end
-            end
+            end if deploy
 
             # Replace $attibute by the corresponding value
             resolve_attributes(body)

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
@@ -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/wait_ext.rb

@@ -14,107 +14,118 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
 require 'opennebula/host'
 require 'opennebula/image'
 require 'opennebula/virtual_machine'
 
-module OpenNebula::WaitExtEvent
-    def wait_event(ctx, event, timeout)
-        subscriber = ctx.socket(ZMQ::SUB)
+module OpenNebula
 
-        # Create subscriber
-        key        = ''
-        content    = ''
+    # Module to wait OpenNebula objects events using ZMQ
+    module WaitExtEvent
 
-        subscriber.setsockopt(ZMQ::RCVTIMEO, timeout * 1000)
-        subscriber.setsockopt(ZMQ::SUBSCRIBE, event)
-        subscriber.connect(@client.one_zmq)
+        def wait_event(ctx, event, timeout)
+            subscriber = ctx.socket(ZMQ::SUB)
 
-        rc = subscriber.recv_string(key)
-        rc = subscriber.recv_string(content) if rc != -1
+            # Create subscriber
+            key        = ''
+            content    = ''
 
-        return if ZMQ::Util.errno == ZMQ::EAGAIN || rc == -1
+            subscriber.setsockopt(ZMQ::RCVTIMEO, timeout * 1000)
+            subscriber.setsockopt(ZMQ::SUBSCRIBE, event)
+            subscriber.connect(@client.one_zmq)
 
-        content
-    ensure
-        subscriber.setsockopt(ZMQ::UNSUBSCRIBE, event)
-        subscriber.close
-    end
+            rc = subscriber.recv_string(key)
+            rc = subscriber.recv_string(content) if rc != -1
 
-    def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
-        wfun = OpenNebula::WaitExt::WAIT[self.class]
-
-        # Start with a timeout of 2 seconds, to wait until the first
-        # info.
-        #
-        # The timeout is increased later, to avoid multiple info calls.
-        c_timeout = 2
-        recvs     = 0
-        in_state  = false
-
-        # Subscribe with timeout seconds
-        #
-        # Subscribe string:
-        #
-        #   EVENT STATE element_name/state_str//self.ID
-        #
-        #   - element_name: is the element name to find in the message
-        #   - self.ID: returns element ID to find in the message
-        ctx = ZMQ::Context.new(1)
-
-        until in_state || (cycles != -1 && recvs >= cycles)
-            content = wait_event(ctx,
-                                 wfun[:event].call(self, sstr1, sstr2),
-                                 c_timeout)
-
-            if content && !content.empty?
-                in_state = wfun[:in_state_e].call(sstr1, sstr2, content)
-
-                break if in_state
-            end
+            return if ZMQ::Util.errno == ZMQ::EAGAIN || rc == -1
+
+            content
+        ensure
+            subscriber.setsockopt(ZMQ::UNSUBSCRIBE, event)
+            subscriber.close
+        end
+
+        def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
+            wfun = OpenNebula::WaitExt::WAIT[self.class]
+
+            # Start with a timeout of 2 seconds, to wait until the first
+            # info.
+            #
+            # The timeout is increased later, to avoid multiple info calls.
+            c_timeout = 2
+            recvs     = 0
+            in_state  = false
+
+            # Subscribe with timeout seconds
+            #
+            # Subscribe string:
+            #
+            #   EVENT STATE element_name/state_str//self.ID
+            #
+            #   - element_name: is the element name to find in the message
+            #   - self.ID: returns element ID to find in the message
+            ctx = ZMQ::Context.new(1)
+
+            until in_state || (cycles != -1 && recvs >= cycles)
+                content = wait_event(ctx,
+                                     wfun[:event].call(self, sstr1, sstr2),
+                                     c_timeout)
+
+                if content && !content.empty?
+                    in_state = wfun[:in_state_e].call(sstr1, sstr2, content)
+
+                    break if in_state
+                end
 
-            c_timeout *= 10
-            c_timeout  = timeout if c_timeout > timeout
+                c_timeout *= 10
+                c_timeout  = timeout if c_timeout > timeout
 
-            rco = info
+                rco = info
 
-            return false if OpenNebula.is_error?(rco)
+                return false if OpenNebula.is_error?(rco)
 
-            in_state = wfun[:in_state].call(self, sstr1, sstr2)
+                in_state = wfun[:in_state].call(self, sstr1, sstr2)
 
-            recvs += 1
+                recvs += 1
+            end
+
+            in_state
         end
 
-        in_state
     end
 
 end
 
-module OpenNebula::WaitExtPolling
-    def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
-        wfun = OpenNebula::WaitExt::WAIT[self.class]
+module OpenNebula
+
+    # Module to wait OpenNebula objects events using polling
+    module WaitExtPolling
+
+        def wait2(sstr1, sstr2, timeout = 60, cycles = -1)
+            wfun = OpenNebula::WaitExt::WAIT[self.class]
+
+            stime    = 5
+            recvs    = 0
+            cycles   = timeout / stime if cycles == -1
+            in_state = false
 
-        stime    = 5
-        recvs    = 0
-        cycles   = timeout / stime
-        in_state = false
+            loop do
+                rco = info
 
-        loop do
-            rco = info
+                return false if OpenNebula.is_error?(rco)
 
-            return false if OpenNebula.is_error?(rco)
+                in_state = wfun[:in_state].call(self, sstr1, sstr2)
 
-            in_state = wfun[:in_state].call(self, sstr1, sstr2)
+                recvs += 1
 
-            recvs += 1
+                break if in_state || recvs >= cycles
 
-            break if in_state || recvs >= cycles
+                sleep stime
+            end
 
-            sleep stime
+            in_state
         end
 
-        in_state
     end
 
 end
@@ -124,6 +135,7 @@ end
 #
 # rubocop:disable Style/ClassAndModuleChildren
 module OpenNebula::WaitExt
+
     # Wait classes and the name published in ZMQ/STATE
     WAIT = {
         OpenNebula::Host  => {
@@ -176,7 +188,7 @@ module OpenNebula::WaitExt
             },
 
             :in_state => lambda {|o, s1, s2|
-              obj_s1 = Integer(o['STATE'])
+                obj_s1 = Integer(o['STATE'])
                 inx_s1 = OpenNebula::VirtualMachine::VM_STATE.index(s1)
 
                 obj_s2 = Integer(o['LCM_STATE'])
@@ -203,13 +215,15 @@ module OpenNebula::WaitExt
         wait?(obj)
 
         class << obj
-          begin
-            require 'ffi-rzmq'
 
-            include OpenNebula::WaitExtEvent
-          rescue LoadError
-            include OpenNebula::WaitExtPolling
-          end
+            begin
+                require 'ffi-rzmq'
+
+                include OpenNebula::WaitExtEvent
+            rescue LoadError
+                include OpenNebula::WaitExtPolling
+            end
+
         end
 
         super

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.2'
+    VERSION = '6.2.0'
 end

data/lib/scripts_common.rb

@@ -45,16 +45,7 @@ module OpenNebula
 
     # This function is used to pass error message to the mad
     def self.error_message(message)
-        STDERR.puts format_error_message(message)
-    end
-
-    #This function formats an error message for OpenNebula
-    def self.format_error_message(message)
-        error_str = "ERROR MESSAGE --8<------\n"
-        error_str << message
-        error_str << "\nERROR MESSAGE ------>8--"
-
-        return error_str
+        STDERR.puts message
     end
 
     def self.is_disk?(arg)

data/lib/vcenter_driver.rb

@@ -133,19 +133,10 @@ end
 # Helper functions                                                             #
 # ---------------------------------------------------------------------------- #
 
-def error_message(message)
-    error_str = "ERROR MESSAGE --8<------\n"
-    error_str << message
-    error_str << "\nERROR MESSAGE ------>8--"
-
-    error_str
-end
-
 def check_valid(parameter, label)
     return unless parameter.nil? || parameter.empty?
 
-    STDERR.puts error_message("The parameter '#{label}'\
-                               is required for this action.")
+    STDERR.puts "The parameter '#{label}' is required for this action."
     exit(-1)
 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
@@ -2418,10 +2426,10 @@ end
             # Adding a new disk in newer vSphere versions
             # automatically cleans all system snapshots
             # https://github.com/OpenNebula/one/issues/5409
-            if snapshots? or one_snapshots?
-              error_message =  'Existing sytem snapshots, cannot change disks. '
-              error_message << 'Please remove all snapshots and try again.'
-              raise error_message
+            if snapshots? || one_snapshots?
+                error_msg =  'Existing sytem snapshots, cannot change disks. '
+                error_msg << 'Please remove all snapshots and try again.'
+                raise error_message
             end
 
             spec_hash     = {}
@@ -2605,10 +2613,10 @@ end
         def detach_disk(disk)
             return unless disk.exists?
 
-            if snapshots? or one_snapshots?
-              error_message =  'Existing sytem snapshots, cannot change disks. '
-              error_message << 'Please remove all snapshots and try again.'
-              raise error_message
+            if snapshots? || one_snapshots?
+                error_message =  'Existing sytem snapshots, cannot change disks'
+                error_message << '. Please remove all snapshots and try again.'
+                raise error_message
             end
 
             spec_hash = {}
@@ -3070,7 +3078,8 @@ end
         # Create a snapshot for the VM
         def create_snapshot(snap_id, snap_name)
             memory_dumps = true
-            memory_dumps = CONFIG[:memory_dumps] unless CONFIG[:memory_dumps].nil?
+            memory_dumps = CONFIG[:memory_dumps] \
+                                     unless CONFIG[:memory_dumps].nil?
 
             snapshot_hash = {
                 :name        => snap_id,

data/lib/vm_monitor.rb

@@ -175,8 +175,6 @@ module VirtualMachineMonitor
         @monitor[:diskwrbytes] = previous_diskwrbytes +
                                  (write_kbpersec * 1024 * refresh_rate).to_i
     end
-    # rubocop:enable Naming/VariableName
-    # rubocop:enable Style/FormatStringToken
 
     #  Generates a OpenNebula IM Driver valid string with the monitor info
     def info

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?
@@ -550,6 +550,10 @@ module VCenterDriver
                     net.ipConfig.ipAddress.each do |ip_config|
                         ip = IPAddr.new(ip_config.ipAddress)
 
+                        if ip.ipv6? && get_ipv6_prefix(ip.to_s, 10) == 'fe80'
+                            next
+                        end
+
                         if force
                             ipv4 = ip.to_s if ip.ipv4?
                             ipv6 = ip.to_s if ip.ipv6?
@@ -729,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.2
+  version: 6.2.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -223,14 +223,14 @@ files:
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
-- lib/opennebula/zone_pool.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/flow/service_template.rb
 - lib/opennebula/ldap_auth.rb
 - lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/server_cipher_auth.rb