Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/models/miq_provision_configuration_script_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ class MiqProvisionConfigurationScriptRequest < MiqRequest
TASK_DESCRIPTION = N_('Automation Manager Provisioning')
SOURCE_CLASS_NAME = 'ConfigurationScript'

default_value_for(:source_id) { |r| r.get_option(:source_id) }
default_value_for(:source_id) { |r| r.get_option(:src_configuration_script_id) }
default_value_for :source_type, "ConfigurationScript"
validates :source, :presence => true
validate :must_have_user

def self.request_task_class_from(attribs)
source_id = MiqRequestMixin.get_option(:source_id, nil, attribs['options'])
source_id = MiqRequestMixin.get_option(:src_configuration_script_id, nil, attribs['options'])
configuration_script = ::ConfigurationScript.find_by(:id => source_id)
return if configuration_script.nil?

Expand Down
3 changes: 3 additions & 0 deletions app/models/miq_provision_configuration_script_workflow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ def self.automate_dialog_request
def self.request_class
MiqProvisionConfigurationScriptRequest
end

def get_source_and_targets(_refresh = false)
end
end
14 changes: 10 additions & 4 deletions app/models/miq_provision_workflow.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@ def self.base_model
# @return [Constant] A scoped provider constant name.
#
def self.class_for_platform(platform)
classy = find_matching_constant("ManageIQ::Providers::#{platform}") ? platform : platform.classify
vendor = find_matching_constant("ManageIQ::Providers::#{platform}") ? platform : platform.classify

find_matching_constant("MiqProvision#{classy}Workflow") ||
find_matching_constant("ManageIQ::Providers::#{classy}::CloudManager::ProvisionWorkflow") ||
find_matching_constant("ManageIQ::Providers::#{classy}::InfraManager::ProvisionWorkflow")
class_names = ["MiqProvision#{vendor}Workflow"]
class_names += %w[CloudManager InfraManager AutomationManager].map { |manager_class| "ManageIQ::Providers::#{vendor}::#{manager_class}::ProvisionWorkflow"}

class_names.each do |klass|
result = find_matching_constant(klass)
return result unless result.nil?
end

nil
end

def self.find_matching_constant(string)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
:service:
:description: Catalog
:fields:
:source_id:
:src_configuration_script_id:
:values_from:
:method: :allowed_configuration_scripts
:description: Workspaces
:description: Configuration Script
:required: true
:notes:
:display: :show
:display: :edit
:data_type: :integer
:notes_display: :show
:display: :show
Expand Down
Loading