foreman_rh_cloud 12.2.1 → 12.2.3

data/lib/insights_cloud/async/insights_scheduled_sync.rb

@@ -13,7 +13,7 @@ module InsightsCloud
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self
         else
           after_delay do
@@ -23,7 +23,7 @@ module InsightsCloud
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def plan_full_sync

data/lib/inventory_sync/async/inventory_hosts_sync.rb

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

data/lib/inventory_sync/async/inventory_scheduled_sync.rb

@@ -13,7 +13,7 @@ module InventorySync
           return
         end
 
-        if ForemanRhCloud.with_local_advisor_engine?
+        if ForemanRhCloud.with_iop_smart_proxy?
           plan_self # so that 'run' runs
         else
           after_delay do
@@ -35,7 +35,7 @@ module InventorySync
       end
 
       def run
-        output[:status] = _('The scheduled process is disabled because this Foreman is configured with the use_local_advisor_engine option.') if ForemanRhCloud.with_local_advisor_engine?
+        output[:status] = _('The scheduled process is disabled because this Foreman is configured with a local IoP Smart Proxy.') if ForemanRhCloud.with_iop_smart_proxy?
       end
 
       def plan_remove_insights_hosts(org_id)

data/lib/tasks/insights.rake

@@ -24,7 +24,7 @@ namespace :rh_cloud_insights do
   desc "Re-announce all organizations into Sources on RH cloud."
   task announce_to_sources: [:environment] do
     logger = Logging::Logger.new(STDOUT)
-    if ForemanRhCloud.with_local_advisor_engine?
+    if ForemanRhCloud.with_iop_smart_proxy?
       logger.warn('Task announce_to_sources is not available when using local advisor engine')
     else
       Organization.unscoped.each do |org|

data/lib/tasks/rh_cloud_inventory.rake

@@ -9,7 +9,7 @@ namespace :rh_cloud_inventory do
       else
         organizations = [Organization.where(:id => ENV['organization_id']).first]
       end
-      disconnected = ForemanRhCloud.with_local_advisor_engine?
+      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       User.as_anonymous_admin do
         organizations.each do |organization|
           ForemanTasks.async_task(
@@ -45,6 +45,24 @@ namespace :rh_cloud_inventory do
           archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
           archived_report_generator.render(organization: organization, filter: filter)
           puts "Successfully generated #{target} for organization id #{organization}"
+
+          next unless ForemanRhCloud.with_iop_smart_proxy?
+
+          puts 'Creating missing insights facets'
+          hosts_without_facets = ForemanInventoryUpload::Generators::Queries.for_org(organization, hosts_query: 'null? insights_uuid')
+          hosts_without_facets.each do |batch|
+            facets = batch.pluck(:id, 'katello_subscription_facets.uuid').map do |host_id, uuid|
+              {
+                host_id: host_id,
+                uuid: uuid,
+              }
+            end
+            # We don't need to validate the facets here as we create the necessary fields.
+            # rubocop:disable Rails/SkipsModelValidations
+            InsightsFacet.upsert_all(facets, unique_by: :host_id) unless facets.empty?
+            # rubocop:enable Rails/SkipsModelValidations
+          end
+          puts 'Missing Insights facets created'
         end
       end
     end
@@ -53,7 +71,7 @@ namespace :rh_cloud_inventory do
       base_folder = ENV['target'] || ForemanInventoryUpload.generated_reports_folder
       organization_id = ENV['organization_id']
       report_file = ForemanInventoryUpload.facts_archive_name(organization_id)
-      disconnected = ForemanRhCloud.with_local_advisor_engine?
+      disconnected = ForemanRhCloud.with_iop_smart_proxy?
       ForemanTasks.sync_task(ForemanInventoryUpload::Async::QueueForUploadJob, base_folder, report_file, organization_id, disconnected)
       puts "Uploaded #{report_file}"
     end

data/package.json

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

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

@@ -17,8 +17,8 @@ module InsightsCloud::Api
         @http_req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org')
 
         org = FactoryBot.create(:organization)
-        host = FactoryBot.create(:host, :with_subscription, :organization => org)
-        User.current = ::Katello::CpConsumerUser.new(:uuid => host.subscription_facet.uuid, :login => host.subscription_facet.uuid)
+        @host = FactoryBot.create(:host, :with_subscription, :organization => org)
+        User.current = ::Katello::CpConsumerUser.new(:uuid => @host.subscription_facet.uuid, :login => @host.subscription_facet.uuid)
         InsightsCloud::Api::MachineTelemetriesController.any_instance.stubs(:upstream_owner).returns({ 'uuid' => 'abcdefg' })
 
         setup_certs_expectation do
@@ -151,6 +151,20 @@ module InsightsCloud::Api
         assert_equal 'Cloud request failed', JSON.parse(@response.body)['message']
         assert_match /#{@body}/, JSON.parse(@response.body)['response']
       end
+
+      test "should create insights facet" do
+        assert_nil InsightsFacet.find_by(host_id: @host.id)
+        ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+        req = RestClient::Request.new(:method => 'GET', :url => 'http://test.theforeman.org/')
+        net_http_resp = Net::HTTPResponse.new(1.0, 200, "OK")
+        net_http_resp[:content_type] = 'application/zip'
+        res = RestClient::Response.create(@body, net_http_resp, req)
+        ::ForemanRhCloud::CloudRequestForwarder.any_instance.stubs(:forward_request).returns(res)
+
+        get :forward_request, params: { "path" => "/redhat_access/r/insights/uploads/" }
+
+        assert_not_nil InsightsFacet.find_by(host_id: @host.id)
+      end
     end
 
     context '#branch_info' do
@@ -166,7 +180,10 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+          content_facet: FactoryBot.build(
+            :content_facet,
+            content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+          ),
           organization: env.organization
         )
 

