foreman_rh_cloud 1.0.11 → 1.0.15

data/lib/tasks/rh_cloud_inventory.rake

@@ -12,17 +12,19 @@ namespace :rh_cloud_inventory do
         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
+      User.as_anonymous_admin do
+        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}"
+        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
       end
     end
   end

data/package.json

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

data/test/unit/fact_helpers_test.rb

@@ -26,4 +26,26 @@ class FactHelpersTest < ActiveSupport::TestCase
 
     assert actual
   end
+
+  test 'obfuscates ips with insights-client data' do
+    host = mock('host')
+    @instance.expects(:fact_value).with(host, 'insights_client::ips').returns(
+      '[{"obfuscated": "10.230.230.1", "original": "224.0.0.1"}, {"obfuscated": "10.230.230.2", "original": "224.0.0.251"}]'
+    )
+
+    actual = @instance.obfuscated_ips(host)
+
+    assert_equal '10.230.230.1', actual['224.0.0.1']
+    assert_equal '10.230.230.3', actual['224.0.0.2']
+  end
+
+  test 'obfuscates ips without insights-client data' do
+    host = mock('host')
+    @instance.expects(:fact_value).with(host, 'insights_client::ips').returns(nil)
+
+    actual = @instance.obfuscated_ips(host)
+
+    assert_equal '10.230.230.1', actual['224.0.0.1']
+    assert_equal '10.230.230.2', actual['224.0.0.2']
+  end
 end

data/test/unit/insights_facet_test.rb

@@ -3,6 +3,7 @@ require 'test_plugin_helper'
 class InsightsFacetTest < ActiveSupport::TestCase
   setup do
     @host = FactoryBot.create(:host, :with_insights_hits)
+    InsightsFacet.reset_counters(@host.insights.id, :hits_count)
   end
 
   test 'host with hits can be deleted' do
@@ -13,4 +14,10 @@ class InsightsFacetTest < ActiveSupport::TestCase
     actual_host = Host.find_by_id(host_id)
     assert_nil actual_host
   end
+
+  test 'search host by recommendations_count' do
+    FactoryBot.create(:host) # create another host with no recommendations
+
+    assert_equal 1, Host.search_for('insights_recommendations_count = 1').count
+  end
 end

data/test/unit/rh_cloud_http_proxy_test.rb

@@ -0,0 +1,65 @@
+require 'test_plugin_helper'
+
+class RhCloudHttpProxyTest < ActiveSupport::TestCase
+  setup do
+    @global_content_proxy_mock = 'http://global:content@localhost:8888'
+    @global_foreman_proxy_mock = 'http://global:foreman@localhost:8888'
+    @katello_cdn_proxy_mock = {
+      host: 'localhost',
+      port: '8888',
+      user: 'katello',
+      password: 'cdn',
+      scheme: 'http',
+    }
+    @katello_cdn_proxy_string_mock = 'http://katello:cdn@localhost:8888'
+  end
+
+  test 'selects global content proxy' do
+    setup_global_content_proxy
+    setup_global_foreman_proxy
+    setup_cdn_proxy do
+      assert_equal @global_content_proxy_mock, ForemanRhCloud.proxy_setting
+    end
+  end
+
+  test 'selects cdn proxy' do
+    setup_global_foreman_proxy
+    setup_cdn_proxy do
+      assert_equal @katello_cdn_proxy_string_mock, ForemanRhCloud.proxy_setting
+    end
+  end
+
+  test 'selects global foreman proxy' do
+    setup_global_foreman_proxy
+
+    assert_equal @global_foreman_proxy_mock, ForemanRhCloud.proxy_setting
+  end
+
+  def setup_global_content_proxy
+    http_proxy = FactoryBot.create(:http_proxy, url: @global_content_proxy_mock)
+    HttpProxy.stubs(:default_global_content_proxy).returns(http_proxy)
+  end
+
+  def setup_global_foreman_proxy
+    FactoryBot.create(:setting, :name => 'http_proxy', :value => @global_foreman_proxy_mock)
+  end
+
+  def setup_cdn_proxy
+    old_cdn_setting = SETTINGS[:katello][:cdn_proxy]
+    SETTINGS[:katello][:cdn_proxy] = @katello_cdn_proxy_mock
+    yield
+  ensure
+    SETTINGS[:katello][:cdn_proxy] = old_cdn_setting
+  end
+
+  test 'transform proxy scheme test' do
+    mock_http_proxy = 'http://user:password@localhost:8888'
+    mock_https_proxy = 'https://user:password@localhost:8888'
+
+    transformed_http_uri = URI.parse(ForemanRhCloud.transform_scheme(mock_http_proxy))
+    transformed_https_uri = URI.parse(ForemanRhCloud.transform_scheme(mock_https_proxy))
+
+    assert_equal 'proxy', transformed_http_uri.scheme
+    assert_equal 'proxys', transformed_https_uri.scheme
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class ReportGeneratorTest < ActiveSupport::TestCase
+class SliceGeneratorTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
@@ -44,6 +44,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'dmi::chassis::asset_tag',
       'insights_client::obfuscate_hostname_enabled',
       'insights_client::hostname',
