opennebula 6.0.1 → 6.1.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f663dcec1594a07beb54bc3a4065b53818669846
-  data.tar.gz: 63d9ffe94c43fb81d6cc7e2a0563ed6d711ebc48
+  metadata.gz: 2297734850551fc2c89b8d6bbccd43408724e330
+  data.tar.gz: e7bc524512feaa2dd9215214aa2b273dd6a9f8d5
 SHA512:
-  metadata.gz: 905fbdea52975558d07f8720c64c5f37365672d487a1bb334c94e0e4ea5026be94468c3320b667c2d7acc6f31f312e0e58b951cbf136bf45ebfc1d4efaa7e857
-  data.tar.gz: ddb7dadb1c1d2df3454b11a4c7f91385049ee2b134de1d75c0c27b7e59b554b2f9db5ca6135e85a9d0e8ff3b0e0565f3f4e34dd121830c151a1f468347187ad6
+  metadata.gz: 6df4eefbb624baa5f43f4959d188f43ef1ad36cb25814f76b829480bd26b60946489029d0623727d96881eff87efe9755a823884a7988fe68206d43fe86442af
+  data.tar.gz: 547a06b4424a0f2dfaeec1a2c4c9ac4a5fa8854665338fe34e7ebc9b6cbd0de3682c6ade82b9360fb7e68a9c9bbb2d4fb3a89c05757652e8e98c732951e52447

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.1'
+    VERSION = '6.1.90'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/datacenter.rb

@@ -500,7 +500,7 @@ module VCenterDriver
         end
 
         # Determine if a network must be excluded from the list
-        def exclude_network?(vc_network, one_host, args, vc_network_hash)
+        def exclude_network?(one_host, args, vc_network_hash, network_type)
             vc_network_name = vc_network_hash[:vc_network_name]
             vc_network_host = vc_network_hash[:vc_network_host]
             vc_network_tag = vc_network_hash[:vc_network_tag]
@@ -514,12 +514,6 @@ module VCenterDriver
                     ]
 
                     # Only NSX-V and NSX-T can be excluded
-                    network_type = VCenterDriver::Network
-                                   .get_network_type(
-                                       vc_network,
-                                       vc_network_name
-                                   )
-
                     return true if network_types.include? network_type
                 end
                 # Exclude networks without hosts
@@ -533,7 +527,7 @@ module VCenterDriver
                     return true
                 end
                 # Exclude portgroup used for VXLAN communication in NSX
-                if vc_network['name'].match(/^vxw-vmknicPg-dvs-(.*)/)
+                if vc_network_name.match(/^vxw-vmknicPg-dvs-(.*)/)
                     return true
                 end
 
@@ -543,7 +537,7 @@ module VCenterDriver
         end
 
         # Proccess each network
-        def process_network(params)
+        def process_network(params, networks_type, hosts_list, host_list_object)
             vc_network = params[:vc_network]
             vcenter_instance_name = params[:vcenter_instance_name]
             vcenter_uuid = params[:vcenter_uuid]
@@ -577,23 +571,31 @@ module VCenterDriver
             opts = {}
 
             # Add network type to network hash
-            network_type = \
-                VCenterDriver::Network.get_network_type(
-                    vc_network,
-                    vc_network_name
-                )
+            if networks_type.key?(vc_network_hash[:vc_network_ref])
+                network_type = networks_type[vc_network_hash[:vc_network_ref]]
+            else
+                network_type =
+                    VCenterDriver::Network.get_network_type(
+                        vc_network,
+                        vc_network_name
+                    )
+                networks_type[vc_network_hash[:vc_network_ref]] = network_type
+            end
+
             network[vc_network_ref][:network_type] = network_type
             network[vc_network_ref][:type] = network_type
 
             # Determine if the network must be excluded
             network[vc_network_ref][:excluded] = exclude_network?(
-                vc_network,
                 one_host,
                 args,
-                vc_network_hash
+                vc_network_hash,
+                network_type
             )
 
-            return if network[vc_network_ref][:excluded] == true
+            if network[vc_network_ref][:excluded] == true
+                return [nil, networks_type, hosts_list, host_list_object]
+            end
 
             if full_process
                 case network[vc_network_ref][:network_type]
@@ -651,31 +653,50 @@ module VCenterDriver
             vc_hosts = vc_network.host
             vc_hosts.each do |vc_host|
                 # Get vCenter Cluster
