foreman_rh_cloud 12.2.12 → 12.2.13

data/test/jobs/remove_insights_hosts_job_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class RemoveInsightsHostJobTest < ActiveSupport::TestCase
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
+  include Dynflow::Testing::Factories
 
   setup do
     User.current = User.find_by(login: 'secret_admin')
@@ -18,10 +18,10 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
 
     FactoryBot.create(:insights_missing_host, organization: @org)
 
-    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+    run_action(action)
 
     assert_equal 0, InsightsMissingHost.count
-    assert_equal 'success', task.result
   end
 
   test 'Does not delete hosts on cloud failure' do
@@ -31,14 +31,13 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
 
     FactoryBot.create(:insights_missing_host, organization: @org)
 
-    begin
-      ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
-    rescue ForemanTasks::TaskError => ex
-      task = ex.task
+    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+
+    assert_raises(StandardError) do
+      run_action(action)
     end
 
     assert_equal 1, InsightsMissingHost.count
-    assert_equal 'error', task.result
   end
 
   test 'Paginates the hosts list' do
@@ -54,12 +53,12 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
     FactoryBot.create(:insights_missing_host, organization: @org)
     FactoryBot.create(:insights_missing_host, organization: @org)
 
-    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, '', @org.id)
+    action = run_action(action)
 
     assert_equal 0, InsightsMissingHost.count
-    assert_equal 'success', task.result
-    assert_equal 'response1', task.output[:response_page1]
-    assert_equal 'response2', task.output[:response_page2]
+    assert_equal 'response1', action.output[:response_page1]
+    assert_equal 'response2', action.output[:response_page2]
   end
 
   test 'Uses scoped_search to select hosts' do
@@ -73,12 +72,12 @@ class RemoveInsightsHostJobTest < ActiveSupport::TestCase
     FactoryBot.create(:insights_missing_host, name: 'test a', organization: @org)
     FactoryBot.create(:insights_missing_host, name: 'test b', organization: @org)
 
-    task = ForemanTasks.sync_task(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, 'name ~ b', @org.id)
+    action = create_and_plan_action(ForemanInventoryUpload::Async::RemoveInsightsHostsJob, 'name ~ b', @org.id)
+    action = run_action(action)
 
     assert_equal 1, InsightsMissingHost.count
     assert_equal 'test a', InsightsMissingHost.first.name
-    assert_equal 'success', task.result
-    assert_equal 'response1', task.output[:response_page1]
+    assert_equal 'response1', action.output[:response_page1]
   end
 
   def mock_response(code: 200, body: '')

data/test/jobs/single_host_report_job_test.rb

@@ -0,0 +1,155 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class SingleHostReportJobTest < ActiveSupport::TestCase
+  include Dynflow::Testing::Factories
+  include Dynflow::Testing::Assertions
+  include KatelloCVEHelper
+
+  let(:base_folder) { Dir.mktmpdir }
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+    cve = make_cve
+    env = cve.lifecycle_environment
+
+    @host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: cve.content_view,
+      lifecycle_environment: env,
+      organization: env.organization
+    )
+  end
+
+  teardown do
+    FileUtils.remove_entry base_folder if Dir.exist?(base_folder)
+  end
+
+  test 'plan sets host_id in input' do
+    action = create_and_plan_action(
+      ForemanInventoryUpload::Async::SingleHostReportJob,
+      base_folder,
+      @host.organization_id,
+      @host.id
+    )
+
+    assert_equal @host.id, action.input[:host_id]
+  end
+
+  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
+    )
+
+    assert_action_planned_with(
+      action,
+      ForemanInventoryUpload::Async::GenerateHostReport,
+      base_folder,
+      @host.organization_id,
+      expected_filter
+    )
+  end
+
+  test 'inherits behavior from HostInventoryReportJob' do
+    action = create_and_plan_action(
+      ForemanInventoryUpload::Async::SingleHostReportJob,
+      base_folder,
+      @host.organization_id,
+      @host.id
+    )
+
+    # Should schedule all parent actions
+    assert_action_planned(action, ForemanInventoryUpload::Async::GenerateHostReport)
+    assert_action_planned(action, ForemanInventoryUpload::Async::QueueForUploadJob)
+  end
+
+  test 'humanized_name includes hostname' do
+    action = create_and_plan_action(
+      ForemanInventoryUpload::Async::SingleHostReportJob,
+      base_folder,
+      @host.organization_id,
+      @host.id
+    )
+
+    assert_equal "Single-host report job for host #{@host.name}", action.humanized_name
+  end
+
+  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
+    )
+
+    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
+    )
+
+    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
+    )
+
+    assert_nil action.hostname(999_999)
+  end
+
+  test 'generates report with correct archive name for single host' do
+    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
+    )
+
+    assert_action_planned_with(
+      action,
+      ForemanInventoryUpload::Async::QueueForUploadJob,
+      base_folder,
+      expected_archive_name,
+      @host.organization_id
+    )
+  end
+
+  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
+    )
+
+    assert_action_planned_with(
+      action,
+      ForemanInventoryUpload::Async::CreateMissingInsightsFacets,
+      @host.organization_id
+    )
+  end
+end

