foreman_rh_cloud 2.0.13.1 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef13982f858bea42312ee1495b628b86c789e54d81ad939853f0657dbd0d5ad
-  data.tar.gz: 0e9e278c013651e9407d56cc0a85d3c923e28718b91d40a626cb395de572c702
+  metadata.gz: 778b0d71a8930862a9ea89c96b28024ef830b62bfe09c393da68200884bf1581
+  data.tar.gz: '01600923d9766697d70c1739a1e8a2257357804c01200b5571f8b63464401f8e'
 SHA512:
-  metadata.gz: c923cf6e37a14a608601f343dfed4184b8d22a4356372a65bfd3b94fc6aa451848d50952b54adad6cada51af4a7452af3554b9f2ccd325f6b530b51f2fa3b272
-  data.tar.gz: 28b1eb1031ce920dfe66e379c52f0ea7c4799114b6d84104df47b005d722caa08b5ae930fed87de0762ac0fe9a25a83c1fc40c7abc1147ed0da36723ce4eed76
+  metadata.gz: e48907c9626cbf815b00bc257a45801f5a55d0f5f6e797cf7d11fadd549e822580d420e60004efa8e92aabb75c1c3b799ecda447c06fa53a6cc7a36a72160747
+  data.tar.gz: 853e77b02847333267442716d2c4909cd9738cd1dbdcfa7a063b0a09859b90832f73f75cd2db78565ffaffba000aa0fdd8ea6924ad98d74f554a998f17cd5964

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 = '2.0.13.1'.freeze
+  VERSION = '2.0.14'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "2.0.13.1",
+  "version": "2.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,29 @@ 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)
+
+    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
+  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)
 
@@ -110,6 +137,14 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     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_not_nil(actual_nic = actual_network_interfaces.first)
+    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

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 = ({ 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: 2.0.13.1
+  version: 2.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
@@ -525,7 +525,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
@@ -540,25 +540,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/insights_factories.rb
+- test/factories/inventory_upload_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/rh_cloud_http_proxy_test.rb
+- test/unit/slice_generator_test.rb