Merge pull request #15007 from bzwei/retire_playbook_update

Service Playbook updates fqname and configuration_template

app/models/service_template.rb

@@ -26,6 +26,7 @@ class ServiceTemplate < ApplicationRecord
 
   RESOURCE_ACTION_UPDATE_ATTRS = [:dialog,
                                   :dialog_id,
+                                  :fqname,
                                   :configuration_template,
                                   :configuration_template_id,
                                   :configuration_template_type].freeze

app/models/service_template_ansible_playbook.rb

@@ -47,18 +47,9 @@ def self.create_catalog_item(options, auth_user)
 
     transaction do
       create_from_options(options).tap do |service_template|
-        [:provision, :retirement, :reconfigure].each do |action|
-          action_info = enhanced_config[action]
-          next unless service_template.send(:new_dialog_required?, action_info)
-
-          dialog_name  = action_info[:new_dialog_name]
-          job_template = action_info[:configuration_template]
-          hosts        = action_info[:hosts]
-
-          new_dialog = service_template.send(:create_new_dialog, dialog_name, job_template, hosts)
-          action_info[:dialog] = new_dialog
-          service_template.options[:config_info][action][:dialog_id] = new_dialog.id
-        end
+        dialog_ids = service_template.send(:create_dialogs, enhanced_config)
+        enhanced_config.deep_merge!(dialog_ids)
+        service_template.options[:config_info].deep_merge!(dialog_ids)
         service_template.create_resource_actions(enhanced_config)
       end
     end
@@ -141,7 +132,7 @@ def self.validate_config_info(info)
 
 
   def job_template(action)
-    resource_actions.find_by(:action => action.to_s.capitalize).try(:configuration_template)
+    resource_actions.find_by(:action => action.capitalize).try(:configuration_template)
   end
 
   def update_catalog_item(options, auth_user = nil)
@@ -151,10 +142,15 @@ def update_catalog_item(options, auth_user = nil)
 
     update_job_templates(name, description, config_info, auth_user)
 
-    updated_config = config_info.deep_merge(self.class.send(:create_job_templates, name, description, config_info, auth_user, self))
+    config_info.deep_merge!(self.class.send(:create_job_templates, name, description, config_info, auth_user, self))
 
-    create_dialogs(updated_config)
-    options[:config_info] = updated_config
+    [:provision, :retirement, :reconfigure].each do |action|
+      next unless config_info.key?(action)
+      config_info[action][:configuration_template] ||= job_template(action)
+    end
+    config_info.deep_merge!(create_dialogs(config_info))
+
+    options[:config_info] = config_info
 
     super
   end
@@ -186,19 +182,19 @@ def check_retirement_potential
   end
 
   def create_dialogs(config_info)
-    [:provision, :retirement, :reconfigure].each do |action|
+    [:provision, :retirement, :reconfigure].each_with_object({}) do |action, hash|
       info = config_info[action]
-      if new_dialog_required?(info)
-        info[:dialog_id] = create_new_dialog(info[:new_dialog_name], job_template(action), info[:hosts]).id
-      end
+      next unless new_dialog_required?(info)
+      hash[action] = {:dialog_id => create_new_dialog(info[:new_dialog_name], info[:configuration_template], info[:hosts]).id}
     end
   end
 
-  def delete_job_templates(job_templates)
+  def delete_job_templates(job_templates, action = nil)
     auth_user = User.current_userid || 'system'
     job_templates.each do |job_template|
       ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationScript
         .delete_in_provider_queue(job_template.manager.id, { :manager_ref => job_template.manager_ref }, auth_user)
+      resource_actions.find_by(:action => action.capitalize).update_attributes(:configuration_template => nil) if action
     end
   end
 
@@ -224,7 +220,7 @@ def update_job_templates(name, description, config_info, auth_user)
         params[:manager_ref] = job_template(action).manager_ref
         ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationScript.update_in_provider_queue(tower.id, params, auth_user)
       else
-        delete_job_templates([job_template])
+        delete_job_templates([job_template], action)
       end
     end
   end
@@ -233,4 +229,15 @@ def validate_update_config_info(options)
     opts = super
     self.class.send(:validate_config_info, opts)
   end
+
+  # override
+  def update_service_resources(_config_info, _auth_user = nil)
+    # do nothing since no service resources for this template
+  end
+
+  # override
+  def update_from_options(params)
+    options[:config_info] = Hash[params[:config_info].collect { |k, v| [k, v.except(:configuration_template)] }]
+    update_attributes!(params.except(:config_info))
+  end
 end

spec/models/service_template_ansible_playbook_spec.rb

@@ -223,6 +223,7 @@
       new_dialog_record = Dialog.where(:label => new_dialog_label).first
       expect(new_dialog_record).to be_truthy
       expect(service_template.resource_actions.first.dialog.id).to eq new_dialog_record.id
+      expect(service_template.options[:config_info][:provision]).not_to have_key(:configuration_template)
     end
 
     it 'uses the existing dialog if :dialog_id is passed in' do

spec/models/service_template_spec.rb

@@ -586,11 +586,11 @@
           :instance_type           => [flavor.id, flavor.name],
           :src_ems_id              => [ems.id, ems.name],
           :provision               => {
-            :fqname    => ra1.fqname,
+            :fqname    => 'a1/b1/c1',
             :dialog_id => nil
           },
           :reconfigure             => {
-            :fqname    => ra3.fqname,
+            :fqname    => 'x1/y1/z1',
             :dialog_id => service_dialog.id
           }
         }
@@ -608,7 +608,9 @@
       # Removes Retirement / Adds Reconfigure
       expect(updated.resource_actions.pluck(:action)).to match_array(%w(Provision Reconfigure))
       expect(updated.resource_actions.first.dialog_id).to be_nil # Removes the dialog from Provision
+      expect(updated.resource_actions.first.fqname).to eq('/a1/b1/c1')
       expect(updated.resource_actions.last.dialog).to eq(service_dialog)
+      expect(updated.resource_actions.last.fqname).to eq('/x1/y1/z1')
       expect(updated.name).to eq('Updated Template Name')
       expect(updated.service_resources.first.resource.source_id).to eq(new_vm.id) # Validate request update
       expect(updated.config_info).to eq(updated_catalog_item_options[:config_info])