foreman_inventory_upload 2.0.3 → 2.0.4.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee366e2c29cdcebb956eea276f6fe8e4c3b61d92b28c9bf3fe7b796e8d9a736
-  data.tar.gz: 1ce3d7dec276594d6f2051856c9b7fae0bb0fa0b46f21f84b09bf02f2bf59698
+  metadata.gz: df8943022dd75fcce3aadedde8db465bc7bfd3fd4f0d760a9c149e9d0e43446b
+  data.tar.gz: d5492c0003b1b27a619596569c5965e8850388b0cbd6e64400136d38e8acc856
 SHA512:
-  metadata.gz: 74b2c3da2e3e7d75cb62fafdc768b37c3261b3debb06bcba4a70c73bc63e2cf0deb183ea13d4e041b58a77f6a9667f18e998130b70a5552127f9263c981c8af2
-  data.tar.gz: 00aceb0db75ca118b656d20add514d7aa522f3e59c7983f740dffea0b134b7d77c2434be124d9d7ad9d5201d58459fc7a8b2b1f23d5c138f030ad4e7e363dc9c
+  metadata.gz: 58ed0e5819993091a3eef055b352243a13069d904f3b09d275107bab1c1537f57ac3e78f86ec60b72b9d3f3d7be5c2cd2eb871b46df861d68b85b6c0282f96b1
+  data.tar.gz: 1d6a234e673067962e5163e4ddca2315f4e904a91ced1c0ca3dc6aa393c35cac66b325d8bf98d67e0e7a46d4ec2f1b22d49dd0f38190f239aaa507833248b2c5

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -52,7 +52,7 @@ module ForemanInventoryUpload
           @stream.object_field('system_profile') do
             report_system_profile(host)
           end
-          @stream.array_field('facts', :last) do
+          @stream.array_field('facts') do
             @stream.object do
               @stream.simple_field('namespace', 'satellite')
               @stream.object_field('facts', :last) do
@@ -60,7 +60,21 @@ module ForemanInventoryUpload
               end
             end
           end
+
+          @stream.array_field('tags', :last) do
+            report_tag('satellite', 'satellite_instance_id', Foreman.instance_id) if Foreman.respond_to?(:instance_id)
+            report_tag('satellite', 'organization_id', host.organization_id, :last)
+          end
+        end
+      end
+
+      def report_tag(namespace, key, value, last = nil)
+        @stream.object do
+          @stream.simple_field('namespace', namespace)
+          @stream.simple_field('key', key)
+          @stream.simple_field('value', value, :last)
         end
+        @stream.comma unless last
       end
 
       def report_system_profile(host)

data/lib/foreman_inventory_upload/version.rb

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

data/package.json

@@ -26,13 +26,12 @@
   "devDependencies": {
     "@babel/core": "^7.7.0",
     "@theforeman/builder": "^4.0.2",
-    "@theforeman/eslint-plugin-foreman": "^4.0.2",
     "@theforeman/stories": "^4.0.2",
     "@theforeman/test": "^4.0.2",
     "@theforeman/vendor-dev": "^4.0.2",
+    "@theforeman/eslint-plugin-foreman": "^4.0.2",
     "babel-eslint": "^10.0.0",
-    "eslint": "^6.8.0",
-    "jed": "^1.1.1",
+    "eslint": "^6.7.2",
     "prettier": "^1.13.5",
     "raf": "^3.4.0",
     "stylelint": "^9.3.0",
@@ -40,6 +39,7 @@
     "surge": "^0.20.3"
   },
   "dependencies": {
+    "jed": "^1.1.1",
     "react-intl": "^2.8.0"
   }
 }

data/test/unit/slice_generator_test.rb

@@ -59,7 +59,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'generates a report with satellite facts' do
-    Foreman.expects(:instance_id).returns('satellite-id')
+    Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
     generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice-123')
 
@@ -72,6 +72,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
     assert_equal @host.organization_id, satellite_facts['organization_id']
 
+    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id'}
+    assert_not_nil instance_id_tag
+    assert_equal 'satellite-id', instance_id_tag['value']
+
+    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id'}
+    assert_not_nil org_id_tag
+    assert_equal @host.organization_id, org_id_tag['value']
+
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
       assert_equal ForemanThemeSatellite::SATELLITE_VERSION, version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_inventory_upload
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4.pre.1
 platform: ruby
 authors:
 - Inventory upload team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -318,21 +318,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Summary of ForemanInventoryUpload.
 test_files:
-- test/controllers/accounts_controller_test.rb
+- test/test_plugin_helper.rb
+- test/factories/inventory_upload_factories.rb
 - test/controllers/reports_controller_test.rb
 - test/controllers/uploads_controller_test.rb
-- test/factories/inventory_upload_factories.rb
-- test/test_plugin_helper.rb
-- test/unit/archived_report_generator_test.rb
+- test/controllers/accounts_controller_test.rb
+- test/unit/slice_generator_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/shell_process_job_test.rb
-- test/unit/slice_generator_test.rb
+- test/unit/archived_report_generator_test.rb