foreman_rh_cloud 1.0.7 → 1.0.12

data/test/jobs/upload_report_job_test.rb

@@ -0,0 +1,34 @@
+require 'test_plugin_helper'
+
+class UploadReportJobTest < ActiveJob::TestCase
+  include FolderIsolation
+
+  test 'returns aborted state when disconnected' do
+    organization = FactoryBot.create(:organization)
+    Organization.any_instance.stubs(:owner_details).returns(
+      'upstreamConsumer' => {
+        'idCert' => 'TEST_CERT',
+      }
+    )
+    FactoryBot.create(:setting, :name => 'content_disconnected', :value => true)
+
+    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+
+    label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
+    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
+    assert_match(/Upload was stopped/, progress_output.full_output)
+    assert_match(/exit 1/, progress_output.status)
+  end
+
+  test 'returns aborted state when no certificate defined on organization' do
+    organization = FactoryBot.create(:organization)
+    Organization.any_instance.expects(:owner_details).returns(nil)
+
+    ForemanInventoryUpload::Async::UploadReportJob.perform_now('', organization.id)
+
+    label = ForemanInventoryUpload::Async::UploadReportJob.output_label(organization.id)
+    progress_output = ForemanInventoryUpload::Async::ProgressOutput.get(label)
+    assert_match(/Skipping organization/, progress_output.full_output)
+    assert_match(/exit 1/, progress_output.status)
+  end
+end

data/test/unit/insights_facet_test.rb

@@ -0,0 +1,16 @@
+require 'test_plugin_helper'
+
+class InsightsFacetTest < ActiveSupport::TestCase
+  setup do
+    @host = FactoryBot.create(:host, :with_insights_hits)
+  end
+
+  test 'host with hits can be deleted' do
+    assert_equal 1, @host.insights.hits.count
+
+    host_id = @host.id
+    @host.destroy
+    actual_host = Host.find_by_id(host_id)
+    assert_nil actual_host
+  end
+end

data/test/unit/metadata_generator_test.rb

@@ -13,6 +13,8 @@ class MetadataGeneratorTest < ActiveSupport::TestCase
 
     assert_not_nil actual['report_id']
     assert_equal 'Satellite', actual['source']
+    assert_not_nil (actual_metadata = actual['source_metadata'])
+    assert_equal ForemanRhCloud::VERSION, actual_metadata['foreman_rh_cloud_version']
     assert_equal({}, actual['report_slices'])
   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

@@ -9,6 +9,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     @host = FactoryBot.create(
       :host,
+      :redhat,
       :with_subscription,
       :with_content,
       content_view: cv.first,
@@ -63,6 +64,25 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
+    assert_nil actual_host['ip_addresses']
+    assert_nil actual_host['mac_addresses']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'generates ip_address and mac_address fields' do
+    @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 @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
+    assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_equal 1, generator.hosts_count
@@ -82,6 +102,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal 'obfuscated_name', actual_host['fqdn']
     assert_equal '1234', actual_host['account']
+    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
+    assert_equal true, actual_facts['is_hostname_obfuscated']
     assert_equal 1, generator.hosts_count
   end
 
@@ -94,12 +116,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    obfuscated_fqdn = Base64.urlsafe_encode64(Digest::SHA1.digest(@host.fqdn), padding: false)
+    obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn) + '.example.com'
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal obfuscated_fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
+    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
+    assert_equal true, actual_facts['is_hostname_obfuscated']
     assert_equal 1, generator.hosts_count
   end
 
@@ -117,10 +141,16 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
+    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
+    assert_equal false, actual_facts['is_hostname_obfuscated']
     assert_equal 1, generator.hosts_count
   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)
@@ -134,13 +164,15 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
     assert_equal @host.organization_id, satellite_facts['organization_id']
 
-    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id'}
-    assert_not_nil instance_id_tag
-    assert_equal 'satellite-id', instance_id_tag['value']
+    actual_host = actual['hosts'].first
+    assert_tag('satellite-id', actual_host, 'satellite_instance_id')
+    assert_tag(@host.organization_id.to_s, actual_host, 'organization_id')
+    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')
 
-    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id'}
-    assert_not_nil org_id_tag
-    assert_equal @host.organization_id.to_s, org_id_tag['value']
+    assert_equal false, satellite_facts['is_hostname_obfuscated']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
@@ -182,6 +214,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   test 'generates a report with system purpose' do
     @host.subscription_facet.purpose_usage = 'test_usage'
     @host.subscription_facet.purpose_role = 'test_role'
+    @host.subscription_facet.service_level = 'test_sla'
     @host.subscription_facet.save!
 
     batch = Host.where(id: @host.id).in_batches.first
@@ -198,6 +231,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(fact_values = host_facts['facts'])
     assert_equal 'test_usage', fact_values['system_purpose_usage']
     assert_equal 'test_role', fact_values['system_purpose_role']
+    assert_equal 'test_sla', fact_values['system_purpose_sla']
   end
 
   test 'generates a report for a golden ticket' do
