Merge pull request #23637 from agrare/miq_provision_configuration_script_service_catalog_ui

Updates for ConfigurationScript Service UI

Author: Fryguy

app/models/configuration_script_base.rb

@@ -10,6 +10,8 @@ class ConfigurationScriptBase < ApplicationRecord
   belongs_to :parent,               :class_name => "ConfigurationScriptBase"
   belongs_to :miq_task
 
+  delegate :name, :to => :manager, :prefix => true
+
   has_many   :children,
              :class_name  => "ConfigurationScriptBase",
              :foreign_key => "parent_id",

app/models/manageiq/providers/base_manager.rb

@@ -19,6 +19,11 @@ def self.catalog_types
     end
     delegate :catalog_types, :to => :class
 
+    # Return the names of all of the manager types e.g.: InfraManager, CloudManager, etc...
+    def self.manager_type_names
+      @manager_types ||= subclasses.map { |k| k.name.gsub("ManageIQ::Providers::", "") }
+    end
+
     def refresher
       self.class::Refresher
     end

app/models/miq_provision_configuration_script_request.rb

@@ -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?
 

app/models/miq_provision_configuration_script_task.rb

@@ -1,2 +1,5 @@
 class MiqProvisionConfigurationScriptTask < MiqRequestTask
+  def self.get_description(req_obj)
+    "#{request_class::TASK_DESCRIPTION} for: #{req_obj.source.name}"
+  end
 end

app/models/miq_provision_configuration_script_workflow.rb

@@ -14,4 +14,7 @@ def self.automate_dialog_request
   def self.request_class
     MiqProvisionConfigurationScriptRequest
   end
+
+  def get_source_and_targets(_refresh = false)
+  end
 end

app/models/miq_provision_workflow.rb

@@ -15,11 +15,19 @@ 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 += ManageIQ::Providers::BaseManager
+      .manager_type_names
+      .map { |manager_type| "ManageIQ::Providers::#{vendor}::#{manager_type}::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)

product/dialogs/miq_dialogs/miq_provision_configuration_script_dialogs.yaml

@@ -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

spec/models/miq_provision_configuration_script_request_spec.rb

@@ -2,19 +2,19 @@
   let(:admin)                { FactoryBot.create(:user) }
   let(:ems)                  { FactoryBot.create(:automation_manager, :url => "https://localhost") }
   let(:configuration_script) { FactoryBot.create(:configuration_script, :manager => ems) }
-  let(:request)              { FactoryBot.create(:miq_provision_configuration_script_request, :requester => admin, :options => {:source_id => [configuration_script.id]}) }
+  let(:request)              { FactoryBot.create(:miq_provision_configuration_script_request, :requester => admin, :options => {:src_configuration_script_id => [configuration_script.id]}) }
 
   describe ".request_task_class_from" do
     it "retrieves the request task class" do
-      options = {:source_id => configuration_script.id}
+      options = {:src_configuration_script_id => configuration_script.id}
 
       expect(described_class.request_task_class_from("options" => options)).to eq(ems.class::Provision)
     end
   end
 
   describe ".new_request_task" do
     it "returns the provision task" do
-      options = {:source_id => configuration_script.id}
+      options = {:src_configuration_script_id => configuration_script.id}
 
       request_task = described_class.new_request_task("options" => options)
       expect(request_task).to have_attributes(:options => options, :state => "pending")