foreman_rh_cloud 13.0.8 → 13.0.10

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.8'.freeze
+  VERSION = '13.0.10'.freeze
 end

data/lib/inventory_sync/async/inventory_hosts_sync.rb

@@ -8,8 +8,6 @@ module InventorySync
       set_callback :step, :around, :create_missing_hosts
 
       def plan(organizations)
-        # Do not run for local advisor, since we use sub-man id to identify hosts.
-        return if ForemanRhCloud.with_iop_smart_proxy?
         # by default the tasks will be executed concurrently
         super(organizations)
         plan_self_host_sync

data/lib/tasks/rh_cloud_inventory.rake

@@ -12,9 +12,11 @@ namespace :rh_cloud_inventory do
       User.as_anonymous_admin do
         organizations.each do |organization|
           ForemanTasks.async_task(
-            ForemanInventoryUpload::Async::GenerateReportJob,
+            ForemanInventoryUpload::Async::HostInventoryReportJob,
             ForemanInventoryUpload.generated_reports_folder,
-            organization.id
+            organization.id,
+            '', # hosts_filter
+            true # upload
           )
           puts "Generated and uploaded inventory report for organization '#{organization.name}'"
         end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "13.0.8",
+  "version": "13.0.10",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/accounts_controller_test.rb

@@ -5,22 +5,21 @@ class AccountsControllerTest < ActionController::TestCase
 
   include FolderIsolation
 
-  test 'Returns statuses for each process type' do
+  test 'Returns statuses for each organization' do
     test_org = FactoryBot.create(:organization)
 
-    generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id)
-    generate_output = ForemanInventoryUpload::Async::ProgressOutput.register(generate_label)
-    generate_output.status = 'generate_status_test'
-    upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
-    upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
-    upload_output.status = 'upload_status_test'
-
     get :index, session: set_session_user
 
     assert_response :success
     actual = JSON.parse(response.body)
-    actual_account_statuses = actual['accounts'][test_org.label]
-    assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
-    assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
+    assert actual['accounts'].key?(test_org.name)
+    actual_account = actual['accounts'][test_org.name]
+
+    # Verify the response structure
+    assert_includes actual_account.keys, 'generated_status'
+    assert_includes actual_account.keys, 'uploaded_status'
+    assert_includes actual_account.keys, 'generate_task'
+    assert_includes actual_account.keys, 'report_file_paths'
+    assert_equal test_org.id, actual_account['id']
   end
 end

data/test/controllers/insights_cloud/api/cloud_request_controller_test.rb

@@ -29,8 +29,7 @@ module InsightsCloud::Api
       mock_composer = mock('composer')
       ::JobInvocationComposer.expects(:for_feature).with do |feature, host_ids, params|
         feature == :rh_cloud_connector_run_playbook &&
-        host_ids.first == host1.id &&
-        host_ids.last == host2.id
+        host_ids.sort == [host1.id, host2.id].sort
       end.returns(mock_composer)
       mock_composer.expects(:trigger!)
       mock_composer.expects(:job_invocation)

data/test/jobs/host_inventory_report_job_test.rb

@@ -15,13 +15,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   end
 
   test 'plan schedules GenerateHostReport action' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, upload)
 
     assert_action_planned_with(
       action,
@@ -35,13 +31,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'plan schedules QueueForUploadJob when upload is true' do
     expected_archive_name = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      true
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
 
     assert_action_planned_with(
       action,
@@ -53,24 +45,17 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   end
 
   test 'plan skips QueueForUploadJob when upload is false' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      false
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, false)
 
     refute_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
   end
 
   test 'plan defaults upload to true when not specified' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter)
 
     assert_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
   end
@@ -78,13 +63,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'plan schedules CreateMissingInsightsFacets when IoP is enabled' do
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, upload)
 
     assert_action_planned_with(
       action,
@@ -96,13 +77,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'plan skips CreateMissingInsightsFacets when IoP is disabled' do
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, upload)
 
     refute_action_planned(action, ForemanInventoryUpload::Async::CreateMissingInsightsFacets)
   end
@@ -110,13 +87,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'plan schedules all three actions with IoP enabled and upload true' do
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      true
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
 
     assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
     assert_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