@@ -236,6 +270,22 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'include also hosts with non-redhat OS' do
+    os = @host.operatingsystem
+    os.name = 'Centos'
+    os.save!
+
+    # make a_host last
+    batch = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).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_equal 1, generator.hosts_count
+  end
+
   test 'shows system_memory_bytes in bytes' do
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 
@@ -255,10 +305,17 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     first_pool = @host.organization.pools.first
     second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
     new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
-    @host.organization = new_org
-    @host.save!
 
-    batch = Host.where(id: @host.id).in_batches.first
+    another_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: new_org
+    )
+
+    batch = Host.where(id: another_host.id).in_batches.first
     generator = create_generator(batch)
 
     json_str = generator.render
@@ -403,4 +460,10 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     end
     generator
   end
+
+  def assert_tag(expected_value, host, tag_id)
+    actual_tag = host['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == tag_id }
+    assert_not_nil actual_tag
+    assert_equal expected_value, actual_tag['value']
+  end
 end

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

@@ -32,8 +32,12 @@ export const processStatusName = 'upload_report_status';
 
 export const autoUploadEnabled = true;
 
+export const hostObfuscationEnabled = true;
+
 export const filterTerm = 'some_filter';
 
+export const cloudToken = 'some-cloud-token';
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,
@@ -41,3 +45,7 @@ export const props = {
   stopAccountStatusPolling: noop,
   pollingProcessID,
 };
+
+export const fetchAccountsStatusResponse = {
+  data: { accounts, autoUploadEnabled, hostObfuscationEnabled, cloudToken },
+};

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

@@ -11,13 +11,15 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts, autoUploadEnabled },
+      data: { accounts, autoUploadEnabled, hostObfuscationEnabled, cloudToken },
     } = await API.get(inventoryUrl('accounts'));
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
+        cloudToken,
       },
     });
   } catch (error) {

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

@@ -1,11 +1,12 @@
 import Immutable from 'seamless-immutable';
+import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
   INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
   INVENTORY_ACCOUNT_STATUS_POLLING_START,
   INVENTORY_PROCESS_RESTART,
 } from './AccountListConstants';
-import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const initialState = Immutable({
   accounts: {},
@@ -22,6 +23,8 @@ export default (state = initialState, action) => {
       accountID,
       processStatusName,
       autoUploadEnabled,
+      hostObfuscationEnabled,
+      cloudToken,
     } = {},
   } = action;
 
@@ -31,6 +34,8 @@ export default (state = initialState, action) => {
         ...state,
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
+        cloudToken,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -57,6 +62,11 @@ export default (state = initialState, action) => {
         ...state,
         autoUploadEnabled,
       });
+    case HOST_OBFUSCATION_TOGGLE:
+      return state.merge({
+        ...state,
+        hostObfuscationEnabled,
+      });
     default:
       return state;
   }

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

@@ -2,9 +2,18 @@ import { selectForemanInventoryUpload } from '../../../ForemanRhCloudSelectors';
 
 export const selectAccountsList = state =>
   selectForemanInventoryUpload(state).accountsList;
+
 export const selectAccounts = state => selectAccountsList(state).accounts;
+
 export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
+
 export const selectError = state => selectAccountsList(state).error;
+
 export const selectAutoUploadEnabled = state =>
   selectAccountsList(state).autoUploadEnabled;
+
+export const selectHostObfuscationEnabled = state =>
+  selectAccountsList(state).hostObfuscationEnabled;
+
+export const selectCloudToken = state => selectAccountsList(state).cloudToken;

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

@@ -1,13 +1,20 @@
 import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import API from 'foremanReact/API';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,
   stopAccountStatusPolling,
   restartProcess,
 } from '../AccountListActions';
-import { pollingProcessID } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  fetchAccountsStatusResponse,
+} from '../AccountList.fixtures';
 import { accountID, activeTab } from '../../Dashboard/Dashboard.fixtures';
 
+jest.mock('foremanReact/API');
+API.get.mockImplementation(async () => fetchAccountsStatusResponse);
+
 const fixtures = {
   'should fetchAccountsStatus': () => fetchAccountsStatus(),
   'should startAccountStatusPolling': () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js

@@ -15,8 +15,11 @@ import {
   accountID,
   processStatusName,
   autoUploadEnabled,
+  hostObfuscationEnabled,
+  cloudToken,
 } from '../AccountList.fixtures';
 import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
+import { HOST_OBFUSCATION_TOGGLE } from '../../HostObfuscationSwitcher/HostObfuscationSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -26,6 +29,8 @@ const fixtures = {
       payload: {
         accounts,
         autoUploadEnabled,
+        hostObfuscationEnabled,
+        cloudToken,
       },
     },
   },
@@ -65,6 +70,14 @@ const fixtures = {
       },
     },
   },
+  'should handle HOST_OBFUSCATION_TOGGLE': {
+    action: {
+      type: HOST_OBFUSCATION_TOGGLE,
+      payload: {
+        hostObfuscationEnabled,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>