+      'insights_client::obfuscate_ip_enabled',
+      'insights_client::ips',
     ]
   end
 
@@ -69,10 +71,42 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_equal 1, generator.hosts_count
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_nil actual_system_profile['number_of_cpus']
+    assert_nil actual_system_profile['number_of_sockets']
+    assert_nil actual_system_profile['cores_per_socket']
+    assert_nil actual_system_profile['system_memory_bytes']
+    assert_nil actual_system_profile['os_release']
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.first)
+    refute actual_nic.key?('mtu')
+    refute actual_nic.key?('mac_address')
+    refute actual_nic.key?('name')
+  end
+
+  test 'hosts report fields should be present if fact exist' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu(s)'], value: '4', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu_socket(s)'], value: '2', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::core(s)_per_socket'], value: '1', host: @host)
+
+    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_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_equal 4, actual_system_profile['number_of_cpus']
+    assert_equal 2, actual_system_profile['number_of_sockets']
+    assert_equal 1, actual_system_profile['cores_per_socket']
   end
 
   test 'generates ip_address and mac_address fields' do
-    @host.interfaces << FactoryBot.build(:nic_managed)
+    nic = FactoryBot.build(:nic_managed)
+    nic.attrs['mtu'] = '1500'
+    @host.interfaces << nic
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
 
@@ -88,6 +122,89 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'generates nic fields' do
+    ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
+    nic = FactoryBot.build(:nic_managed, ip6: ip6)
+    nic.attrs['mtu'] = '1500'
+    @host.interfaces << nic
+    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_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    expected_ip = @host.interfaces.where.not(ip: nil).first.ip
+    assert_not_nil actual_host['ip_addresses'].find { |addr| addr == expected_ip }
+    expected_mac = @host.interfaces.where.not(mac: nil).first.mac
+    assert_not_nil actual_host['mac_addresses'].find { |mac| mac == expected_mac }
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.find { |nic_node| nic_node['ipv4_addresses'].first == nic.ip })
+    assert_equal nic.ip, actual_nic['ipv4_addresses'].first
+    assert_equal nic.ip6, actual_nic['ipv6_addresses'].first
+    assert_equal 1500, actual_nic['mtu']
+    assert_equal nic.mac, actual_nic['mac_address']
+    assert_equal nic.identifier, actual_nic['name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'generates obfuscated ip_address fields without inisghts-client' do
+    FactoryBot.create(:setting, :name => 'obfuscate_inventory_ips', :value => true)
+
+    @host.interfaces << FactoryBot.build(:nic_managed)
+    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_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal '10.230.230.1', actual_host['ip_addresses'].first
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.first)
+    assert_equal '10.230.230.1', actual_nic['ipv4_addresses'].first
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'generates obfuscated ip_address fields with inisghts-client' do
+    nic = FactoryBot.build(:nic_primary_and_provision)
+    @host.interfaces = [nic]
+    @host.save!
+
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_ip_enabled'], value: 'true', host: @host)
+    FactoryBot.create(
+      :fact_value,
+      fact_name: fact_names['insights_client::ips'],
+      value: "[{\"obfuscated\": \"10.230.230.100\", \"original\": \"#{nic.ip}\"}]",
+      host: @host
+    )
+
+    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_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal '10.230.230.100', actual_host['ip_addresses'].first
+    assert_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_not_nil(actual_nic = actual_network_interfaces.first)
+    assert_equal '10.230.230.100', actual_nic['ipv4_addresses'].first
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
   test 'obfuscates fqdn when instructed by insights-client' do
     FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_hostname_enabled'], value: 'true', host: @host)
     FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::hostname'], value: 'obfuscated_name', host: @host)
@@ -147,6 +264,10 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates a report with satellite facts' do
+    hostgroup = FactoryBot.create(:hostgroup)
+    @host.hostgroup = hostgroup
+    @host.save!
+
     Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -166,6 +287,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_tag(@host.content_view.name, actual_host, 'content_view')
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
+    assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
 
     assert_equal false, satellite_facts['is_hostname_obfuscated']
 
@@ -444,6 +566,32 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'alibaba', actual_profile['cloud_provider']
   end
 
+  test 'include packages installed in the report' do
+    FactoryBot.create(:setting, :name => 'exclude_installed_packages', :value => false)
+    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvra: 'test-package-1.0.x86_64')
+
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: @host.organization,
+      installed_packages: [installed_package]
+    )
+
+    batch = Host.where(id: another_host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_profile = actual_host['system_profile'])
+    assert_not_nil(actual_profile['installed_packages'])
+  end
+
   private
 
   def create_generator(batch, name = 'slice_123')

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js

@@ -34,10 +34,14 @@ export const autoUploadEnabled = true;
 
 export const hostObfuscationEnabled = true;
 
+export const ipsObfuscationEnabled = true;
+
 export const filterTerm = 'some_filter';
 
 export const cloudToken = 'some-cloud-token';
 
+export const excludePackages = false;
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,
@@ -46,6 +50,15 @@ export const props = {
   pollingProcessID,
 };
 
+export const pollingResponse = {
+  accounts,
+  autoUploadEnabled,
+  hostObfuscationEnabled,
+  ipsObfuscationEnabled,
+  cloudToken,
+  excludePackages,
+};
+
 export const fetchAccountsStatusResponse = {
-  data: { accounts, autoUploadEnabled, hostObfuscationEnabled, cloudToken },
+  data: pollingResponse,
 };

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js

@@ -1,4 +1,5 @@
 import API from 'foremanReact/API';
+import { addToast } from 'foremanReact/redux/actions/toasts';
 import { inventoryUrl } from '../../ForemanInventoryHelpers';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
@@ -10,17 +11,10 @@ import {
 
 export const fetchAccountsStatus = () => async dispatch => {
   try {
-    const {
-      data: { accounts, autoUploadEnabled, hostObfuscationEnabled, cloudToken },
-    } = await API.get(inventoryUrl('accounts'));
+    const { data } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
-      payload: {
-        accounts,
-        autoUploadEnabled,
-        hostObfuscationEnabled,
-        cloudToken,
-      },
+      payload: data,
     });
   } catch (error) {
     dispatch({
@@ -46,7 +40,7 @@ export const stopAccountStatusPolling = pollingProcessID => dispatch => {
   });
 };
 
-export const restartProcess = (accountID, activeTab) => dispatch => {
+export const restartProcess = (accountID, activeTab) => async dispatch => {
   let processController = null;
   let processStatusName = null;
 
@@ -58,12 +52,22 @@ export const restartProcess = (accountID, activeTab) => dispatch => {
     processStatusName = 'generate_report_status';
   }
 
-  API.post(inventoryUrl(`${accountID}/${processController}`));
-  dispatch({
-    type: INVENTORY_PROCESS_RESTART,
-    payload: {
-      accountID,
-      processStatusName,
-    },
-  });
+  try {
+    await API.post(inventoryUrl(`${accountID}/${processController}`));
+    dispatch({
+      type: INVENTORY_PROCESS_RESTART,
+      payload: {
+        accountID,
+        processStatusName,
+      },
+    });
+  } catch (error) {
+    dispatch(
+      addToast({
+        sticky: true,
+        type: 'error',
+        message: error.message,
+      })
+    );
+  }
 };