data/test/controllers/insights_sync/settings_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 class SettingsControllerTest < ActionController::TestCase
   tests InsightsCloud::SettingsController
   def setup
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(false)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
   end
 
   test 'should return allow_auto_insights_sync setting' do

data/test/factories/inventory_upload_factories.rb

@@ -1,87 +1,3 @@
-# redefine katello factories, as long as katello is not compatible with dynamic properties
-FactoryBot.define do
-  factory :katello_organization, :class => "Organization" do
-    type { "Organization" }
-    sequence(:name) { |n| "Organization#{n}" }
-    sequence(:label) { |n| "org#{n}" }
-    sequence(:id) { |n| n }
-
-    trait :acme_corporation do
-      name { "ACME_Corporation" }
-      type { "Organization" }
-      description { "This is the first Organization." }
-      label { "acme_corporation_label" }
-    end
-
-    trait :with_library do
-      association :library, :factory => :katello_library
-    end
-
-    factory :acme_corporation, :traits => [:acme_corporation]
-  end
-end
-
-FactoryBot.define do
-  factory :katello_content_view, :class => Katello::ContentView do
-    sequence(:name) { |n| "Database#{n}" }
-    description { "This content view is for database content" }
-    association :organization, :factory => :katello_organization
-
-    trait :composite do
-      composite { true }
-    end
-  end
-end
-
-FactoryBot.define do
-  factory :katello_content_view_environment, :class => Katello::ContentViewEnvironment do
-    sequence(:name) { |n| "name#{n}" }
-    sequence(:label) { |n| "label#{n}" }
-  end
-end
-
-FactoryBot.define do
-  factory :katello_k_t_environment, :aliases => [:katello_environment], :class => Katello::KTEnvironment do
-    sequence(:name) { |n| "Environment#{n}" }
-    sequence(:label) { |n| "environment#{n}" }
-    association :organization, :factory => :katello_organization
-  end
-end
-
-FactoryBot.define do
-  factory :katello_content_facets, :aliases => [:content_facet], :class => ::Katello::Host::ContentFacet do
-    sequence(:uuid) { |n| "uuid-#{n}" }
-  end
-end
-
-FactoryBot.define do
-  factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % { n: n, r: rand(500) } }
-    facts { { 'memory.memtotal' => "12 GB" } }
-  end
-end
-
-FactoryBot.define do
-  factory :katello_subscription, :class => Katello::Subscription do
-  end
-end
-
-FactoryBot.define do
-  factory :katello_pool, :class => Katello::Pool do
-    active { true }
-    end_date { Date.today + 1.year }
-    cp_id { 1 }
-
-    association :organization, :factory => :katello_organization
-
-    after(:build) do |pool, _evaluator|
-      pool.subscription.organization = pool.organization
-    end
-
-    association :subscription, :factory => :katello_subscription
-  end
-end
-
 FactoryBot.define do
   factory :katello_host_collection_host, :class => Katello::HostCollectionHosts do
     host_id { nil }
@@ -94,34 +10,10 @@ FactoryBot.define do
   end
 end
 
+# Fix Katello factories to return a valid UUID
 FactoryBot.modify do
-  factory :host do
-    transient do
-      content_view { nil }
-      lifecycle_environment { nil }
-      content_source { nil }
-      content_view_environments { [] }
-    end
-
-    trait :with_content do
-      association :content_facet, :factory => :content_facet, :strategy => :build
-
-      after(:build) do |host, evaluator|
-        if host.content_facet
-          if evaluator.content_view && evaluator.lifecycle_environment
-            host.content_facet.assign_single_environment(
-              content_view_id: evaluator.content_view.id,
-              lifecycle_environment_id: evaluator.lifecycle_environment.id
-            )
-          end
-          host.content_facet.content_source = evaluator.content_source if evaluator.content_source
-          host.content_facet.content_view_environments = evaluator.content_view_environments unless evaluator.content_view_environments.empty?
-        end
-      end
-    end
-
-    trait :with_subscription do
-      association :subscription_facet, :factory => :subscription_facet, :strategy => :build
-    end
+  factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
+    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % { n: n, r: rand(500) } }
+    facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -14,14 +14,14 @@ class InventoryScheduledSyncTest < ActiveSupport::TestCase
     ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
   end
 
-  test 'Skips execution if with_local_advisor_engine? is true' do
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(true)
+  test 'Skips execution if with_iop_smart_proxy? is true' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
     InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
 
     task = ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
     status = task.output[:status].to_s
-    assert_match(/Foreman is configured with the use_local_advisor_engine option/, status)
+    assert_match(/Foreman is configured with a local IoP Smart Proxy/, status)
   end
 
   test 'Skips execution if auto upload is disabled' do

data/test/test_plugin_helper.rb

@@ -2,10 +2,16 @@
 require 'test_helper'
 
 # Add plugin to FactoryBot's paths
-FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+katello_files = Dir.glob("#{Katello::Engine.root}/test/factories/**/*.rb")
+FactoryBot.definition_file_paths +=
+  katello_files
+  # skip foreman_task factories, since we already have those definitions in ForemanTasks
+  .reject { |f| f =~ /foreman_task|recurring_logic/ }
+  .map { |f| f.gsub('.rb', '') } # .rb extension is will be appended by factorybot
 FactoryBot.definition_file_paths << "#{ForemanRemoteExecution::Engine.root}/test/factories"
+FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
-# FactoryBot.definition_file_paths << "#{Katello::Engine.root}/test/factories"
 FactoryBot.reload
 
 begin

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -4,7 +4,7 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   setup do
     @global_content_proxy_mock = 'http://global:content@localhost:80'
     @global_foreman_proxy_mock = 'http://global:foreman@localhost:80'
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(false)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(false)
   end
 
   test 'selects global content proxy' do
@@ -20,8 +20,8 @@ class RhCloudHttpProxyTest < ActiveSupport::TestCase
   end
 
   test 'returns empty string in on-prem setup' do
-    ForemanRhCloud.unstub(:with_local_advisor_engine?)
-    ForemanRhCloud.stubs(:with_local_advisor_engine?).returns(true)
+    ForemanRhCloud.unstub(:with_iop_smart_proxy?)
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
 
     assert_empty ForemanRhCloud.proxy_setting
   end

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -22,7 +22,10 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
       :with_content,
       :with_hostgroup,
       :with_parameter,
-      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)],
+      content_facet: FactoryBot.build(
+        :content_facet,
+        content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+      ),
       organization: env.organization
     )
 

data/test/unit/services/foreman_rh_cloud/insights_api_forwarder_test.rb

@@ -32,7 +32,7 @@ class UIRequestForwarderTest < ActiveSupport::TestCase
     ::ForemanRhCloud::TagsAuth.any_instance.expects(:update_tag)
     @forwarder.expects(:execute_cloud_request).with do |actual_params|
       actual = actual_params[:headers][:params]
-      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tag && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
+      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tags && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
       true
     end
 
@@ -82,7 +82,7 @@ class UIRequestForwarderTest < ActiveSupport::TestCase
     ::ForemanRhCloud::TagsAuth.any_instance.expects(:update_tag)
     @forwarder.expects(:execute_cloud_request).with do |actual_params|
       actual = actual_params[:headers][:params]
-      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tag && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
+      assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(actual.find { |param| param[0] == :tags && tag_name(param[1]) =~ /#{ForemanRhCloud::TagsAuth::TAG_NAME}/ }[1])
       assert_equal 5, actual.find { |param| param[0] == :page }[1]
       assert_equal 42, actual.find { |param| param[0] == :per_page }[1]
       true
@@ -160,6 +160,47 @@ class UIRequestForwarderTest < ActiveSupport::TestCase
     # This is done by setting the expectation before the actual call.
   end
 
+  test 'scope_request? should return tag_name for scoped requests' do
+    get_req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/api/vulnerability/v1/vulnerabilities/cves',
+      'REQUEST_METHOD' => 'GET',
+      'rack.input' => ::Puma::NullIO.new
+    )
+
+    result = @forwarder.send(:scope_request?, get_req, 'api/vulnerability/v1/vulnerabilities/cves')
+    assert_equal :tags, result
+  end
+
+  test 'scope_request? should return nil for non-GET requests' do
+    post_req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/api/vulnerability/v1/cves',
+      'REQUEST_METHOD' => 'POST',
+      'rack.input' => ::Puma::NullIO.new
+    )
+
+    result = @forwarder.send(:scope_request?, post_req, '/api/vulnerability/v1/cves')
+    assert_nil result
+  end
+
+  test 'scope_request? should return nil for unmatched paths' do
+    get_req = ActionDispatch::Request.new(
+      'REQUEST_URI' => '/api/unmatched/path',
+      'REQUEST_METHOD' => 'GET',
+      'rack.input' => ::Puma::NullIO.new
+    )
+
+    result = @forwarder.send(:scope_request?, get_req, '/api/unmatched/path')
+    assert_nil result
+  end
+
+  test 'prepare_tags should use provided tag_name' do
+    result = @forwarder.send(:prepare_tags, @user, @organization, @location, :custom_tag)
+
+    assert_equal 1, result.length
+    assert_equal :custom_tag, result[0][0]
+    assert_equal "U:\"#{@user.login}\"O:\"#{@organization.name}\"L:\"#{@location.name}\"", tag_value(result[0][1])
+  end
+
   def tag_value(param_value)
     return param_value unless param_value.is_a?(String)
 

data/test/unit/services/foreman_rh_cloud/tags_auth_test.rb

@@ -10,7 +10,7 @@ class TagsAuthTest < ActiveSupport::TestCase
     @auth = ::ForemanRhCloud::TagsAuth.new(@user, @org, @loc, @logger)
   end
 
-  test 'Generates tags update request' do
+  test 'Generates tags update request when hosts are present' do
     uuid1 = 'test_uuid1'
     uuid2 = 'test_uuid2'
 
@@ -26,4 +26,18 @@ class TagsAuthTest < ActiveSupport::TestCase
 
     @auth.update_tag
   end
+
+  test 'Should not execute cloud request when no hosts are present' do
+    @auth.expects(:allowed_hosts).returns([])
+    @auth.expects(:execute_cloud_request).never
+
+    @auth.update_tag
+  end
+
+  test 'Should not execute cloud request when allowed_hosts is nil' do
+    @auth.expects(:allowed_hosts).returns(nil)
+    @auth.expects(:execute_cloud_request).never
+
+    @auth.update_tag
+  end
 end

data/test/unit/slice_generator_test.rb

@@ -998,6 +998,39 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_not_nil actual_host['insights_id']
   end
 
+  test 'reports yum repos' do
+    ForemanRhCloud.stubs(:with_iop_smart_proxy?).returns(true)
+    FactoryBot.create(:katello_content, cp_content_id: '1', organization: @host.organization, name: 'Test Content', label: 'test-content')
+    repo = FactoryBot.build(
+      :katello_repository,
+      :fedora_17_x86_64_dev,
+      :with_content_view,
+      product: FactoryBot.create(:katello_product, :redhat, :with_provider, organization: @host.organization)
+    )
+    # force-save the root repo to avoid validation errors
+    repo.root.save(validate: false)
+    repo.save(validate: false)
+    @host.content_facet.bound_repositories << repo
+    @host.content_facet.content_source = FactoryBot.create(:smart_proxy, :with_pulp3)
+    @host.save(validate: false)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_yum_repos = actual_system_profile['yum_repos'])
+    assert_equal 1, actual_yum_repos.count
+    assert_not_nil(actual_yum_repo = actual_yum_repos.first)
+    assert_equal 'Test Content', actual_yum_repo['name']
+    assert_equal 'test-content', actual_yum_repo['id']
+    assert_match(/fedora_17/, actual_yum_repo['base_url'])
+    assert_equal true, actual_yum_repo['enabled']
+    assert_equal true, actual_yum_repo['gpgcheck']
+  end
+
   private
 
   def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')

data/test/unit/tags_generator_test.rb

@@ -26,7 +26,10 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       organization: env.organization,
       location: @location2,
       hostgroup: @hostgroup2,
-      content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+      content_facet: FactoryBot.build(
+        :content_facet,
+        content_view_environments: [make_cve(lifecycle_environment: env), make_cve(lifecycle_environment: env2)]
+      )
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)

data/webpack/CVEsHostDetailsTab/CVEsHostDetailsTab.js

@@ -8,7 +8,7 @@ const CVEsHostDetailsTab = ({ systemId }) => {
   const scope = 'vulnerability';
   const module = './SystemDetailTable';
   return (
-    <div className="rh-cloud-insights-vulnerability-host-details-component">
+    <div className="rh-cloud-insights-vulnerability-host-details-component vulnerability">
       <ScalprumComponent scope={scope} module={module} systemId={systemId} />
     </div>
   );

data/webpack/CveDetailsPage/CveDetailsPage.js

@@ -10,7 +10,7 @@ const CveDetailsPage = () => {
 
   return (
     <ScalprumProvider {...providerOptions}>
-      <div className="rh-cloud-cve-details-page">
+      <div className="rh-cloud-cve-details-page vulnerability">
         <ScalprumComponent scope={scope} module={module} cveId={cveId} />
       </div>
     </ScalprumProvider>

data/webpack/CveDetailsPage/CveDetailsPage.test.js

@@ -18,9 +18,7 @@ jest.mock('@scalprum/react-core', () => ({
 describe('CveDetailsPage component', () => {
   it('renders the container with correct class', () => {
     const { container } = render(<CveDetailsPage />);
-    expect(
-      container.querySelector('.rh-cloud-cve-details-page')
-    ).toBeTruthy();
+    expect(container.querySelector('.rh-cloud-cve-details-page')).toBeTruthy();
   });
 
   it('passes cveId from URL params to ScalprumComponent', () => {

data/webpack/ForemanColumnExtensions/index.js

@@ -46,7 +46,7 @@ const RecommendationsCell = hostDetails => {
     hostDetails?.insights_attributes ?? {}
   );
 
-  return insightsAttributes.useLocalAdvisorEngine ? (
+  return insightsAttributes.useIopMode ? (
     <IopRecommendationsCell hostDetails={hostDetails} />
   ) : (
     <HostedRecommendationsCell hostDetails={hostDetails} />

data/webpack/ForemanRhCloudPages.js

@@ -8,6 +8,7 @@ import InsightsCloudSync from './InsightsCloudSync';
 import IopRecommendationDetails from './IopRecommendationDetails/IopRecommendationDetails';
 import InsightsHostDetailsTab from './InsightsHostDetailsTab';
 import CveDetailsPage from './CveDetailsPage';
+import './common/styles.scss';
 
 const pages = [
   { name: 'ForemanInventoryUpload', type: ForemanInventoryUpload },

data/webpack/InsightsCloudSync/Components/RemediationModal/RemediationHelpers.js

@@ -3,7 +3,15 @@ import React from 'react';
 import { orderBy } from 'lodash';
 import Resolutions from './Resolutions';
 
-export const modifyRows = (remediations, setResolutions, setHostsIds) => {
+export const getResolutionId = (selectedResolution, id) =>
+  `${id}_${selectedResolution}`;
+
+export const modifyRows = (
+  remediations,
+  setResolutions,
+  setHostsIds,
+  isIop
+) => {
   if (remediations.length === 0) return [];
 
   const resolutionToSubmit = [];
@@ -15,9 +23,22 @@ export const modifyRows = (remediations, setResolutions, setHostsIds) => {
   ).map(({ id, host_id, hostname, title, resolutions, reboot }) => {
     hostsIdsToSubmit.add(host_id);
     const selectedResolution = resolutions[0]?.id;
+    /* eslint-disable spellcheck/spell-checker */
+
+    // For IoP: {
+    //  hit_id: "c7c6727e-2966-4f7c-87f1-20ef14db7a2d",
+    //  rule_id: "hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE",
+    //  resolution_type: "less_secure",
+    //  resolution_id:"hardening_ssh_client_alive|OPENSSH_HARDENING_CLIENT_ALIVE_less_secure",
+    // }
+    // for Hosted, hit_id and rule_id will be Foreman database IDs
+
+    /* eslint-enable spellcheck/spell-checker */
     resolutionToSubmit.push({
-      hit_id: id,
-      resolution_id: selectedResolution /** defaults to the first resolution if many */,
+      hit_id: isIop ? host_id : id,
+      rule_id: id,
+      resolution_type: selectedResolution /** defaults to the first resolution if many */,
+      resolution_id: getResolutionId(selectedResolution, id),
     });
     return {
       cells: [
@@ -25,10 +46,11 @@ export const modifyRows = (remediations, setResolutions, setHostsIds) => {
         title,
         <div>
           <Resolutions
-            hit_id={id}
+            hit_id={isIop ? host_id : id}
             resolutions={resolutions}
             setResolutions={setResolutions}
             selectedResolution={selectedResolution}
+            isIop={isIop}
           />
         </div>,
         reboot,