Merge pull request #9683 from agrare/miq_provision_configuration_script_service_catalog

Updates for ConfigurationScript Service Provisioning

Author: Fryguy

app/controllers/application_controller/miq_request_methods.rb

@@ -32,6 +32,8 @@ def prov_field_changed
       @record =
         if @edit[:new][:src_configured_system_ids].present?
           PhysicalServer.where(:id => @edit[:new][:src_configured_system_ids].first).first
+        elsif @edit[:new][:src_configuration_script_id].present?
+          ConfigurationScript.where(:id => Array(@edit[:new][:src_configuration_script_id]).first)
         else
           MiqTemplate.where(:id => Array(@edit[:new][:src_vm_id]).first)
         end
@@ -310,6 +312,14 @@ def sort_configured_system_grid
     sort_grid('configured_system', @edit[:wf].get_field(:src_configured_system_ids, :service)[:values])
   end
 
+  # get the sort column that was clicked on, else use the current one
+  def sort_configuration_script_grid
+    assert_privileges("miq_request_edit")
+    return unless load_edit("prov_edit__#{params[:id]}", "show_list")
+
+    sort_grid('configuration_script', @edit[:wf].get_field(:src_configuration_script_id, :service)[:values])
+  end
+
   # get the sort column that was clicked on, else use the current one
   def sort_pxe_img_grid
     assert_privileges("miq_request_edit")