-                vc_cluster = vc_host.parent
-                vc_cluster_ref = vc_cluster._ref
-                vc_cluster_name = vc_cluster.name
-                # Get one host from each vCenter cluster
-                one_host = VCenterDriver::VIHelper
-                           .find_by_ref(OpenNebula::HostPool,
-                                        'TEMPLATE/VCENTER_CCR_REF',
-                                        vc_cluster_ref,
-                                        vcenter_uuid)
+                vc_host_ref = vc_host._ref
+                if !host_list_object.key?(vc_host_ref)
+                    vc_cluster = vc_host.parent
+                    vc_cluster_ref = vc_cluster._ref
+                    vc_cluster_name = vc_cluster.name
+                    host_list_object[vc_host_ref] = {
+                        :vc_cluster_ref => vc_cluster_ref,
+                        :vc_cluster_name => vc_cluster_name
+                    }
+                end
+
+                vc_cluster = host_list_object[vc_host_ref]
+
+                if hosts_list.key? vc_cluster[:vc_cluster_ref]
+                    one_host = hosts_list[vc_cluster[:vc_cluster_ref]]
+                else
+                    one_host = VCenterDriver::VIHelper
+                               .find_by_ref(OpenNebula::HostPool,
+                                            'TEMPLATE/VCENTER_CCR_REF',
+                                            vc_cluster[:vc_cluster_ref],
+                                            vcenter_uuid)
+                    hosts_list[vc_cluster[:vc_cluster_ref]] = one_host
+                end
                 # Check if network is excluded from each host
                 next if exclude_network?(
-                    vc_network,
                     one_host,
                     args,
-                    vc_network_hash
+                    vc_network_hash,
+                    network_type
                 )
 
                 # Insert vCenter cluster ref
-                network[vc_network_ref][:clusters][:refs] << vc_cluster_ref
+                network[vc_network_ref][:clusters][:refs] <<
+                    vc_cluster[:vc_cluster_ref]
+
                 # Insert OpenNebula cluster id
                 cluster_id = one_cluster_id(one_host)
-                network[vc_network_ref][:clusters][:one_ids] << cluster_id
+                network[vc_network_ref][:clusters][:one_ids] <<
+                    cluster_id
+
                 # Insert vCenter cluster name
-                network[vc_network_ref][:clusters][:names] << vc_cluster_name
-                opts[:dc_name] = vc_cluster_name
+                network[vc_network_ref][:clusters][:names] <<
+                    vc_cluster[:vc_cluster_name]
+                opts[:dc_name] = vc_cluster[:vc_cluster_name]
             end
 
             # Remove duplicate entries
@@ -706,7 +727,7 @@ module VCenterDriver
                     network[vc_network_ref]['name']
             end
 
-            network
+            [network, networks_type, hosts_list, host_list_object]
         end
 
         # rubocop:disable Style/GlobalVars
@@ -723,13 +744,15 @@ module VCenterDriver
                     $conf[:one_xmlrpc]
                 )
             end
-
             one_host = OpenNebula::Host.new_with_id(args[:host], one_client)
             rc = one_host.info
             raise rc.message if OpenNebula.is_error? rc
 
             # Get all networks in vcenter cluster (one_host)
             vc_cluster_networks = cluster_networks(one_host)
+            networks_type = {}
+            hosts_list = {}
+            host_list_object = {}
 
             # Iterate over vcenter networks
             vc_cluster_networks.each do |vc_cluster_network|
@@ -751,7 +774,20 @@ module VCenterDriver
                 params[:one_host]= one_host
                 params[:args] = args
 
-                network = process_network(params)
+                network,
+                    networks_type_new,
+                    hosts_list_new,
+                    host_list_object_new =
+                    process_network(
+                        params,
+                        networks_type,
+                        hosts_list,
+                        host_list_object
+                    )
+
+                networks_type = networks_type_new
+                hosts_list = hosts_list_new
+                host_list_object = host_list_object_new
 
                 networks.merge!(network) unless network.nil?
             end

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/distributed_firewall.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/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/network.rb

@@ -534,7 +534,13 @@ module VCenterDriver
                     params[:one_host] = one_host
                     params[:args] = {}
 
-                    selected = dc_folder.process_network(params)
+                    selected, _networks_type, _hosts_list, _clusters_list =
+                        dc_folder.process_network(
+                            params,
+                            {},
+                            {},
+                            {}
+                        )
 
                     selected = selected[index]
 

data/lib/nsx_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