foreman_inventory_upload 2.0.4.pre.1 → 2.0.4.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df8943022dd75fcce3aadedde8db465bc7bfd3fd4f0d760a9c149e9d0e43446b
-  data.tar.gz: d5492c0003b1b27a619596569c5965e8850388b0cbd6e64400136d38e8acc856
+  metadata.gz: ba74f8d573fad2cdf133a05696a71d38e3d064dc2c52b4c28ea581b13d8814ea
+  data.tar.gz: 88d78a11ca435a6f4d081d71d4d6b93aa179b5792529aa81b99a363daa556714
 SHA512:
-  metadata.gz: 58ed0e5819993091a3eef055b352243a13069d904f3b09d275107bab1c1537f57ac3e78f86ec60b72b9d3f3d7be5c2cd2eb871b46df861d68b85b6c0282f96b1
-  data.tar.gz: 1d6a234e673067962e5163e4ddca2315f4e904a91ced1c0ca3dc6aa393c35cac66b325d8bf98d67e0e7a46d4ec2f1b22d49dd0f38190f239aaa507833248b2c5
+  metadata.gz: 35a87dd2c4b17ddf1a8f344e97624a11f7c4d87c27ecd845a1ec60882594da557318eab2a83ab5ccd8d6b78c83dc9278b50fd2d193133e87d312c55fa3728a88
+  data.tar.gz: 1a6e0ff8bf53354ab1e44b56a2a190237d11a330f32b8439a8900f3e1a4bf13b1f3048c9d5942a815654f1573b4a671a94c41508ded8e8cb773e3cb31cb5e591

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -22,6 +22,7 @@ module ForemanInventoryUpload
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
+              next unless host&.subscription_facet&.pools&.first
               @stream.comma unless first
               first = false if report_host(host)
             end
@@ -30,7 +31,6 @@ module ForemanInventoryUpload
       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)

data/lib/foreman_inventory_upload/version.rb

@@ -1,3 +1,3 @@
 module ForemanInventoryUpload
-  VERSION = '2.0.4.pre.1'.freeze
+  VERSION = '2.0.4.pre.2'.freeze
 end

data/test/unit/slice_generator_test.rb

@@ -139,4 +139,24 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_usage', fact_values['system_purpose_usage']
     assert_equal 'test_role', fact_values['system_purpose_role']
   end
+
+  test 'skips hosts without subscription' do
+    a_host = FactoryBot.create(
+      :host,
+      organization: @host.organization
+    )
+
+    # make a_host last
+    batch = Host.where(id: [@host.id, a_host.id]).order(:name).in_batches.first
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+
+    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.name, actual_host['display_name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+  end
 end

data/webpack/ForemanInventoryUpload/Components/Terminal/Terminal.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Spinner } from 'patternfly-react';
-import isEqual from 'lodash/isEqual';
+import { isEqual } from 'lodash';
 import './terminal.scss';
 import { isTerminalScrolledDown } from './TerminalHelper';
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_inventory_upload
 version: !ruby/object:Gem::Version
-  version: 2.0.4.pre.1
+  version: 2.0.4.pre.2
 platform: ruby
 authors:
 - Inventory upload team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -327,12 +327,12 @@ signing_key:
 specification_version: 4
 summary: Summary of ForemanInventoryUpload.
 test_files:
-- test/test_plugin_helper.rb
-- test/factories/inventory_upload_factories.rb
+- test/controllers/accounts_controller_test.rb
 - test/controllers/reports_controller_test.rb
 - test/controllers/uploads_controller_test.rb
-- test/controllers/accounts_controller_test.rb
-- test/unit/slice_generator_test.rb
+- test/factories/inventory_upload_factories.rb
+- test/test_plugin_helper.rb
+- test/unit/archived_report_generator_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/shell_process_job_test.rb
-- test/unit/archived_report_generator_test.rb
+- test/unit/slice_generator_test.rb