foreman_inventory_upload 0.9.2 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b70584c73786436bfa34fabe53f16e4e7107a89b49acc2cf9085eb0bb3be0dab
-  data.tar.gz: a7564f641fad2c18c7e2122d09591b720411eb403cc84fefc0579e14a7d57d55
+SHA1:
+  metadata.gz: 64394cf6cba5b7e8c903f1b54269cd944e970ed6
+  data.tar.gz: 2cf1d64dc23506fc1e2808d0ee283cff9010b33e
 SHA512:
-  metadata.gz: 8f2504be14024e4d71f0d751a0a7715c45535087c0a6b861f8392bebe2f2f1a06a1aa46c71bc68cf46bf026a839bba32eb2e27953c2e3bcd0b6c2333c263df9f
-  data.tar.gz: 9adcaae458723fa26775bcc233dddb3097c40eee965b3063c508ff1156604dc751c0614242bbfb992ca40d2e1f61732cd744ad70b9d6d5379c943170056647f0
+  metadata.gz: 16db4189b92eeafd639a0a67fe1bdae2d4d5be7931cc6ab43ea4a2fa3b8d9e88365c7d1757a205d8c23718b97c7da7bb28849d6c17f731ba27f5a8d42c5719af
+  data.tar.gz: 7ee617fe1bb503bcae3f82a5c74cd3d25266afee0d7f731a8ba4e6b4ca3a15c6d70f5b39e21b49f607867f7bdc3d40cbf549ae7e1062ef327da1419601ee2012

data/app/controllers/foreman_inventory_upload/reports_controller.rb

@@ -3,7 +3,7 @@
 module ForemanInventoryUpload
   class ReportsController < ::ApplicationController
     def last
