foreman_rh_cloud 1.0.13 → 1.0.17

data/lib/foreman_inventory_upload.rb

@@ -48,7 +48,7 @@ module ForemanInventoryUpload
   end
 
   def self.facts_archive_name(organization)
-    "report_for_#{organization}.tar.gz"
+    "report_for_#{organization}.tar.xz"
   end
 
   def self.upload_url

data/lib/foreman_inventory_upload/generators/archived_report.rb

@@ -28,7 +28,7 @@ module ForemanInventoryUpload
 
           @logger.info 'Archiving generated report'
           # success = system('tar', '-zcvf', @target, '-C', tmpdir, '.')
-          Open3.popen2e('tar', '-zcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
+          Open3.popen2e('tar', '-Jcvf', @target, '-C', tmpdir, '.') do |_in, out, wait_thr|
             @logger.info("tar: #{out.read}")
 
             if wait_thr.value.success?

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -103,11 +103,11 @@ module ForemanInventoryUpload
         @stream.simple_field('cores_per_socket', fact_value(host, 'cpu::core(s)_per_socket')) { |v| v.to_i }
         @stream.simple_field('system_memory_bytes', fact_value(host, 'memory::memtotal')) { |v| kilobytes_to_bytes(v.to_i) }
         @stream.array_field('network_interfaces') do
-          @stream.raw(host.interfaces.map do |nic|
+          @stream.raw(host.interfaces.reject { |nic| nic.identifier.empty? }.map do |nic|
             {
-              'ipv4_addresses': [host_ips_cache[nic.ip]].compact,
-              'ipv6_addresses': [nic.ip6].compact,
-              'mtu': nic.try(:mtu),
+              'ipv4_addresses': [host_ips_cache[nic.ip]].reject(&:empty?),
+              'ipv6_addresses': [nic.ip6].reject(&:empty?),
+              'mtu': nic.try(:mtu) && nic.mtu.to_i,
               'mac_address': nic.mac,
               'name': nic.identifier,
             }.compact.to_json

data/lib/foreman_rh_cloud/engine.rb

@@ -79,7 +79,6 @@ module ForemanRhCloud
       ::Katello::UINotifications::Subscriptions::ManifestImportSuccess.include ForemanInventoryUpload::Notifications::ManifestImportSuccessNotificationOverride if defined?(Katello)
 
       ::Host::Managed.include RhCloudHost
-      ::Host::Base.include RhCloudHost
     end
 
     initializer "foreman_rh_cloud.set_dynflow.config.on_init", :before => :finisher_hook do |_app|

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.13'.freeze
+  VERSION = '1.0.17'.freeze
 end

data/package.json

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

data/test/unit/slice_generator_test.rb

@@ -18,6 +18,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.interfaces.first.identifier = 'test_nic1'
+    @host.save!
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
@@ -77,6 +79,11 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     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')
+    assert_equal 'test_nic1', actual_nic['name']
   end
 
   test 'hosts report fields should be present if fact exist' do
@@ -99,7 +106,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   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)
 
@@ -115,6 +124,60 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 1, generator.hosts_count
   end
 
+  test 'generates nic fields' do
+    empty_nic = FactoryBot.build(:nic_managed, ip6: '', identifier: 'empty_nic')
+    @host.interfaces << empty_nic
+    ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
+    nic = FactoryBot.build(:nic_managed, ip6: ip6, identifier: 'good_nic')
+    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_empty_nic = actual_network_interfaces.find { |actual_nic| actual_nic['name'] == 'empty_nic' })
+    assert actual_empty_nic['ipv6_addresses'].empty?
+    assert_not_nil(actual_nic = actual_network_interfaces.find { |actual_nic| actual_nic['name'] == 'good_nic' })
+    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 'skips nameless nics' do
+    ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
+    nic = FactoryBot.build(:nic_managed, ip6: ip6, identifier: '')
+    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)
+    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_not_nil(actual_system_profile = actual_host['system_profile'])
+    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
+    assert_nil actual_network_interfaces.find { |actual_nic| actual_nic['name'].empty? }
+  end
+
   test 'generates obfuscated ip_address fields without inisghts-client' do
     FactoryBot.create(:setting, :name => 'obfuscate_inventory_ips', :value => true)
 

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/components/Modal.js