@@ -126,13 +99,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'plan schedules only generation and facets with IoP enabled and upload false' do
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      false
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, false)
 
     assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
     refute_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
@@ -140,25 +109,17 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   end
 
   test 'humanized_name returns correct string' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      hosts_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, upload)
 
     assert_equal 'Host inventory report job', action.humanized_name
   end
 
   test 'handles empty hosts_filter parameter' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      '',
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, '', upload)
 
     assert_action_planned_with(
       action,
@@ -173,13 +134,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
     custom_filter = 'name~production'
     expected_archive_name = ForemanInventoryUpload.facts_archive_name(organization.id, custom_filter)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      custom_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, custom_filter, upload)
 
     assert_action_planned_with(
       action,
@@ -200,13 +157,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'handles invalid hosts_filter parameter' do
     invalid_filter = 'name~~'
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      invalid_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, invalid_filter, upload)
 
     # Job should still plan even with invalid filter syntax
     assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
@@ -215,13 +168,9 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'handles potentially malicious hosts_filter parameter' do
     malicious_filter = "'; DROP TABLE hosts; --"
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      malicious_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, malicious_filter, upload)
 
     # Job should handle malicious input safely (filter is parameterized)
     assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
@@ -230,15 +179,130 @@ class HostInventoryReportJobTest < ActiveSupport::TestCase
   test 'handles non-matching hosts_filter parameter' do
     non_matching_filter = 'name~doesnotexist'
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::HostInventoryReportJob,
-      base_folder,
-      organization.id,
-      non_matching_filter,
-      upload
-    )
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, non_matching_filter, upload)
 
     # Job should plan successfully even if filter matches no hosts
     assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
   end
+
+  test 'organization returns correct Organization from input' do
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, upload)
+
+    assert_equal organization.id, action.organization.id
+    assert_instance_of Organization, action.organization
+  end
+
+  test 'resource_locks returns :link' do
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+
+    assert_equal :link, action.resource_locks
+  end
+
+  test 'report_file_path returns nil when no file exists' do
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
+
+    assert_nil action.report_file_path
+  end
+
+  test 'report_file_path finds file in done folder for upload tasks' do
+    filename = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
+    done_path = ForemanInventoryUpload.done_file_path(filename)
+
+    # Create the done file
+    FileUtils.mkdir_p(File.dirname(done_path))
+    FileUtils.touch(done_path)
+
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
+
+    assert_equal done_path, action.report_file_path
+
+    # Cleanup
+    FileUtils.rm_f(done_path)
+  end
+
+  test 'report_file_path finds file in uploads folder for upload tasks' do
+    filename = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
+    uploads_path = ForemanInventoryUpload.uploads_file_path(filename)
+
+    # Create the uploads file
+    FileUtils.mkdir_p(File.dirname(uploads_path))
+    FileUtils.touch(uploads_path)
+
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
+
+    assert_equal uploads_path, action.report_file_path
+
+    # Cleanup
+    FileUtils.rm_f(uploads_path)
+  end
+
+  test 'report_file_path finds file in generated_reports folder for upload tasks' do
+    filename = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
+    generated_path = File.join(base_folder, filename)
+
+    # Create the generated file
+    FileUtils.mkdir_p(base_folder)
+    FileUtils.touch(generated_path)
+
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
+
+    assert_equal generated_path, action.report_file_path
+  end
+
+  test 'report_file_path only checks generated_reports folder for non-upload tasks' do
+    filename = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
+    generated_path = File.join(base_folder, filename)
+    done_path = ForemanInventoryUpload.done_file_path(filename)
+
+    # Create files in both locations
+    FileUtils.mkdir_p(base_folder)
+    FileUtils.touch(generated_path)
+    FileUtils.mkdir_p(File.dirname(done_path))
+    FileUtils.touch(done_path)
+
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, false)
+
+    # Should return the generated_path, not the done_path (since upload=false)
+    assert_equal generated_path, action.report_file_path
+
+    # Cleanup
+    FileUtils.rm_f(done_path)
+  end
+
+  test 'report_file_path prioritizes done folder over uploads folder' do
+    filename = ForemanInventoryUpload.facts_archive_name(organization.id, hosts_filter)
+    done_path = ForemanInventoryUpload.done_file_path(filename)
+    uploads_path = ForemanInventoryUpload.uploads_file_path(filename)
+
+    # Create files in both locations
+    FileUtils.mkdir_p(File.dirname(done_path))
+    FileUtils.touch(done_path)
+    FileUtils.mkdir_p(File.dirname(uploads_path))
+    FileUtils.touch(uploads_path)
+
+    action = create_action(ForemanInventoryUpload::Async::HostInventoryReportJob)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, organization.id, hosts_filter, true)
+
+    # Should prefer done_path (uploaded) over uploads_path (queued)
+    assert_equal done_path, action.report_file_path
+
+    # Cleanup
+    FileUtils.rm_f(done_path)
+    FileUtils.rm_f(uploads_path)
+  end
 end

