foreman_rh_cloud 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeffb0a27f7ac98d94317024ffa19cf9ec9776870e46f635f2a2f4610b7d3bb3
-  data.tar.gz: 96d8c4cefe7e5a6c7eb44154beafa7e5e50977e67be4cb74a9f7c88b386ad0e6
+  metadata.gz: 0724cdfa4e0563ba9b2cbab222198ab8dd921527f8c31d1136795a158b659038
+  data.tar.gz: 7bc88ae8db51b586e7e4d6d8e05baf16dc782f86626e059aecacece43adbd4d8
 SHA512:
-  metadata.gz: 00176ebf23c4b18f981fd41622edbc49679a8a12ff77dc1dd9feba5fc4076a22eee994fce99bb9bf4caf7062dc8307adf9a7659e0aefbbfc95b7c24e2ad7d50c
-  data.tar.gz: d2bb193f176793554b5d0cd3f81703ea2b2042ede7868a6a2a49d4d807e0f2c582a2ea4b82010877bcbee7f83cb5ea2d1659555f23990e858020c0e69057c228
+  metadata.gz: 0e7e3dd16635ecbac89f7ad2cb2f62a59c29b71108e323dee2c050a9aedf62b7c1a304a977fe589322ae18044f5f2ffdbb1e22eb07ad9ee3e9e67045fa3d4614
+  data.tar.gz: 46f916e376facb3b487eb125e65916efca85b51c40c7ff4f090758e677ac37638cf81f07dec0e3279a61c67455d4c966948a6343eb4a26ed20ef3e76e0a3fafa

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -103,10 +103,10 @@ 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,
+              '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,

data/lib/foreman_rh_cloud/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "1.0.14",
+  "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
@@ -81,7 +83,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     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')
+    assert_equal 'test_nic1', actual_nic['name']
   end
 
   test 'hosts report fields should be present if fact exist' do
@@ -123,8 +125,10 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   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)
+    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
@@ -141,7 +145,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     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_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']
@@ -152,6 +158,26 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     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)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello