foreman_rh_cloud 13.0.7 → 13.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f148316b7ac917b1933b533d2843cf30eb8f0a7da25ff4ef2c7783d2b423ba5
-  data.tar.gz: e04853a27fb4bea875dfab45068cf2ee6ba683e41b4a25c83e17b812b80d4f2a
+  metadata.gz: 9d818ad6b4142546fe8d3b8c0e54f49600ed30915f6b22f142bc1861938c5dba
+  data.tar.gz: 3d0e310b2cf587243c64623713af21e164c87e87e21a5edeee556f16613ae8fc
 SHA512:
-  metadata.gz: eb7d02b868a7e7f78c589c46bd6b0816450ac73b8e45f3b882ab9b30ab62ea21d0cdb69a1f1d2ac465fe8d1b2bdebaaed2555a78b240e77625ce9744b0756853
-  data.tar.gz: c361ab887cbd84cbe912f7bf23c36d40b69239f31cf26d369a35cd3d88b2d163e9e485b185aadb105692da044b658674da73f41fd21017ba75f7440cb6509588
+  metadata.gz: ae35c83c6c45af99a891a3ff243d10f7f7616891facecab5f6afa34287f2282eb3c0175680537bb0a17b62352ea42b43d1e1d4365a517f6086c3e1d82fbd725b
+  data.tar.gz: f9e14d6356e65f5649b3c4a2f57ef381539aa296e12fbbe7c0e5fcc28c47e855bd9ad8e1ab3a9ca739319b9c9882e41de9d578244be2f1fcbd83ca8d1c4160de

data/app/controllers/concerns/foreman_rh_cloud/registration_manager_extensions.rb

@@ -0,0 +1,39 @@
+module ForemanRhCloud
+  module RegistrationManagerExtensions
+    include ForemanRhCloud::CertAuth
+
+    def logger
+      Rails.logger
+    end
+
+    def unregister_host(host, options = {})
+      organization_destroy = options.fetch(:organization_destroy, false)
+
+      # Reload to ensure we have fresh association data
+      host.reload
+
+      # Only delete from HBI in IoP mode (hosted mode uses async job for cleanup)
+      hbi_host_destroy(host) if ForemanRhCloud.with_iop_smart_proxy? && !organization_destroy && host.insights_facet&.uuid&.presence
+      host.insights&.destroy!
+      super(host, options)
+    end
+
+    def hbi_host_destroy(host)
+      uuid = host.insights_facet.uuid
+      logger.debug "Unregistering host #{uuid} from HBI"
+      execute_cloud_request(
+        organization: host.organization,
+        method: :delete,
+        url: ForemanInventoryUpload.host_by_id_url(uuid),
+        headers: {
+          content_type: :json,
+        }
+      )
+    rescue RestClient::NotFound
+      Rails.logger.warn(_("Attempted to destroy HBI host %s, but host does not exist in HBI") % uuid)
+    rescue StandardError => e
+      # TODO: Improve error handling - don't break registration if HBI delete fails
+      Rails.logger.error(format(_("Failed to destroy HBI host %s: %s"), uuid, e.message))
+    end
+  end
+end

data/app/controllers/foreman_inventory_upload/accounts_controller.rb

@@ -7,7 +7,7 @@ module ForemanInventoryUpload
       accounts = Hash[
         labels.map do |id, label|
           generate_report_status = status_for(id, ForemanInventoryUpload::Async::GenerateReportJob)
-          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportJob)
+          upload_report_status = status_for(id, ForemanInventoryUpload::Async::UploadReportDirectJob)
           report_file_paths = ForemanInventoryUpload.report_file_paths(id)
 
           [

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -6,7 +6,7 @@ module ForemanInventoryUpload
     before_action :require_non_iop_smart_proxy, only: [:enable_cloud_connector]
 
     def last
-      label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
+      label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(params[:organization_id])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
 
       render json: {

data/lib/foreman_inventory_upload/async/create_missing_insights_facets.rb

@@ -8,7 +8,7 @@ module ForemanInventoryUpload
       def run
         organization = ::Organization.find(input[:organization_id])
         hosts_without_facets = ::ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
-        facet_count = hosts_without_facets.count
+        facet_count = 0
         hosts_without_facets.each do |batch|
           facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
             {
@@ -20,9 +20,10 @@ module ForemanInventoryUpload
           # rubocop:disable Rails/SkipsModelValidations
           InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
           # rubocop:enable Rails/SkipsModelValidations
+          facet_count += facets.size
         end
         output[:result] = facet_count.zero? ? _("There were no missing Insights facets") : format(_("Missing Insights facets created: %s"), facet_count)
-        Rails.logger.info output[:result]
+        Rails.logger.debug output[:result]
       end
     end
   end

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -9,7 +9,6 @@ module ForemanInventoryUpload
       def run
         logger.debug('Ensuring objects')
         ensure_ouput_folder
-        ensure_output_script
         logger.debug("Copying #{report_file} to #{uploads_folder}")
         enqueued_file_name = File.join(uploads_folder, report_file)
         FileUtils.mv(File.join(base_folder, report_file), enqueued_file_name)
@@ -22,31 +21,10 @@ module ForemanInventoryUpload
         @uploads_folder ||= ForemanInventoryUpload.uploads_folder
       end
 
-      def script_file
-        @script_file ||= File.join(uploads_folder, ForemanInventoryUpload.upload_script_file)
-      end
-
       def ensure_ouput_folder
         FileUtils.mkdir_p(uploads_folder)
       end
 
-      def ensure_output_script
-        return if File.exist?(script_file)
-
-        script_source = File.join(ForemanRhCloud::Engine.root, 'lib/foreman_inventory_upload/scripts/uploader.sh.erb')
-
-        template_src = Foreman::Renderer::Source::String.new(content: File.read(script_source))
-        scope = Foreman::Renderer::Scope::Base.new(
-          source: template_src,
-          variables: {
-            upload_url: ForemanInventoryUpload.upload_url,
-          }
-        )
-        script_source = Foreman::Renderer.render(template_src, scope)
-        File.write(script_file, script_source)
-        FileUtils.chmod('+x', script_file)
-      end
-
       def logger
         Foreman::Logging.logger('background')
       end
@@ -60,7 +38,7 @@ module ForemanInventoryUpload
       end
 
       def plan_upload_report(enqueued_file_name, organization_id)
-        plan_action(UploadReportJob, enqueued_file_name, organization_id)
+        plan_action(UploadReportDirectJob, enqueued_file_name, organization_id)
       end
     end
   end

data/lib/foreman_inventory_upload/async/upload_report_direct_job.rb

@@ -0,0 +1,200 @@
+require 'tempfile'
+require 'rest-client'
+
+module ForemanInventoryUpload
+  module Async
+    class UploadReportDirectJob < ::Actions::EntryAction
+      include AsyncHelpers
+      include ::ForemanRhCloud::Async::ExponentialBackoff
+      include ::ForemanRhCloud::CloudRequest
+
+      # Wrapper class to avoid monkey-patching File for multipart uploads
+      class FileUpload
+        attr_reader :file, :content_type
+
+        def initialize(file, content_type:)
+          @file = file
+          @content_type = content_type
+        end
+
+        def read(*args)
+          @file.read(*args)
+        end
+
+        def path
+          @file.path
+        end
+
+        def respond_to_missing?(method_name, include_private = false)
+          @file.respond_to?(method_name, include_private) || super
+        end
+
+        def method_missing(method_name, *args, &block)
+          if @file.respond_to?(method_name)
+            @file.send(method_name, *args, &block)
+          else
+            super
+          end
+        end
+      end
+
+      def self.output_label(label)
+        "upload_for_#{label}"
+      end
+
+      def plan(filename, organization_id)
+        # NOTE: This implementation assumes a single organization will not trigger multiple
+        # concurrent uploads. The instance_label is derived from organization_id alone, which
+        # means concurrent uploads for the same org would share ProgressOutput storage.
+        # This matches the pattern in GenerateReportJob. A full fix for thread-safety
+        # requires UI changes to display multiple concurrent tasks per org (tracked for PR #2).
+        label = UploadReportDirectJob.output_label(organization_id)
+        clear_task_output(label)
+        plan_self(
+          instance_label: label,
+          filename: filename,
+          organization_id: organization_id
+        )
+      end
+
+      def try_execute
+        if content_disconnected?
+          progress_output do |progress_output|
+            progress_output.write_line("Report was not moved and upload was canceled because connection to Insights is not enabled. Report location: #{filename}.")
+            progress_output.status = "Task aborted, exit 1"
+            done!
+          end
+          return
+        end
+
+        unless organization.owner_details&.dig('upstreamConsumer', 'idCert')
+          logger.info("Skipping organization '#{organization}', no candlepin certificate defined.")
+          progress_output do |progress_output|
+            progress_output.write_line("Skipping organization #{organization}, no candlepin certificate defined.")
+            progress_output.status = "Task aborted, exit 1"
+            done!
+          end
+          return
+        end
+
+        Tempfile.create([organization.name, '.pem']) do |cer_file|
+          cer_file.write(certificate[:cert])
+          cer_file.write(certificate[:key])
+          cer_file.flush
+          upload_report(cer_file.path)
+        end
+
+        done!
+      end
+
+      def upload_report(cer_path)
+        progress_output do |progress_output|
+          progress_output.write_line("Uploading report for organization #{organization.label}...")
+          progress_output.status = "Running upload"
+
+          begin
+            upload_file(cer_path)
+            progress_output.write_line("Upload completed successfully")
+            move_to_done_folder
+            progress_output.write_line("Uploaded file moved to done/ folder")
+            progress_output.status = "pid #{Process.pid} exit 0"
+          rescue StandardError => e
+            progress_output.write_line("Upload failed: #{e.message}")
+            progress_output.status = "pid #{Process.pid} exit 1"
+            raise
+          end
+        end
+      end
+
+      def upload_file(cer_path)
+        cert_content = File.read(cer_path)
+
+        File.open(filename, 'rb') do |file|
+          # Wrap file with FileUpload class for RestClient multipart handling
+          # RestClient requires objects with :read, :path, and :content_type methods
+          wrapped_file = FileUpload.new(file, content_type: 'application/vnd.redhat.qpc.tar+tgz')
+
+          response = execute_cloud_request(
+            method: :post,
+            url: ForemanInventoryUpload.upload_url,
+            payload: {
+              multipart: true,
+              file: wrapped_file,
+            },
+            headers: {
+              'X-Org-Id' => organization.label,
+            },
+            ssl_client_cert: OpenSSL::X509::Certificate.new(cert_content),
+            ssl_client_key: OpenSSL::PKey::RSA.new(cert_content),
+            timeout: 600,
+            open_timeout: 60
+          )
+
+          logger.debug("Upload response code: #{response.code}")
+        end
+      end
+
+      def move_to_done_folder
+        FileUtils.mkdir_p(ForemanInventoryUpload.done_folder)
+        done_file = ForemanInventoryUpload.done_file_path(File.basename(filename))
+        FileUtils.mv(filename, done_file)
+        logger.debug("Moved #{filename} to #{done_file}")
+      end
+
+      def certificate
+        ForemanRhCloud.with_iop_smart_proxy? ? foreman_certificate : manifest_certificate
+      end
+
+      def manifest_certificate
+        candlepin_id_certificate = organization.owner_details['upstreamConsumer']['idCert']
+        {
+          cert: candlepin_id_certificate['cert'],
+          key: candlepin_id_certificate['key'],
+        }
+      end
+
+      def foreman_certificate
+        {
+          cert: File.read(Setting[:ssl_certificate]),
+          key: File.read(Setting[:ssl_priv_key]),
+        }
+      end
+
+      def filename
+        input[:filename]
+      end
+
+      def organization
+        Organization.find(input[:organization_id])
+      end
+
+      def content_disconnected?
+        !Setting[:subscription_connection_enabled]
+      end
+
+      def progress_output
+        progress_output = ProgressOutput.register(instance_label)
+        yield(progress_output)
+      ensure
+        progress_output.close
+      end
+
+      def instance_label
+        input[:instance_label]
+      end
+
+      def logger
+        Foreman::Logging.logger('background')
+      end
+
+      def rescue_strategy_for_self
+        Dynflow::Action::Rescue::Fail
+      end
+
+      def clear_task_output(label)
+        TaskOutputLine.where(label: label).delete_all
+        TaskOutputStatus.where(label: label).delete_all
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload.rb

@@ -48,10 +48,6 @@ module ForemanInventoryUpload
     @outputs_folder ||= ensure_folder(File.join(ForemanInventoryUpload.base_folder, 'outputs/'))
   end
 
-  def self.upload_script_file
-    'uploader.sh'
-  end
-
   def self.facts_archive_name(organization, filter = nil)
     "report_for_#{organization}#{filter.empty? ? nil : "[#{filter.to_s.parameterize}]"}.tar.xz"
   end
@@ -88,8 +84,12 @@ module ForemanInventoryUpload
     inventory_base_url + "?hostname_or_id=#{ForemanRhCloud.foreman_host.fqdn}"
   end
 
-  def self.hosts_by_ids_url(host_ids)
-    host_ids_string = host_ids.join(',')
+  def self.host_by_id_url(host_uuid)
+    "#{inventory_base_url}/#{host_uuid}"
+  end
+
+  def self.hosts_by_ids_url(host_uuids)
+    host_ids_string = host_uuids.join(',')
     "#{inventory_base_url}/#{host_ids_string}"
   end
 end

data/lib/foreman_rh_cloud/engine.rb

@@ -40,6 +40,7 @@ module ForemanRhCloud
         ::Host::Managed.include RhCloudHost
 
         ::Katello::Api::Rhsm::CandlepinDynflowProxyController.include InsightsCloud::PackageProfileUploadExtensions
+        ::Katello::RegistrationManager.singleton_class.prepend ::ForemanRhCloud::RegistrationManagerExtensions
       end
     end
 

data/lib/foreman_rh_cloud/plugin.rb

@@ -146,6 +146,10 @@ module ForemanRhCloud
           end
         end
 
+        ::Foreman::Plugin.app_metadata_registry.register(:foreman_rh_cloud, {
+          iop: ForemanRhCloud.with_iop_smart_proxy?,
+        })
+
         extend_template_helpers ForemanRhCloud::TemplateRendererHelper
         allowed_template_helpers :remediations_playbook, :download_rh_playbook
       end

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '13.0.7'.freeze
+  VERSION = '13.0.9'.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

@@ -39,13 +39,23 @@ namespace :rh_cloud_inventory do
 
       User.as_anonymous_admin do
         organization_ids.each do |organization_id|
-          ForemanTasks.sync_task(
+          task = ForemanTasks.sync_task(
             ForemanInventoryUpload::Async::HostInventoryReportJob,
             base_folder,
             organization_id,
             filter,
             false # don't upload; the user ran report:generate and not report:generate_upload
           )
+
+          if task.result == 'success'
+            unless Setting[:subscription_connection_enabled]
+              target_file = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization_id, filter))
+              puts "Generated #{target_file} for organization id #{organization_id}"
+            end
+          else
+            puts "Failed to generate report for organization id #{organization_id}. Task result: #{task.result}"
+            puts "Check task #{task.id} in the Tasks dashboard for error details."
+          end
         end
         puts "Check the Uploading tab for report uploading status." if Setting[:subscription_connection_enabled]
       end

data/package.json

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

data/test/controllers/accounts_controller_test.rb

@@ -11,7 +11,7 @@ class AccountsControllerTest < ActionController::TestCase
     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_label = ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
 

data/test/controllers/uploads_controller_test.rb

@@ -8,7 +8,7 @@ class UploadsControllerTest < ActionController::TestCase
     test_org = FactoryBot.create(:organization)
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id))
+      .with(ForemanInventoryUpload::Async::UploadReportDirectJob.output_label(test_org.id))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 

data/test/jobs/cloud_connector_announce_task_test.rb

@@ -4,7 +4,7 @@ require 'foreman_tasks/test_helpers'
 require "#{ForemanTasks::Engine.root}/test/support/dummy_dynflow_action"
 
 class CloudConnectorAnnounceTaskTest < ActiveSupport::TestCase
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
+  include Dynflow::Testing::Factories
 
   setup do
     RemoteExecutionFeature.register(
@@ -23,7 +23,8 @@ class CloudConnectorAnnounceTaskTest < ActiveSupport::TestCase
   test 'It executes cloud presence announcer' do
     ForemanRhCloud::CloudPresence.any_instance.expects(:announce_to_sources).times(Organization.unscoped.count)
 
-    ForemanTasks.sync_task(InsightsCloud::Async::CloudConnectorAnnounceTask, @job_invocation)
+    action = create_and_plan_action(InsightsCloud::Async::CloudConnectorAnnounceTask, @job_invocation)
+    finalize_action(action)
   end
 
   private

data/test/jobs/connector_playbook_execution_reporter_task_test.rb

@@ -4,7 +4,7 @@ require 'foreman_tasks/test_helpers'
 require "#{ForemanTasks::Engine.root}/test/support/dummy_dynflow_action"
 
 class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
-  include ForemanTasks::TestHelpers::WithInThreadExecutor
+  include Dynflow::Testing::Factories
 
   # override default send behavior for the test
   class TestConnectorPlaybookExecutionReporterTask < InsightsCloud::Async::ConnectorPlaybookExecutionReporterTask
@@ -35,17 +35,19 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     TestConnectorPlaybookExecutionReporterTask.any_instance.stubs(:job_finished?).returns(true)
 
-    actual = ForemanTasks.sync_task(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
+    action = create_and_plan_action(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
+    action = run_action(action)
 
-    actual_report = actual.output[:saved_reports].first.to_s
+    saved_reports = action.output[:saved_reports]
+    actual_report = saved_reports.first.to_s
 
-    assert_equal 1, actual.output[:saved_reports].size
+    assert_equal 1, saved_reports.size
     assert_not_nil actual_report
     actual_jsonl = read_jsonl(actual_report)
 
-    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID2']['exit_status']
+    assert_equal true, action.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID2']['exit_status']
 
     assert_equal true, @job_invocation.finished?
     assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
@@ -77,20 +79,25 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     ArrangeTestHost.any_instance.stubs(:job_finished?).returns(false, true)
 
-    actual = ForemanTasks.sync_task(ArrangeTestHost, @job_invocation)
+    action = create_and_plan_action(ArrangeTestHost, @job_invocation)
+    action = run_action(action)
 
-    actual_report1 = actual.output[:saved_reports].first.to_s
-    actual_report2 = actual.output[:saved_reports].second.to_s
+    # Process polling cycles - manually trigger Poll events until done
+    action = run_action(action, Dynflow::Action::Polling::Poll) until action.done?
 
-    assert_equal 2, actual.output[:saved_reports].size
+    saved_reports = action.output[:saved_reports]
+    actual_report1 = saved_reports.first.to_s
+    actual_report2 = saved_reports.second.to_s
+
+    assert_equal 2, saved_reports.size
     assert_not_nil actual_report1
     assert_not_nil actual_report2
 
     actual_json1 = read_jsonl(actual_report1)
     actual_json2 = read_jsonl(actual_report2)
 
-    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal true, action.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
 
     assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
 
@@ -141,13 +148,18 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
 
     ArrangeTestHostTwo.any_instance.stubs(:job_finished?).returns(false, false, true)
 
-    actual = ForemanTasks.sync_task(ArrangeTestHostTwo, @job_invocation)
+    action = create_and_plan_action(ArrangeTestHostTwo, @job_invocation)
+    action = run_action(action)
+
+    # Process polling cycles - manually trigger Poll events until done
+    action = run_action(action, Dynflow::Action::Polling::Poll) until action.done?
 
-    actual_report1 = actual.output[:saved_reports].first.to_s
-    actual_report2 = actual.output[:saved_reports].second.to_s
-    actual_report3 = actual.output[:saved_reports].third.to_s
+    saved_reports = action.output[:saved_reports]
+    actual_report1 = saved_reports.first.to_s
+    actual_report2 = saved_reports.second.to_s
+    actual_report3 = saved_reports.third.to_s
 
-    assert_equal 3, actual.output[:saved_reports].size
+    assert_equal 3, saved_reports.size
     assert_not_nil actual_report1
     assert_not_nil actual_report2
     assert_not_nil actual_report3
@@ -156,8 +168,8 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     actual_json2 = read_jsonl(actual_report2)
     actual_json3 = read_jsonl(actual_report3)
 
-    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    assert_equal true, action.output['task']['invocation_status']['task_state']['task_done_reported']
+    assert_equal 0, action.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
 
     assert_not_nil actual_report_updated = actual_json1.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
     assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']