data/test/jobs/upload_report_job_test.rb

@@ -2,8 +2,7 @@ require 'test_plugin_helper'
 require 'foreman_tasks/test_helpers'
 
 class UploadReportJobTest < ActiveSupport::TestCase
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
-  include FolderIsolation
+  include Dynflow::Testing::Factories
 
   test 'returns aborted state when disconnected' do
     organization = FactoryBot.create(:organization)
@@ -14,7 +13,8 @@ class UploadReportJobTest < ActiveSupport::TestCase
     )
     ForemanInventoryUpload::Async::UploadReportJob.any_instance.expects(:content_disconnected?).returns(true)
 
-    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
+    action = create_and_plan_action(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
+    run_action(action)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
@@ -27,7 +27,8 @@ class UploadReportJobTest < ActiveSupport::TestCase
     organization = FactoryBot.create(:organization)
     Organization.any_instance.expects(:owner_details).returns(nil)
 
-    ForemanTasks.sync_task(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
+    action = create_and_plan_action(ForemanInventoryUpload::Async::UploadReportJob, '', organization.id)
+    run_action(action)
 
     label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
     progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)

data/test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb

@@ -0,0 +1,192 @@
+require 'test_plugin_helper'
+
+module ForemanRhCloud
+  class RegistrationManagerExtensionsTest < ActiveSupport::TestCase
+    setup do
+      @org = FactoryBot.create(:organization)
+      @host = FactoryBot.create(:host, :managed, organization: @org)
+      @insights_facet = ::InsightsFacet.create!(host: @host, uuid: 'test-uuid-123')
+
+      # Stub Candlepin interaction (from Katello)
+      ::Katello::Resources::Candlepin::Consumer.stubs(:destroy)
+
+      # Stub the cloud request to avoid actual HTTP calls
+      Katello::RegistrationManager.stubs(:execute_cloud_request).returns(true)
+    end
+
+    context 'unregister_host' do
+      test 'should call HBI delete in IoP mode when host has insights facet with UUID' do
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+        expected_url = ForemanInventoryUpload.host_by_id_url('test-uuid-123')
+
+        # Expect the cloud request to be made
+        Katello::RegistrationManager.expects(:execute_cloud_request).with do |params|
+          params[:organization] == @org &&
+            params[:method] == :delete &&
+            params[:url] == expected_url &&
+            params[:headers][:content_type] == :json
+        end.returns(true)
+
+        Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+
+        # Verify insights_facet was destroyed
+        assert_nil InsightsFacet.find_by(id: @insights_facet.id)
+      end
+
+      test 'should NOT call HBI delete in non-IoP mode' do
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+
+        # Should NOT attempt to delete from HBI
+        Katello::RegistrationManager.expects(:execute_cloud_request).never
+
+        Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+
+        # Verify insights_facet was still destroyed
+        assert_nil InsightsFacet.find_by(id: @insights_facet.id)
+      end
+
+      test 'should NOT call HBI delete when host has no insights_facet' do
+        host_without_facet = FactoryBot.create(:host, :managed, organization: @org)
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+        Katello::RegistrationManager.expects(:execute_cloud_request).never
+
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(host_without_facet, unregistering: true)
+        end
+      end
+
+      test 'should NOT call HBI delete when host has insights_facet with empty UUID' do
+        host_with_empty_uuid_facet = FactoryBot.create(:host, :managed, organization: @org)
+        empty_uuid_facet = InsightsFacet.create!(host: host_with_empty_uuid_facet, uuid: '')
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+        Katello::RegistrationManager.expects(:execute_cloud_request).never
+
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(host_with_empty_uuid_facet, unregistering: true)
+        end
+
+        assert_nil InsightsFacet.find_by(id: empty_uuid_facet.id)
+      end
+
+      test 'should NOT call HBI delete when insights_facet has no UUID' do
+        facet_id = @insights_facet.id
+        @insights_facet.update(uuid: nil)
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+
+        Katello::RegistrationManager.expects(:execute_cloud_request).never
+
+        Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+
+        # Verify facet was still destroyed
+        assert_nil InsightsFacet.find_by(id: facet_id)
+      end
+
+      test 'should always destroy insights_facet regardless of IoP mode' do
+        facet_id = @insights_facet.id
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+
+        assert_not_nil InsightsFacet.find_by(id: facet_id)
+
+        Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+
+        assert_nil InsightsFacet.find_by(id: facet_id)
+      end
+    end
+
+    context 'hbi_host_destroy error handling' do
+      setup do
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+        @expected_url = ForemanInventoryUpload.host_by_id_url('test-uuid-123')
+        @facet_id = @insights_facet.id
+        # Unstub execute_cloud_request for error tests
+        Katello::RegistrationManager.unstub(:execute_cloud_request)
+      end
+
+      test 'should handle RestClient::NotFound gracefully' do
+        Katello::RegistrationManager.stubs(:execute_cloud_request).raises(RestClient::NotFound)
+
+        # Should log warning but not raise
+        Rails.logger.expects(:warn).with(regexp_matches(/host does not exist in HBI/))
+
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+        end
+
+        # Facet should still be destroyed
+        assert_nil InsightsFacet.find_by(id: @facet_id)
+      end
+
+      test 'should handle server errors gracefully' do
+        error = RestClient::InternalServerError.new
+        Katello::RegistrationManager.stubs(:execute_cloud_request).raises(error)
+
+        # Should log error but not raise
+        Rails.logger.expects(:error).with(regexp_matches(/Failed to destroy HBI host/))
+
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+        end
+
+        # Facet should still be destroyed
+        assert_nil InsightsFacet.find_by(id: @facet_id)
+      end
+
+      test 'should handle timeout errors gracefully' do
+        error = RestClient::Exceptions::ReadTimeout.new
+        Katello::RegistrationManager.stubs(:execute_cloud_request).raises(error)
+
+        # Should log error but not raise
+        Rails.logger.expects(:error).with(regexp_matches(/Failed to destroy HBI host/))
+
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+        end
+
+        # Facet should still be destroyed
+        assert_nil InsightsFacet.find_by(id: @facet_id)
+      end
+
+      test 'should handle connection errors gracefully' do
+        error = Errno::ECONNREFUSED.new
+        Katello::RegistrationManager.stubs(:execute_cloud_request).raises(error)
+
+        # Should log error but not raise
+        Rails.logger.expects(:error).with(regexp_matches(/Failed to destroy HBI host/))
+
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+        end
+
+        # Facet should still be destroyed
+        assert_nil InsightsFacet.find_by(id: @facet_id)
+      end
+    end
+
+    context 'integration' do
+      test 'should be properly prepended to RegistrationManager' do
+        assert_includes Katello::RegistrationManager.singleton_class.ancestors,
+          ForemanRhCloud::RegistrationManagerExtensions
+      end
+
+      test 'should preserve original unregister_host behavior' do
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
+
+        # Just verify the extension is properly integrated
+        # Detailed Katello behavior is tested in Katello's own tests
+        assert_nothing_raised do
+          Katello::RegistrationManager.unregister_host(@host, unregistering: true)
+        end
+      end
+    end
+
+    context 'URL generation' do
+      test 'host_by_id_url should return correct format' do
+        url = ForemanInventoryUpload.host_by_id_url('test-uuid-123')
+
+        assert_match %r{/hosts/test-uuid-123$}, url
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 12.2.12
+  version: 12.2.13
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
@@ -99,6 +99,7 @@ files:
 - app/controllers/api/v2/rh_cloud/cloud_request_controller.rb
 - app/controllers/api/v2/rh_cloud/inventory_controller.rb
 - app/controllers/concerns/foreman_rh_cloud/iop_smart_proxy_access.rb
+- app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb
 - app/controllers/concerns/insights_cloud/candlepin_cache.rb
 - app/controllers/concerns/insights_cloud/client_authentication.rb
 - app/controllers/concerns/insights_cloud/package_profile_upload_extensions.rb
@@ -261,7 +262,11 @@ files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
+- test/jobs/create_missing_insights_facets_test.rb
 - test/jobs/exponential_backoff_test.rb
+- test/jobs/generate_host_report_test.rb
+- test/jobs/generate_report_job_test.rb
+- test/jobs/host_inventory_report_job_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -272,6 +277,7 @@ files:
 - test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
+- test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -279,6 +285,7 @@ files:
 - test/unit/fact_helpers_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
+- test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb
@@ -715,7 +722,11 @@ test_files:
 - test/factories/inventory_upload_factories.rb
 - test/jobs/cloud_connector_announce_task_test.rb
 - test/jobs/connector_playbook_execution_reporter_task_test.rb
+- test/jobs/create_missing_insights_facets_test.rb
 - test/jobs/exponential_backoff_test.rb
+- test/jobs/generate_host_report_test.rb
+- test/jobs/generate_report_job_test.rb
+- test/jobs/host_inventory_report_job_test.rb
 - test/jobs/insights_client_status_aging_test.rb
 - test/jobs/insights_full_sync_test.rb
 - test/jobs/insights_resolutions_sync_test.rb
@@ -726,6 +737,7 @@ test_files:
 - test/jobs/inventory_self_host_sync_test.rb
 - test/jobs/queue_for_upload_job_test.rb
 - test/jobs/remove_insights_hosts_job_test.rb
+- test/jobs/single_host_report_job_test.rb
 - test/jobs/upload_report_job_test.rb
 - test/models/insights_client_report_status_test.rb
 - test/test_plugin_helper.rb
@@ -733,6 +745,7 @@ test_files:
 - test/unit/fact_helpers_test.rb
 - test/unit/foreman_rh_cloud_self_host_test.rb
 - test/unit/insights_facet_test.rb
+- test/unit/lib/foreman_rh_cloud/registration_manager_extensions_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/playbook_progress_generator_test.rb
 - test/unit/rh_cloud_http_proxy_test.rb