@@ -380,6 +390,15 @@ def build_configured_system_grid(configured_systems, sort_order = nil, sort_by =
     @configured_systems = _build_whatever_grid('configured_system', configured_systems, headers, sort_order, sort_by)
   end
 
+  def build_configuration_script_grid(configuration_scripts, sort_order = nil, sort_by = nil)
+    sort_by ||= "name"
+    sort_order ||= "ASC"
+
+    headers = {"name" => _("Name"), "description" => _("Description"), "manager_name" => _("Provider Name")}
+
+    @configuration_scripts = _build_whatever_grid("configuration_script", configuration_scripts, headers, sort_order, sort_by)
+  end
+
   def build_pxe_img_grid(pxe_imgs, sort_order = nil, sort_by = nil)
     sort_by ||= "name"
     sort_order ||= "ASC"
@@ -516,6 +535,13 @@ def build_grid
     case @edit[:wf]
     when MiqProvisionConfiguredSystemWorkflow
       build_dialog_page_miq_provision_configured_system_workflow
+    when MiqProvisionConfigurationScriptWorkflow
+      case @edit[:new][:current_tab_key]
+      when :purpose
+        build_tags_for_provisioning(@edit[:wf], @edit.fetch_path(:new, tag_symbol_for_workflow), true)
+      when :service
+        build_configuration_script_grid(@edit[:wf].get_field(:src_configuration_script_id, :service)[:values], @edit[:configuration_script_sortdir], @edit[:configuration_script_sortcol])
+      end
     when MiqProvisionVirtWorkflow
       if @edit[:new][:current_tab_key] == :service
         if @edit[:new][:st_prov_type]
@@ -580,6 +606,7 @@ def dialog_partial_for_workflow
     when ManageIQ::Providers::Foreman::ConfigurationManager::ProvisionWorkflow then "prov_configured_system_foreman_dialog"
     when VmMigrateWorkflow then "prov_vm_migrate_dialog"
     when PhysicalServerProvisionWorkflow then "prov_physical_server_dialog"
+    when MiqProvisionConfigurationScriptWorkflow then "prov_configuration_script_dialog"
     end
   end
 
@@ -805,6 +832,10 @@ def prov_get_form_vars
               elsif v.id.to_i == val.to_i
                 @edit[:new][f.to_sym] = [val, v.name] # Save [value, description]
               end
+            elsif evm_object_class == :ConfigurationScriptBase
+              if v.id.to_i == val.id.to_i
+                @edit[:new][f.to_sym] = [val, v.name] # Save [value, name]
+              end
             elsif v[1].to_i == val.to_i
               @edit[:new][f.to_sym] = [val, v[0]] # Save [value, description]
             end
@@ -933,7 +964,8 @@ def prov_set_form_vars(req = nil)
       end
 
       if @edit[:wf].kind_of?(ManageIQ::Providers::Foreman::ConfigurationManager::ProvisionWorkflow) ||
-         @edit[:wf].kind_of?(PhysicalServerProvisionWorkflow)
+         @edit[:wf].kind_of?(PhysicalServerProvisionWorkflow) ||
+         @edit[:wf].kind_of?(MiqProvisionConfigurationScriptWorkflow)
         # BD TODO
       else
         @edit[:ds_sortdir] ||= "DESC"

app/helpers/request_info_helper.rb

@@ -3,7 +3,7 @@ module RequestInfoHelper
 
   PROV_FIELD_TYPES = [:vm, :host, :ds, :template, :vc, :pxe_img, :iso_img, :window_image].freeze
 
-  PROV_FIELDS = [:src_vm_id, :placement_host_name, :placement_ds_name, :attached_ds, :sysprep_custom_spec, :customization_template_id, :pxe_image_id, :iso_image_id, :windows_image_id].freeze
+  PROV_FIELDS = [:src_vm_id, :placement_host_name, :placement_ds_name, :attached_ds, :sysprep_custom_spec, :customization_template_id, :pxe_image_id, :iso_image_id, :windows_image_id, :src_configuration_script_id].freeze
 
   def provision_tab_configuration(workflow)
     prov_tab_labels = workflow.provisioning_tab_list.pluck(:name)
@@ -54,6 +54,8 @@ def prov_grid_data(field, field_id, spec_required)
              {:type => :iso_img, :iso_img => @iso_imgs}
            when :windows_image_id
              {:type => :window_image, :window_images => @windows_images}
+           when :src_configuration_script_id
+             {:type => :configuration_script, :configuration_scripts => @configuration_scripts}
            else
              {}
            end
@@ -93,6 +95,20 @@ def prov_vm_data(data)
     {:headers => headers, :rows => rows, :selected => :src_vm_id, :none_index => data[:none_index]}
   end
 
+  def prov_configuration_script_data(data)
+    edit = data[:edit]
+    headers = prov_grid_configuration_script_header(edit, data[:configuration_scripts], data[:type])
+    rows = []
+    if data[:configuration_scripts]
+      rows += data[:configuration_scripts].map do |configuration_script|
+        prov_row_item(configuration_script.id.to_s, prov_configuration_script_grid_cells(configuration_script))
+      end
+    else
+      rows.push({:id => data[:script].id.to_s, :clickable => true, :cells => prov_configuration_script_grid_cells(data[:script])})
+    end
+    {:headers => headers, :rows => rows, :selected => :src_configuration_script_id, :none_index => data[:none_index]}
+  end
+
   def prov_host_data(data)
     edit = data[:edit]
     options = edit || data[:options_data]
@@ -200,6 +216,20 @@ def prov_grid_vm_header(edit, clones, vms, type)
     headers
   end
 
+  def prov_grid_configuration_script_header(edit, configuration_scripts, type)
+    header_keys = prov_header_keys(type.to_s)
+    headers = []
+    edit[header_keys[:columns]].each_with_index do |h, index|
+      item = prov_grid_header_item(edit[header_keys[:headers]][h])
+      if configuration_scripts
+        item[:sort_choice] = h
+        item[:sort_data] = prov_sort_data(edit, index, header_keys)
+      end
+      headers.push(item)
+    end
+    headers
+  end
+
   def prov_grid_host_header(edit, options, type)
     header_keys = prov_header_keys(type.to_s)
     headers = []
@@ -272,6 +302,14 @@ def prov_vm_grid_cells(data, edit)
     cells
   end
 
+  def prov_configuration_script_grid_cells(data)
+    [
+      prov_cell_data(data.name),
+      prov_cell_data(data.description),
+      prov_cell_data(data.manager_name)
+    ]
+  end
+
   def prov_host_grid_cells(data, options)
     options[:host_columns].map do |col|
       prov_cell_data(data.send(col))

app/views/miq_request/_prov_configuration_script_dialog.html.haml

@@ -0,0 +1,58 @@
+-# wf          The workflow object currently in use
+-# dialog      The name (symbol) of the selected dialog
+
+- current_tab = @edit && @edit[:new] ? @edit[:new][:current_tab_key] : @options[:current_tab_key]
+%br
+
+- if dialog == current_tab
+  - case current_tab
+  - when :requester
+    - keys = [:owner_email, :owner_first_name, :owner_last_name, :owner_address, :owner_city, :owner_state, :owner_zip, :owner_country, :owner_title, :owner_company, :owner_department, :owner_office, :owner_phone, :owner_phone_mobile, :request_notes]
+    = render(:partial => "prov_dialog_fieldset",
+             :locals => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("Request Information"),
+                :keys  => keys})
+    - keys = [:owner_manager, :owner_manager_mail, :owner_manager_mail]
+    = render(:partial => "prov_dialog_fieldset",
+             :locals  => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("Manager"),
+               :keys   => keys})
+  - when :purpose
+    - keys = [:tag_ids]
+    = render(:partial => "prov_dialog_fieldset",
+             :locals  => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("Select Tags to apply"),
+               :keys   => keys})
+  - when :service
+    - keys = [:src_configuration_script_id]
+    = render(:partial => "prov_dialog_fieldset",
+             :locals  => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("Configuration Scripts"),
+               :keys   => keys})
+  - when :customize
+    - keys = [:root_password]
+    = render(:partial => "prov_dialog_fieldset",
+             :locals => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("Credentials"),
+               :prefix => "miq_request/",
+               :keys   => keys})
+    - keys = [:hostname, :ip_addr]
+    = render(:partial => "prov_dialog_fieldset",
+             :locals  => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("IP Address Information"),
+               :prefix => "miq_request/",
+               :keys   => keys})
+  - when :schedule
+    - has_schedule_time = (@edit && @edit[:new] && @edit[:new][:schedule_type] && @edit[:new][:schedule_type][0] == "schedule") || (@options && @options[:schedule_type] && @options[:schedule_type][0] == "schedule")
+    - keys = [:schedule_type, has_schedule_time ? :schedule_time : nil, :stateless].compact
+    = render(:partial => "prov_dialog_fieldset",
+             :locals  => {:workflow => wf,
+               :dialog => dialog,
+               :label  => _("Schedule Info"),
+               :keys   => keys})