-      label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:organization_id])
+      label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(params[:portal_user])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
       task_label = ForemanInventoryUpload::Async::GenerateAllReportsJob.singleton_job_name
       scheduled = ForemanTasks::Task.where(
@@ -18,9 +18,10 @@ module ForemanInventoryUpload
     end
 
     def generate
-      organization_id = params[:organization_id]
+      portal_user = params[:portal_user]
 
-      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization_id)
+      generated_file_name = File.join(ForemanInventoryUpload.base_folder, "#{portal_user}.tar.gz")
+      ForemanInventoryUpload::Async::GenerateReportJob.perform_later(generated_file_name, portal_user)
 
       render json: {
         action_status: 'success',

data/app/controllers/foreman_inventory_upload/statuses_controller.rb

@@ -0,0 +1,41 @@
+module ForemanInventoryUpload
+  class StatusesController < ::ApplicationController
+    # override default "welcome screen behavior, since we don't have a model"
+    def welcome
+      true
+    end
+
+    def index
+      portal_users = RedhatAccess::TelemetryConfiguration
+                     .where(enable_telemetry: true)
+                     .distinct
+                     .pluck(:portal_user)
+
+      statuses = Hash[
+        portal_users.map do |portal_user|
+          generate_report_status = status_for(portal_user, ForemanInventoryUpload::Async::GenerateReportJob)
+          upload_report_status = status_for(portal_user, ForemanInventoryUpload::Async::UploadReportJob)
+
+          [
+            portal_user,
+            {
+              generate_report_status: generate_report_status,
+              upload_report_status: upload_report_status,
+            },
+          ]
+        end
+      ]
+
+      render json: {
+        statuses: statuses,
+      }, status: :ok
+    end
+
+    private
+
+    def status_for(portal_user, job_class)
+      label = job_class.output_label(portal_user)
+      ForemanInventoryUpload::Async::ProgressOutput.get(label)&.status
+    end
+  end
+end

data/app/controllers/foreman_inventory_upload/uploads_controller.rb

@@ -1,7 +1,7 @@
 module ForemanInventoryUpload
   class UploadsController < ::ApplicationController
     def last
-      label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:organization_id])
+      label = ForemanInventoryUpload::Async::UploadReportJob.output_label(params[:portal_user])
       output = ForemanInventoryUpload::Async::ProgressOutput.get(label)&.full_output
 
       render json: {
@@ -10,8 +10,8 @@ module ForemanInventoryUpload
     end
 
     def download_file
-      filename = ForemanInventoryUpload.facts_archive_name(params[:organization_id])
-      path = Rails.root.join(ForemanInventoryUpload.uploads_folder, filename)
+      filename = 'hosts_report.tar.gz'
+      path = Rails.root.join(ForemanInventoryUpload.uploads_folder(params[:portal_user]), filename)
       unless File.exist? path
         return throw_flash_error(
           "Path doesn't exist: #{path}"

data/app/views/scripts/uploader.sh.erb

@@ -1,43 +1,30 @@
 #! /bin/sh
 
 DEST=<%= @upload_url %>
+RH_USERNAME=<%= @rh_username %>
 
-if [ -z "$FILES" ]
+if [ -z "$RH_USERNAME" ]
 then
-        FILES=./*.tar.gz
+        IFS= read -rp "Enter username: " RH_USERNAME
 fi
 
-if [ -n "$CER_PATH" ]
+if [ -z "$RH_PASSWORD" ]
 then
-        AUTH_KEY="--cert"
-        AUTH_VAL="$CER_PATH"
-else
-        if [ -z "$RH_USERNAME" ]
-        then
-                IFS= read -rp "Enter username: " RH_USERNAME
-        fi
-
-        if [ -z "$RH_PASSWORD" ]
-        then
-                IFS= read -rsp "Enter password: " RH_PASSWORD
-        fi
-
-        AUTH_KEY="-u"
-        AUTH_VAL="\"$RH_USERNAME\":\"$RH_PASSWORD\""
+        IFS= read -rsp "Enter password: " RH_PASSWORD
 fi
 
-# /tmp/a b/x.pem
-# curl --cert /tmp/a\ b/x.pem
+if [ -z "$FILES" ]
+then
+        FILES=./*.tar.gz
+fi
 
-SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE:-0}")")
-DONE_DIR="$SCRIPT_DIR/done/"
-mkdir -p $DONE_DIR
+mkdir -p done
 
 for f in $FILES
 do
-  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST "$AUTH_KEY" "$AUTH_VAL"
+  curl -k -vvv -# --fail -F "file=@$f;type=application/vnd.redhat.qpc.tar+tgz" $DEST -u "$RH_USERNAME":"$RH_PASSWORD"
   if [ $? -eq 0 ]; then
-    mv $f $DONE_DIR
+    mv $f done/
     echo "Done: $f"
   fi
 done

data/config/routes.rb

@@ -1,10 +1,10 @@
 Rails.application.routes.draw do
   namespace :foreman_inventory_upload do
     get 'index', to: 'react#index'
-    get ':organization_id/reports/last', to: 'reports#last', constraints: { organization_id: %r{[^\/]+} }
-    post ':organization_id/reports', to: 'reports#generate', constraints: { organization_id: %r{[^\/]+} }
-    get ':organization_id/uploads/last', to: 'uploads#last', constraints: { organization_id: %r{[^\/]+} }
-    get ':organization_id/uploads/file', to: 'uploads#download_file', constraints: { organization_id: %r{[^\/]+} }
-    get 'accounts', to: 'accounts#index'
+    get ':portal_user/reports/last', to: 'reports#last', constraints: { portal_user: %r{[^\/]+} }
+    post ':portal_user/reports', to: 'reports#generate', constraints: { portal_user: %r{[^\/]+} }
+    get ':portal_user/uploads/last', to: 'uploads#last', constraints: { portal_user: %r{[^\/]+} }
+    get ':portal_user/uploads/file', to: 'uploads#download_file', constraints: { portal_user: %r{[^\/]+} }
+    get 'statuses', to: 'statuses#index'
   end
 end

data/lib/foreman_inventory_upload/async/generate_all_reports_job.rb

@@ -2,10 +2,13 @@ module ForemanInventoryUpload
   module Async
     class GenerateAllReportsJob < ::ApplicationJob
       def perform
-        organizations = Organization.unscoped.all
-
-        organizations.map do |organization|
-          GenerateReportJob.perform_later(ForemanInventoryUpload.generated_reports_folder, organization.id)
+        portal_users = RedhatAccess::TelemetryConfiguration
+                       .where(enable_telemetry: true)
+                       .distinct
+                       .pluck(:portal_user)
+        portal_users.map do |portal_user|
+          generated_file_name = File.join(ForemanInventoryUpload.base_folder, "#{portal_user}.tar.gz")
+          GenerateReportJob.perform_later(generated_file_name, portal_user)
         end
       ensure
         self.class.set(:wait => 24.hours).perform_later

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -1,35 +1,27 @@
 module ForemanInventoryUpload
   module Async
     class GenerateReportJob < ShellProcess
-      def self.output_label(label)
-        "report_for_#{label}"
+      def self.output_label(portal_user)
+        "report_for_#{portal_user}"
       end
 
-      def perform(base_folder, organization)
-        @base_folder = base_folder
-        @organization = organization
+      def perform(result_file, portal_user)
+        @result_file = result_file
+        @portal_user = portal_user
 
-        super(GenerateReportJob.output_label(organization))
+        super(GenerateReportJob.output_label(portal_user))
 
-        QueueForUploadJob.perform_later(
-          base_folder,
-          ForemanInventoryUpload.facts_archive_name(organization),
-          organization
-        )
-      end
-
-      def rake_prefix
-        'foreman-' unless Rails.env.development?
+        QueueForUploadJob.perform_later(result_file, portal_user)
       end
 
       def command
-        "#{rake_prefix}rake foreman_inventory_upload:report:generate"
+        'rake foreman_inventory_upload:report:generate'
       end
 
       def env
         super.merge(
-          'target' => @base_folder,
-          'organization_id' => @organization
+          'target' => @result_file,
+          'portal_user' => @portal_user
         )
       end
     end

data/lib/foreman_inventory_upload/async/queue_for_upload_job.rb

@@ -1,22 +1,21 @@
 module ForemanInventoryUpload
   module Async
     class QueueForUploadJob < ::ApplicationJob
-      def perform(base_folder, report_file, organization_id)
-        @base_folder = base_folder
-        @report_file = report_file
+      def perform(report_file, portal_user)
+        @portal_user = portal_user
         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)
+        enqueued_file_name = File.join(uploads_folder, ForemanInventoryUpload.facts_archive_name)
+        FileUtils.mv(report_file, enqueued_file_name)
         logger.debug("Done copying #{report_file} to #{enqueued_file_name}")
 
-        UploadReportJob.perform_later(enqueued_file_name, organization_id)
+        UploadReportJob.perform_later(enqueued_file_name, portal_user)
       end
 
       def uploads_folder
-        @uploads_folder ||= ForemanInventoryUpload.uploads_folder
+        @uploads_folder ||= ForemanInventoryUpload.uploads_folder(@portal_user)
       end
 
       def script_file
@@ -30,11 +29,17 @@ module ForemanInventoryUpload
       def ensure_output_script
         return if File.exist?(script_file)
 
-        script_source_file = File.join(ForemanInventoryUpload::Engine.root, 'app/views/scripts/uploader.sh.erb')
-
-        script_source = File.read(script_source_file)
-        script_source.gsub!('<%= @upload_url %>', ForemanInventoryUpload.upload_url)
-
+        script_source = File.join(ForemanInventoryUpload::Engine.root, 'app/views/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,
+            rh_username: @portal_user,
+          }
+        )
+        script_source = Foreman::Renderer.render(template_src, scope)
         File.write(script_file, script_source)
         FileUtils.chmod('+x', script_file)
       end

data/lib/foreman_inventory_upload/async/upload_report_job.rb

@@ -1,23 +1,15 @@
-require 'tempfile'
-
 module ForemanInventoryUpload
   module Async
     class UploadReportJob < ShellProcess
-      def self.output_label(label)
-        "upload_for_#{label}"
+      def self.output_label(portal_user)
+        "upload_for_#{portal_user}"
       end
 
-      def perform(filename, organization_id)
+      def perform(filename, portal_user)
+        @portal_user = portal_user
         @filename = filename
-        @organization = Organization.find(organization_id)
 
-        Tempfile.create([@organization.name, '.pem']) do |cer_file|
-          cer_file.write(rh_credentials[:cert])
-          cer_file.write(rh_credentials[:key])
-          cer_file.flush
-          @cer_path = cer_file.path
-          super(UploadReportJob.output_label(organization_id))
-        end
+        super(UploadReportJob.output_label(portal_user))
       end
 
       def command
@@ -26,19 +18,22 @@ module ForemanInventoryUpload
 
       def env
         super.merge(
-          'FILES' => @filename,
-          'CER_PATH' => @cer_path
+          'RH_USERNAME' => rh_username,
+          'RH_PASSWORD' => rh_password,
+          'FILES' => @filename
         )
       end
 
       def rh_credentials
-        @rh_credentials ||= begin
-          candlepin_id_certificate = @organization.owner_details['upstreamConsumer']['idCert']
-          {
-            cert: candlepin_id_certificate['cert'],
-            key: candlepin_id_certificate['key'],
-          }
-        end
+        @rh_credentials ||= RedhatAccess::TelemetryConfiguration.where(portal_user: @portal_user).last
+      end
+
+      def rh_username
+        @portal_user
+      end
+
+      def rh_password
+        rh_credentials.portal_password
       end
     end
   end

data/lib/foreman_inventory_upload/engine.rb

@@ -11,8 +11,6 @@ module ForemanInventoryUpload
     config.autoload_paths += Dir["#{config.root}/app/overrides"]
     config.autoload_paths += Dir["#{config.root}/lib"]
 
-    config.eager_load_paths += Dir["#{config.root}/lib"]
-
     # Add any db migrations
     initializer 'foreman_inventory_upload.load_app_instance_data' do |app|
       ForemanInventoryUpload::Engine.paths['db/migrate'].existent.each do |path|

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -6,10 +6,10 @@ module ForemanInventoryUpload
         @logger = logger
       end
 
-      def render(organization:)
+      def render(portal_user)
         Dir.mktmpdir do |tmpdir|
           @logger.info "Started generating hosts report in #{tmpdir}"
-          host_batches = ForemanInventoryUpload::Generators::Queries.for_org(organization)
+          host_batches = ForemanInventoryUpload::Generators::Queries.for_report(portal_user)
           File.open(File.join(tmpdir, 'metadata.json'), 'w') do |metadata_out|
             metadata_generator = ForemanInventoryUpload::Generators::Metadata.new(metadata_out)
             metadata_generator.render do |inner_generator|

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -17,7 +17,6 @@ module ForemanInventoryUpload
               'distribution::name',
               'uname::release',
               'lscpu::flags',
-              'distribution::version',
             ]).pluck(:name, :id)
           ]
       end
@@ -32,29 +31,21 @@ module ForemanInventoryUpload
             :installed_packages,
             :content_facet,
             :host_statuses,
-            subscription_facet: [:pools, :installed_products, :hypervisor_host]
+            subscription_facet: [:pools, :installed_products]
           )
           .merge(fact_values)
       end
 
       def self.for_report(portal_user)
-        org_ids = organizations_for_user(portal_user).pluck(:id)
-        for_slice(Host.unscoped.where(organization_id: org_ids)).in_batches(of: 1_000)
-      end
-
-      def self.for_org(organization_id)
-        for_slice(Host.unscoped.where(organization_id: organization_id)).in_batches(of: 1_000)
-      end
-
-      def self.organizations_for_user(portal_user)
-        Organization
-          .joins(:telemetry_configuration)
-          .where(
-            redhat_access_telemetry_configurations: {
-              portal_user: portal_user,
-              enable_telemetry: true,
-            }
-          )
+        org_ids = Organization
+                  .joins(:telemetry_configuration)
+                  .where(
+                    redhat_access_telemetry_configurations: {
+                      portal_user: portal_user,
+                      enable_telemetry: true,
+                    }
+                  ).pluck(:id)
+        for_slice(Host.where(organization_id: org_ids)).in_batches(of: 1_000)
       end
     end
   end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -23,14 +23,14 @@ module ForemanInventoryUpload
             first = true
             hosts_batch.each do |host|
               @stream.comma unless first
-              first = false if report_host(host)
+              first = false
+              report_host(host)
             end
           end
         end
       end
 
       def report_host(host)
-        return nil unless host&.subscription_facet&.pools&.first
         @stream.object do
           @stream.simple_field('display_name', host.name)
           @stream.simple_field('fqdn', host.fqdn)
@@ -49,17 +49,9 @@ module ForemanInventoryUpload
               @stream.stringify_value(nic.mac) if nic.mac
             end.compact.join(', '))
           end
-          @stream.object_field('system_profile') do
+          @stream.object_field('system_profile', :last) do
             report_system_profile(host)
           end
-          @stream.array_field('facts', :last) do
-            @stream.object do
-              @stream.simple_field('namespace', 'satellite')
-              @stream.object_field('facts', :last) do
-                report_satellite_facts(host)
-              end
-            end
-          end
         end
       end
 
@@ -114,19 +106,6 @@ module ForemanInventoryUpload
         end
       end
 
-      def report_satellite_facts(host)
-        @stream.simple_field('virtual_host_name', host.subscription_facet.hypervisor_host&.name)
-        @stream.simple_field('virtual_host_uuid', host.subscription_facet.hypervisor_host&.subscription_facet&.uuid)
-        if defined?(ForemanThemeSatellite)
-          @stream.simple_field('satellite_version', ForemanThemeSatellite::SATELLITE_VERSION)
-        end
-        @stream.simple_field('system_purpose_usage', host.subscription_facet.purpose_usage)
-        @stream.simple_field('system_purpose_role', host.subscription_facet.purpose_role)
-        @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
-        @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
-        @stream.simple_field('organization_id', host.organization_id, :last)
-      end
-
       def fact_value(host, fact_name)
         value_record = host.fact_values.find do |fact_value|
           fact_value.fact_name_id == ForemanInventoryUpload::Generators::Queries.fact_names[fact_name]

data/lib/foreman_inventory_upload/version.rb

@@ -1,3 +1,3 @@
 module ForemanInventoryUpload
-  VERSION = '0.9.2'.freeze
+  VERSION = '1.0.0.beta1'.freeze
 end

data/lib/foreman_inventory_upload.rb

@@ -11,20 +11,16 @@ module ForemanInventoryUpload
     )
   end
 
-  def self.uploads_folder
-    @uploads_folder ||= ensure_folder(
-      File.join(
-        ForemanInventoryUpload.base_folder,
-        'uploads/'
-      )
-    )
-  end
+  def self.uploads_folder(group)
+    @uploads_folders ||= {}
+    cache = @uploads_folders[group]
+    return cache if cache
 
-  def self.generated_reports_folder
-    @generated_reports_folder ||= ensure_folder(
+    @uploads_folders[group] = ensure_folder(
       File.join(
         ForemanInventoryUpload.base_folder,
-        'generated_reports/'
+        'uploads/',
+        "#{group}/"
       )
     )
   end
@@ -37,13 +33,12 @@ module ForemanInventoryUpload
     'uploader.sh'
   end
 
-  def self.facts_archive_name(organization)
-    "report_for_#{organization}.tar.gz"
+  def self.facts_archive_name
+    'hosts_report.tar.gz'
   end
 
   def self.upload_url
-    # for testing set ENV to 'https://ci.cloud.redhat.com/api/ingress/v1/upload'
-    @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cert.cloud.redhat.com/api/ingress/v1/upload'
+    'https://ci.cloud.paas.psi.redhat.com/api/ingress/v1/upload'
   end
 
   def self.ensure_folder(folder)

data/lib/tasks/foreman_inventory_upload_tasks.rake

@@ -13,7 +13,7 @@ namespace :test do
 end
 
 namespace :foreman_inventory_upload do
-  task :rubocop => :environment do
+  task :rubocop do
     begin
       require 'rubocop/rake_task'
       RuboCop::RakeTask.new(:rubocop_foreman_inventory_upload) do |task|

data/lib/tasks/generator.rake

@@ -4,26 +4,12 @@ namespace :foreman_inventory_upload do
   namespace :report do
     desc 'Generate inventory report to be sent to Red Hat cloud'
     task generate: :environment do
-      portal_user = ENV['portal_user']
-      organizations = [ENV['organization_id']]
-      base_folder = ENV['target'] || Dir.pwd
+      target = ENV['target'] || ForemanInventoryUpload.facts_archive_name
+      portal_user = ENV['portal_user'] || 'anonymous'
 
-      unless portal_user || organizations.empty?
-        puts "Must specify either portal_user or organization_id"
-      end
-
-      if portal_user
-        puts "Generating report for all organizations associated with #{portal_user}"
-        base_folder = File.join(base_folder, portal_user)
-        organizations = ForemanInventoryUpload::Generators::Queries.organizations_for_user(portal_user).pluck(:id)
-      end
-
-      organizations.each do |organization|
-        target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization))
-        archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
-        archived_report_generator.render(organization: organization)
-        puts "Successfully generated #{target} for organization id #{organization}"
-      end
+      archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
+      archived_report_generator.render(portal_user)
+      puts "Successfully generated #{target} for #{portal_user}"
     end
   end
 end

data/test/controllers/reports_controller_test.rb

@@ -5,14 +5,14 @@ class ReportsControllerTest < ActionController::TestCase
 
   test 'Returns latest report generation status' do
     progress_output = mock('progress_output')
-    test_org = FactoryBot.create(:organization)
+    test_portal_user = 'test_portal_user'
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id))
+      .with(ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_portal_user))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 
-    get :last, params: { organization_id: test_org.id }, session: set_session_user
+    get :last, params: { portal_user: test_portal_user }, session: set_session_user
 
     assert_response :success
     actual = JSON.parse(response.body)

data/test/controllers/{accounts_controller_test.rb → statuses_controller_test.rb}

@@ -1,24 +1,25 @@
 require 'test_plugin_helper'
 
-class AccountsControllerTest < ActionController::TestCase
-  tests ForemanInventoryUpload::AccountsController
+class StatusesControllerTest < ActionController::TestCase
+  tests ForemanInventoryUpload::StatusesController
 
   include FolderIsolation
 
   test 'Returns statuses for each process type' do
-    test_org = FactoryBot.create(:organization)
+    configuration = RedhatAccess::TelemetryConfiguration.new(enable_telemetry: true, portal_user: 'test')
+    configuration.save!
 
-    generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id)
+    generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label('test')
     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::UploadReportJob.output_label('test')
     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)['accounts'][test_org.id.to_s]
+    actual = JSON.parse(response.body)['statuses']['test']
     assert_equal 'generate_status_test', actual['generate_report_status']
     assert_equal 'upload_status_test', actual['upload_report_status']
   end

data/test/controllers/uploads_controller_test.rb

@@ -5,14 +5,14 @@ class UploadsControllerTest < ActionController::TestCase
 
   test 'Returns latest upload status' do
     progress_output = mock('progress_output')
-    test_org = FactoryBot.create(:organization)
+    test_portal_user = 'test_portal_user'
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id))
+      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_portal_user))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 
-    get :last, params: { organization_id: test_org.id }, session: set_session_user
+    get :last, params: { portal_user: test_portal_user }, session: set_session_user
 
     assert_response :success
     actual = JSON.parse(response.body)