foreman_rh_cloud 1.0.13.1 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e764cf33b2ab8c20150a8a62ddbbbd3054acb763fe2be687a41f48953ba325
-  data.tar.gz: fb53b2c932ba73df66e19454b5db35c6d63daa23e26d5f34667e5712b1f1e135
+  metadata.gz: 830861dcfd46371108e610046d742960ace76310a79bf3fde268de4230de0ccb
+  data.tar.gz: a42767333df5769a37bcd9e28ebb9e7eab815a13933bdd38cb678c77602eb5b0
 SHA512:
-  metadata.gz: a3b338417ad7ef6b45e9a1ccd1a1c764be52ff702f71b18231e60b847165b437d384aefe3799c3450611d19bd34797d91806ab405acc154448412e6dfb76c340
-  data.tar.gz: c38fe55bcdd4be6e1c9d63e54b4b7ae25e3221829c095bfa74e7425bbff79c56e93abf5ce5d0f0ba3ec98d96e00012771bbc9c329d10d67d2a9632514f921e5c
+  metadata.gz: bc3f5e9f3f5dff9c8198bc10d131c42f6b2cd8ef5409711182af631effda0b0b99a2c12f9e0b0e1cf4d30a821f58d28fef94edc2341a2938693ba773832a8a27
+  data.tar.gz: 87731548c51473f8f88d20f9036d3709135734795c950ffb70fe86b302d18c209a3825fa720b1227ffbe3cc4a51960f7386a6cbfce0d91494f94afb0d2de4745

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -107,7 +107,7 @@ module ForemanInventoryUpload
             {
               'ipv4_addresses': [host_ips_cache[nic.ip]].compact,
               'ipv6_addresses': [nic.ip6].compact,
-              'mtu': nic.try(:mtu),
+              'mtu': nic.try(:mtu) && nic.mtu.to_i,
               'mac_address': nic.mac,
               'name': nic.identifier,
             }.compact.to_json

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.13.1'.freeze
+  VERSION = '1.0.14'.freeze
 end

data/package.json

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

data/test/unit/slice_generator_test.rb

@@ -77,6 +77,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')
+    refute actual_nic.key?('name')
   end
 
   test 'hosts report fields should be present if fact exist' do
@@ -99,7 +104,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 +122,36 @@ class SliceGeneratorTest < 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)
 

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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.13.1
+  version: 1.0.14
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -532,7 +532,7 @@ homepage: https://github.com/theforeman/foreman_rh_cloud
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -547,25 +547,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Summary of ForemanRhCloud.
 test_files:
-- test/test_plugin_helper.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/controllers/reports_controller_test.rb
+- test/controllers/uploads_controller_test.rb
+- test/factories/inventory_upload_factories.rb
+- test/factories/insights_factories.rb
+- test/jobs/insights_full_sync_test.rb
+- test/jobs/inventory_full_sync_test.rb
+- test/jobs/upload_report_job_test.rb
+- test/test_plugin_helper.rb
+- test/unit/archived_report_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/insights_facet_test.rb
-- test/unit/archived_report_generator_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/insights_facet_test.rb
+- test/unit/slice_generator_test.rb
+- test/unit/rh_cloud_http_proxy_test.rb