app/views/miq_request/_prov_field.html.haml

@@ -200,6 +200,7 @@
       - elsif [:placement_folder_name].include?(field)
         -# wider Pull Down field that fits into 1280 wide screens
         .col-md-8
+          - field_hash[:display] = :edit
           - if @edit && field_hash[:display] == :edit && !@edit[:stamp_typ]
             -# Allow editing of this pulldown field
             - if field_hash[:values].blank?
@@ -301,7 +302,7 @@
                :placement_cluster_name, :placement_dc_name, :placement_ds_name,
                :placement_ems_name, :placement_host_name, :placement_rp_name,
                :pxe_image_id, :windows_image_id, :src_configured_system_ids,
-               :src_host_ids, :src_vm_id, :sysprep_custom_spec,
+               :src_host_ids, :src_vm_id, :src_configuration_script_id, :sysprep_custom_spec,
                :customization_template_id].include?(field)
         -# Pull Down fields that need to be sorted on description
         .col-md-8

config/routes.rb

@@ -2226,6 +2226,7 @@
         retrieve_email
         show_list
         sort_configured_system_grid
+        sort_configuration_script_grid
         sort_ds_grid
         sort_host_grid
         sort_iso_img_grid

spec/config/routes.pending.yml

@@ -835,6 +835,7 @@ MiqRequestController:
 - retrieve_email
 - show
 - show_list
+- sort_configuration_script_grid
 - sort_configured_system_grid
 - sort_ds_grid
 - sort_host_grid