@@ -21,10 +21,10 @@ const SyncModal = ({ show, toggleModal }) => (
     <Modal.Body>
       <Grid>
         <p>
-          {__(`Please go over the following steps to add a RHSM API token:`)}
+          {__(`Please go over the following steps to add a Red Hat API token:`)}
         </p>
         <p>
-          {__(`1. Obtain an RHSM API token: `)}
+          {__(`1. Obtain an Red Hat API token: `)}
           <a
             href="https://access.redhat.com/management/api"
             target="_blank"

data/webpack/InsightsCloudSync/InsightsCloudSync.js

@@ -19,7 +19,7 @@ const InsightsCloudSync = ({ data: { settingsUrl }, syncInsights }) => {
              recommendations output for hosts managed here`)}
           </p>
           <p>
-            {__(`1. Obtain an RHSM API token: `)}
+            {__(`1. Obtain an Red Hat API token: `)}
             <a
               href="https://access.redhat.com/management/api"
               target="_blank"

data/webpack/InsightsCloudSync/__snapshots__/InsightsCloudSync.test.js.snap

@@ -19,7 +19,7 @@ exports[`InsightsCloudSync render 1`] = `
              recommendations output for hosts managed here
       </p>
       <p>
-        1. Obtain an RHSM API token: 
+        1. Obtain an Red Hat API token: 
         <a
           href="https://access.redhat.com/management/api"
           rel="noopener noreferrer"

data/webpack/InsightsHostDetailsTab/InsightsTab.scss

@@ -77,7 +77,7 @@
     }
 
     &::-webkit-scrollbar-thumb {
-      background: #0e0e0e6e;
+      background: #222;
       border-radius: 6px;
       border: 3px solid transparent;
       background-clip: content-box;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.17
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -125,6 +125,9 @@ files:
 - app/views/foreman_rh_cloud/react/inventory_upload.html.erb
 - app/views/hosts/_insights_tab.html.erb
 - app/views/layouts/foreman_rh_cloud/application.html.erb
+- config/Gemfile.lock.gh_test
+- config/database.yml.example
+- config/package-lock.json.gh_test
 - config/routes.rb
 - db/migrate/20191215104806_create_insights_hits.foreman_inventory_upload.rb
 - db/migrate/20191216062008_create_insights_facets.foreman_inventory_upload.rb
@@ -547,25 +550,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
+- test/controllers/uploads_controller_test.rb
+- test/controllers/insights_sync/settings_controller_test.rb
+- test/controllers/accounts_controller_test.rb
+- test/controllers/reports_controller_test.rb
 - test/test_plugin_helper.rb
+- test/jobs/upload_report_job_test.rb
+- test/jobs/insights_full_sync_test.rb
+- test/jobs/inventory_full_sync_test.rb
 - test/factories/inventory_upload_factories.rb
 - test/factories/insights_factories.rb
-- test/controllers/reports_controller_test.rb
-- test/controllers/uploads_controller_test.rb
-- test/controllers/accounts_controller_test.rb
-- test/controllers/insights_sync/settings_controller_test.rb
-- test/unit/slice_generator_test.rb
-- test/unit/metadata_generator_test.rb
-- test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/shell_process_job_test.rb
+- test/unit/metadata_generator_test.rb
 - test/unit/insights_facet_test.rb
-- test/unit/archived_report_generator_test.rb
+- test/unit/rh_cloud_http_proxy_test.rb
 - test/unit/fact_helpers_test.rb
-- test/jobs/inventory_full_sync_test.rb
-- test/jobs/insights_full_sync_test.rb
-- test/jobs/upload_report_job_test.rb
+- test/unit/archived_report_generator_test.rb
+- test/unit/slice_generator_test.rb