diff --git a/app/models/resource_action_workflow.rb b/app/models/resource_action_workflow.rb index 6452816d1bd..a39042d1756 100644 --- a/app/models/resource_action_workflow.rb +++ b/app/models/resource_action_workflow.rb @@ -107,7 +107,7 @@ def load_dialog(resource_action, values, options) dialog.target_resource = @target if options[:display_view_only] dialog.init_fields_with_values_for_request(values) - elsif options[:provision_workflow] + elsif options[:provision_workflow] || options[:init_defaults] dialog.initialize_value_context(values) dialog.load_values_into_fields(values, false) elsif options[:refresh] || options[:submit_workflow] diff --git a/app/models/service_template.rb b/app/models/service_template.rb index 50ca9644e19..18544591a49 100644 --- a/app/models/service_template.rb +++ b/app/models/service_template.rb @@ -448,13 +448,7 @@ def order(user_or_id, options = nil, request_options = {}, schedule_time = nil) def provision_workflow(user, dialog_options = nil, request_options = {}) dialog_options ||= {} request_options.delete(:provision_workflow) if request_options[:submit_workflow] - - ra_options = { - :target => self, - :initiator => request_options[:initiator], - :submit_workflow => request_options[:submit_workflow], - :provision_workflow => request_options[:provision_workflow] - } + ra_options = request_options.slice(:initiator, :init_defaults, :provision_workflow, :submit_workflow).merge(:target => self) ResourceActionWorkflow.new(dialog_options, user, provision_action, ra_options).tap do |wf| wf.request_options = request_options diff --git a/config/settings.yml b/config/settings.yml index a1bc36a55d5..943a1602cdd 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -970,6 +970,7 @@ :maindb: ExtManagementSystem :container_deployment_wizard: false :transformation: true + :run_automate_methods_on_service_api_submit: false :prototype: :queue_type: miq_queue :artemis: diff --git a/spec/models/resource_action_workflow_spec.rb b/spec/models/resource_action_workflow_spec.rb index 1b69ca434a6..8f4ee67191b 100644 --- a/spec/models/resource_action_workflow_spec.rb +++ b/spec/models/resource_action_workflow_spec.rb @@ -144,6 +144,15 @@ end end + context "when the options set init_defaults to true" do + let(:options) { {:init_defaults => true} } + it "calls init_fields_with_values_for_request" do + expect(dialog).to receive(:initialize_value_context).with(values).ordered + expect(dialog).to receive(:load_values_into_fields).with(values, false).ordered + ResourceActionWorkflow.new(values, nil, resource_action, options) + end + end + context "when the options are set to a refresh request" do let(:options) { {:refresh => true} } diff --git a/spec/models/service_template_spec.rb b/spec/models/service_template_spec.rb index d5fdef39e55..8613ea02998 100644 --- a/spec/models/service_template_spec.rb +++ b/spec/models/service_template_spec.rb @@ -866,6 +866,25 @@ let(:arg1) { {'ordered_by' => 'fred'} } let(:arg2) { {:initiator => 'control'} } + context "with init_defaults" do + let(:arg2) { {:init_defaults => true} } + it "provisions a service template without errors" do + expect(resource_action_workflow).to receive(:validate_dialog).and_return([]) + expect(resource_action_workflow).to receive(:make_request).and_return(miq_request) + expect(resource_action_workflow).to receive(:request_options=).with( + :init_defaults => true, :provision_workflow => true + ) + expect(service_template.provision_request(user, arg1, arg2)).to eq(miq_request) + end + it "provisions a service template with errors" do + expect(resource_action_workflow).to receive(:validate_dialog).and_return(%w(Error1 Error2)) + expect(resource_action_workflow).to receive(:request_options=).with( + :init_defaults => true, :provision_workflow => true + ) + expect { service_template.provision_request(user, arg1, arg2) }.to raise_error(RuntimeError) + end + end + it "provisions a service template without errors" do expect(resource_action_workflow).to receive(:validate_dialog).and_return([]) expect(resource_action_workflow).to receive(:make_request).and_return(miq_request)