data/test/jobs/queue_for_upload_job_test.rb

@@ -11,13 +11,6 @@ class QueueForUploadJobTest < ActiveSupport::TestCase
   let(:uploads_folder) { ForemanInventoryUpload.uploads_folder }
 
   setup do
-    # Stub the script template source
-    script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-    File.stubs(:read).with(script_source).returns('#!/bin/bash\necho "Test script"')
-
-    # Stub template rendering
-    Foreman::Renderer.stubs(:render).returns('#!/bin/bash\necho "Rendered script"')
-
     # Stub additional settings that are accessed
     Setting.stubs(:[]).with(:content_default_http_proxy).returns(nil)
     Setting.stubs(:[]).with(:http_proxy).returns(nil)
@@ -49,7 +42,7 @@ class QueueForUploadJobTest < ActiveSupport::TestCase
     assert File.exist?(File.join(uploads_folder, report_file)), "File should exist in uploads folder"
   end
 
-  test 'creates necessary folders and scripts' do
+  test 'creates necessary folders' do
     ForemanInventoryUpload::Async::QueueForUploadJob.any_instance.stubs(:plan_upload_report)
 
     action = create_and_plan_action(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization.id)
@@ -57,9 +50,5 @@ class QueueForUploadJobTest < ActiveSupport::TestCase
 
     # Verify the uploads folder was created
     assert Dir.exist?(uploads_folder), "Uploads folder should be created"
-
-    # Verify the script file was created
-    script_path = File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
-    assert File.exist?(script_path), "Upload script should be created"
   end
 end

data/test/jobs/single_host_report_job_test.rb

@@ -28,12 +28,10 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
   end
 
   test 'plan sets host_id in input' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_equal @host.id, action.input[:host_id]
   end
@@ -41,12 +39,10 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
   test 'plan calls super with id filter' do
     expected_filter = "id=#{@host.id}"
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_action_planned_with(
       action,
@@ -58,12 +54,10 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
   end
 
   test 'inherits behavior from HostInventoryReportJob' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     # Should schedule all parent actions
     assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
@@ -71,12 +65,10 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
   end
 
   test 'humanized_name includes hostname' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_equal "Single-host report job for host #{@host.name}", action.humanized_name
   end
@@ -84,34 +76,28 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
   test 'humanized_name handles missing host' do
     non_existent_host_id = 999_999
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      non_existent_host_id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, non_existent_host_id)
 
     assert_equal 'Single-host report job', action.humanized_name
   end
 
   test 'hostname method returns correct name' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_equal @host.name, action.hostname(@host.id)
   end
 
   test 'hostname method handles nil gracefully' do
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_nil action.hostname(999_999)
   end
@@ -120,12 +106,10 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
     expected_filter = "id=#{@host.id}"
     expected_archive_name = ForemanInventoryUpload.facts_archive_name(@host.organization_id, expected_filter)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_action_planned_with(
       action,
@@ -139,12 +123,10 @@ class SingleHostReportJobTest < ActiveSupport::TestCase
   test 'respects IoP mode for facet creation' do
     ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
-    action = create_and_plan_action(
-      ForemanInventoryUpload::Async::SingleHostReportJob,
-      base_folder,
-      @host.organization_id,
-      @host.id
-    )
+    action = create_action(ForemanInventoryUpload::Async::SingleHostReportJob)
+    organization = Organization.find(@host.organization_id)
+    action.expects(:action_subject).with(organization)
+    plan_action(action, base_folder, @host.organization_id, @host.id)
 
     assert_action_planned_with(
       action,