Merge pull request #9415 from agrare/fix_configuration_job_controller_ansible_tower

Fix `ConfigurationJobController` using AnsibleTower

Author: GilbertCherrie

app/controllers/configuration_job_controller.rb

@@ -10,7 +10,7 @@ class ConfigurationJobController < ApplicationController
   include Mixins::BreadcrumbsMixin
 
   def self.model
-    ManageIQ::Providers::AnsibleTower::AutomationManager::Job
+    ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack
   end
 
   def self.table_name
@@ -36,7 +36,7 @@ def button
     when "configuration_job_delete"
       configuration_job_delete
     when "configuration_job_tag"
-      tag(ManageIQ::Providers::AnsibleTower::AutomationManager::Job)
+      tag(self.class.model)
     when "configuration_job_reload"
       # TODO: this line is not needed when feature name "configuration_job_reload" will exist
       assert_privileges("configuration_job_control")
@@ -72,7 +72,6 @@ def breadcrumbs_options
     {
       :breadcrumbs => [
         {:title => _("Automation")},
-        {:title => _("Ansible Tower")},
         {:title => _("Jobs"), :url => controller_url},
       ],
     }

app/controllers/orchestration_stack_controller.rb

@@ -31,7 +31,7 @@ def display_children
 
   def show_list
     process_show_list(
-      :named_scope => [[:without_type, 'ManageIQ::Providers::AnsibleTower::AutomationManager::Job']]
+      :named_scope => [[:without_type, 'ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack']]
     )
   end
 

app/helpers/application_helper.rb

@@ -424,7 +424,8 @@ def db_to_controller(db, action = "show")
         "ManageIQ::Providers::CloudManager::CloudDatabase",
         "ManageIQ::Providers::ConfigurationManager",
         "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfiguredSystem",
-        "ManageIQ::Providers::AnsibleTower::AutomationManager::Job", "ConfigurationScript"
+        "ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack",
+        "ConfigurationScript"
       controller = request.parameters[:controller]
     when "ContainerVolume"
       controller = "persistent_volume"

app/views/layouts/_tag_edit_items.html.haml

@@ -3,8 +3,8 @@
   %h3
     - t = {:amount => @tagitems.length, :object => ui_lookup(:model => @edit[:tagging]), :objects => ui_lookup(:models => @edit[:tagging])}
     - case @edit[:tagging]
-      - when "ManageIQ::Providers::AnsibleTower::AutomationManager::Job"
-        = n_("%{amount} Ansible Tower Job Being Tagged", "%{amount} Ansible Tower Jobs Being Tagged", @tagitems.length) % t
+      - when "ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack"
+        = n_("%{amount} Automation Job Being Tagged", "%{amount} Automation Jobs Being Tagged", @tagitems.length) % t
       - when "ManageIQ::Providers::AnsibleTower::AutomationManager"
         = n_("%{amount} Automation Manager (Ansible Tower) Being Tagged", "%{amount} Automation Managers (Ansible Tower) Being Tagged", @tagitems.length) % t
       - when "AvailabilityZone"

product/views/ManageIQ_Providers_AnsibleTower_AutomationManager_Job.yaml renamed to product/views/ManageIQ_Providers_ExternalAutomationManager_OrchestrationStack.yaml

@@ -9,13 +9,13 @@
 #
 
 # Report title
-title: Ansible Tower Jobs
+title: Automation Jobs
 
 # Menu name
-name: Ansible Tower Job
+name: Automation Job
 
 # Main DB table report is based on
-db: ManageIQ::Providers::AnsibleTower::AutomationManager::Job
+db: ManageIQ::Providers::ExternalAutomationManager::OrchestrationStack
 
 # Columns to fetch from the main table
 cols:

spec/controllers/configuration_job_controller_spec.rb

@@ -9,7 +9,7 @@
 
   describe '#show' do
     context "instances" do
-      let(:record) { FactoryBot.create(:ansible_tower_job) }
+      let(:record) { FactoryBot.create(:awx_job) }
 
       before do
         session[:settings] = {
@@ -39,7 +39,7 @@
     let!(:user) { stub_user(:features => :all) }
     before do
       EvmSpecHelper.create_guid_miq_server_zone
-      @cj = FactoryBot.create(:ansible_tower_job, :name => "testJob")
+      @cj = FactoryBot.create(:awx_job, :name => "testJob")
       allow(@cj).to receive(:tagged_with).with(:cat => user.userid).and_return("my tags")
       classification = FactoryBot.create(:classification, :name => "department", :description => "Department")
       @tag1 = FactoryBot.create(:classification_tag,
@@ -49,10 +49,10 @@
                                  :name   => "tag2",
                                  :parent => classification)
       allow(Classification).to receive(:find_assigned_entries).with(@cj).and_return([@tag1, @tag2])
-      session[:tag_db] = "ManageIQ::Providers::AnsibleTower::AutomationManager::Job"
+      session[:tag_db] = "ManageIQ::Providers::Awx::AutomationManager::Job"
       edit = {
-        :key        => "ManageIQ::Providers::AnsibleTower::AutomationManager::Job_edit_tags__#{@cj.id}",
-        :tagging    => "ManageIQ::Providers::AnsibleTower::AutomationManager::Job",
+        :key        => "ManageIQ::Providers::Awx::AutomationManager::Job_edit_tags__#{@cj.id}",
+        :tagging    => "ManageIQ::Providers::Awx::AutomationManager::Job",
         :object_ids => [@cj.id],
         :current    => {:assignments => []},
         :new        => {:assignments => [@tag1.id, @tag2.id]}
@@ -84,5 +84,5 @@
     end
   end
 
-  include_examples '#download_summary_pdf', :ansible_tower_job
+  include_examples '#download_summary_pdf', :awx_job
 end