foreman_inventory_upload 1.0.0.beta6 → 1.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219f74e70847fcdcf6247367ca4aac22ae1dc8559ab093cb270162e95f822649
-  data.tar.gz: '09c1da91fec5a53ae8ac155d18c65344108e22e1e3ab20e5fd02466efc966ba5'
+  metadata.gz: 85837a58f5c5a76038117ea20c6a10873e8c87add4841c8fb08d29e69564b7f8
+  data.tar.gz: 652f7cac5cc2a3b861d82092257f0f683563aca3301f0c8a547ffc1cdfce89d6
 SHA512:
-  metadata.gz: b83ea5584d689c0fcbcb14db5684237c0f0eee6d56f7ab2de7e0c6cb6c7e6aa39ceb95a00c55aa63b2bec99e1fe3a9b25b65ce215f7a72c70d8ecbd2f457fbfa
-  data.tar.gz: 8851522e1609dcbe51f1b5c7eb9661d2026b17a18d728e31c960aa2d594d3aa001ab7134e834fa7193759f6d593e8d128144ee5f9d17f90547528c194b38911d
+  metadata.gz: 751a08aec0fafcc07496027d72dd087756f366acd6da686ea67833a3b2502fbffbd677734a122addd77b1213b35c61eee35736026617c43ae0ae866f2abd6632
+  data.tar.gz: bb8ba3a8aaad6e5ef7994aff64d42b3848d0855187b6bd1c91205c010b2c7aaeb89236678f69bd81d4f179bcd9e2a5faab8c4842410f6908d15c167bc45ecb07

data/lib/foreman_inventory_upload.rb

@@ -38,7 +38,8 @@ module ForemanInventoryUpload
   end
 
   def self.upload_url
-    'https://ci.cloud.paas.psi.redhat.com/api/ingress/v1/upload'
+    # for testing set ENV to 'https://ci.cloud.paas.psi.redhat.com/api/ingress/v1/upload'
+    @upload_url ||= ENV['SATELLITE_INVENTORY_UPLOAD_URL'] || 'https://cloud.redhat.com/api/ingress/v1/upload'
   end
 
   def self.ensure_folder(folder)

data/lib/foreman_inventory_upload/async/generate_report_job.rb

@@ -15,8 +15,7 @@ module ForemanInventoryUpload
       end
 
       def command
-        prefix = Rails.env.production? ? 'foreman-' : ''
-        "#{prefix}rake foreman_inventory_upload:report:generate"
+        'rake foreman_inventory_upload:report:generate'
       end
 
       def env

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -31,7 +31,7 @@ module ForemanInventoryUpload
             :installed_packages,
             :content_facet,
             :host_statuses,
-            subscription_facet: [:pools, :installed_products]
+            subscription_facet: [:pools, :installed_products, :hypervisor_host]
           )
           .merge(fact_values)
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -49,9 +49,23 @@ module ForemanInventoryUpload
               @stream.stringify_value(nic.mac) if nic.mac
             end.compact.join(', '))
           end
-          @stream.object_field('system_profile', :last) do
+          @stream.object_field('system_profile') do
             report_system_profile(host)
           end
+          @stream.array_field('facts', :last) do
+            @stream.object do
+              @stream.simple_field('namespace', 'satellite')
+              @stream.object_field('facts', :last) do
+                @stream.simple_field('virtual_host_name', host.subscription_facet.hypervisor_host&.name)
+                @stream.simple_field('virtual_host_uuid', host.subscription_facet.hypervisor_host&.subscription_facet&.uuid)
+                if defined?(ForemanThemeSatellite)
+                  @stream.simple_field('satellite_version', ForemanThemeSatellite::SATELLITE_VERSION)
+                end
+                @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
+                @stream.simple_field('organization_id', host.organization_id, :last)
+              end
+            end
+          end
         end
       end
 

data/lib/foreman_inventory_upload/version.rb

@@ -1,3 +1,3 @@
 module ForemanInventoryUpload
-  VERSION = '1.0.0.beta6'.freeze
+  VERSION = '1.0.0.beta7'.freeze
 end

data/test/unit/slice_generator_test.rb

@@ -57,4 +57,56 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
   end
+
+  test 'generates a report with satellite facts' do
+    Foreman.expects(:instance_id).returns('satellite-id')
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice-123')
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    facts = actual['hosts'].first['facts'].first
+    assert_equal 'satellite', facts['namespace']
+    satellite_facts = facts['facts']
+    assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
+    assert_equal @host.organization_id, satellite_facts['organization_id']
+
+    version = satellite_facts['satellite_version']
+    if defined?(ForemanThemeSatellite)
+      assert_equal ForemanThemeSatellite::SATELLITE_VERSION, version
+    else
+      assert_nil version
+    end
+  end
+
+  test 'generates a report for a host with hypervisor' do
+    hypervisor_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: @host.organization
+    )
+
+    @host.subscription_facet.hypervisor_host = hypervisor_host
+    @host.save!
+
+    batch = Host.where(id: @host.id).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_not_nil(host_facts = actual_host['facts']&.first)
+    assert_equal 'satellite', host_facts['namespace']
+    assert_not_nil(fact_values = host_facts['facts'])
+    assert_equal hypervisor_host.name, fact_values['virtual_host_name']
+    assert_equal hypervisor_host.subscription_facet.uuid, fact_values['virtual_host_uuid']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_inventory_upload
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta6
+  version: 1.0.0.beta7
 platform: ruby
 authors:
 - Inventory upload team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -104,7 +104,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/stylesheets/foreman_inventory_upload/foreman_inventory_upload.scss
 - app/controllers/foreman_inventory_upload/react_controller.rb
 - app/controllers/foreman_inventory_upload/reports_controller.rb
 - app/controllers/foreman_inventory_upload/statuses_controller.rb