83073

pending completion

Build # 83073

Build Type

cron

travis-ci-com

Committed by

simaishi

Commit Message

<a href="https://github.com/ManageIQ/manageiq/commit/<a class=hub.com/ManageIQ/manageiq/commit/caa005c684c2b350ac35c3f67787d9b871adf4fe">caa005c68<a href="https://github.com/ManageIQ/manageiq/commit/caa005c684c2b350ac35c3f67787d9b871adf4fe">&quot;&gt;Merge pull request #19178 from lfu/reconfigure_update_dialog_options_1733263

Update service dialog options when reconfigure finishes well.

(cherry picked from commit </a><a class="double-link" href="https://github.com/ManageIQ/manageiq/commit/<a class="double-link" href="https://github.com/ManageIQ/manageiq/commit/00e293496263e0e2e27edcca25b4a8dd413acefe">00e293496</a>">00e293496</a><a href="https://github.com/ManageIQ/manageiq/commit/caa005c684c2b350ac35c3f67787d9b871adf4fe">)

https://bugzilla.redhat.com/show_bug.cgi?id=1733263

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

32193 of 52478 relevant lines covered (61.35%)

82.98 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

30.0

/app/models/service_reconfigure_task.rb

class ServiceReconfigureTask < MiqRequestTask
  validate :validate_request_type, :validate_state

  AUTOMATE_DRIVES = true

  def self.base_model
    ServiceReconfigureTask
  end

  def self.get_description(req_obj)
    "#{request_class::TASK_DESCRIPTION} for: #{req_obj.source.name}"
  end

  def after_request_task_create
    update_attributes(:description => get_description)
  end

  def deliver_to_automate(req_type = request_type, zone = nil)
    task_check_on_execute

    _log.info("Queuing #{request_class::TASK_DESCRIPTION}: [#{description}]...")
    dialog_values = options[:dialog] || {}

    ra = source.service_template.resource_actions.find_by(:action => 'Reconfigure')
    if ra
      dialog_values["request"] = req_type
      args = {
        :object_type      => self.class.name,
        :object_id        => id,
        :namespace        => ra.ae_namespace,
        :class_name       => ra.ae_class,
        :instance_name    => ra.ae_instance,
        :automate_message => ra.ae_message.blank? ? 'create' : ra.ae_message,
        :attrs            => dialog_values,
        :user_id          => get_user.id,
        :miq_group_id     => get_user.current_group_id,
        :tenant_id        => get_user.current_tenant.id
      }

      MiqQueue.put(
        :class_name     => 'MiqAeEngine',
        :method_name    => 'deliver',
        :args           => [args],
        :role           => 'automate',
        :zone           => zone,
        :tracking_label => tracking_label_id
      )
      update_and_notify_parent(:state => "pending", :status => "Ok",  :message => "Automation Starting")
    else
      update_and_notify_parent(:state   => "finished",
                               :status  => "Ok",
                               :message => "#{request_class::TASK_DESCRIPTION} completed")
    end
  end

  def after_ae_delivery(ae_result)
    _log.info("ae_result=#{ae_result.inspect}")

    return if ae_result == 'retry'
    return if miq_request.state == 'finished'

    if ae_result == 'ok'
      source.options[:dialog] = source.options[:dialog].merge(options[:dialog]) if options[:dialog]
      source.save!

      update_and_notify_parent(:state   => "finished",
                               :status  => "Ok",
                               :message => "#{request_class::TASK_DESCRIPTION} completed")
    else
      update_and_notify_parent(:state   => "finished",
                               :status  => "Error",
                               :message => "#{request_class::TASK_DESCRIPTION} failed")
    end
  end
end

1	class ServiceReconfigureTask < MiqRequestTask	1✔
2	validate :validate_request_type, :validate_state	1✔
3
4	AUTOMATE_DRIVES = true	1✔
5
6	def self.base_model	1✔
7	ServiceReconfigureTask	×
8	end
9
10	def self.get_description(req_obj)	1✔
11	"#{request_class::TASK_DESCRIPTION} for: #{req_obj.source.name}"	2✔
12	end
13
14	def after_request_task_create	1✔
15	update_attributes(:description => get_description)	×
16	end
17
18	def deliver_to_automate(req_type = request_type, zone = nil)	1✔
19	task_check_on_execute	×
20
21	_log.info("Queuing #{request_class::TASK_DESCRIPTION}: [#{description}]...")	×
22	dialog_values = options[:dialog] \|\| {}	×
23
24	ra = source.service_template.resource_actions.find_by(:action => 'Reconfigure')	×
25	if ra	×
26	dialog_values["request"] = req_type	×
27	args = {	×
28	:object_type => self.class.name,
29	:object_id => id,
30	:namespace => ra.ae_namespace,
31	:class_name => ra.ae_class,
32	:instance_name => ra.ae_instance,
33	:automate_message => ra.ae_message.blank? ? 'create' : ra.ae_message,	×
34	:attrs => dialog_values,
35	:user_id => get_user.id,
36	:miq_group_id => get_user.current_group_id,
37	:tenant_id => get_user.current_tenant.id
38	}
39
40	MiqQueue.put(	×
41	:class_name => 'MiqAeEngine',
42	:method_name => 'deliver',
43	:args => [args],
44	:role => 'automate',
45	:zone => zone,
46	:tracking_label => tracking_label_id
47	)
48	update_and_notify_parent(:state => "pending", :status => "Ok", :message => "Automation Starting")	×
49	else
50	update_and_notify_parent(:state => "finished",	×
51	:status => "Ok",
52	:message => "#{request_class::TASK_DESCRIPTION} completed")
53	end
54	end
55
56	def after_ae_delivery(ae_result)	1✔
57	_log.info("ae_result=#{ae_result.inspect}")	×
58
59	return if ae_result == 'retry'	×
60	return if miq_request.state == 'finished'	×
61
62	if ae_result == 'ok'	×
63	source.options[:dialog] = source.options[:dialog].merge(options[:dialog]) if options[:dialog]	×
64	source.save!	×
65
66	update_and_notify_parent(:state => "finished",	×
67	:status => "Ok",
68	:message => "#{request_class::TASK_DESCRIPTION} completed")
69	else
70	update_and_notify_parent(:state => "finished",	×
71	:status => "Error",
72	:message => "#{request_class::TASK_DESCRIPTION} failed")
73	end
74	end
75	end

ManageIQ / manageiq / 83073

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous