foreman_rh_cloud 9.0.57 → 9.0.58

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/foreman_inventory_upload/generators/slice.rb +1 -0
  3. data/lib/foreman_rh_cloud/version.rb +1 -1
  4. data/lib/inventory_sync/async/inventory_hosts_sync.rb +1 -1
  5. data/package.json +1 -1
  6. data/test/jobs/inventory_hosts_sync_test.rb +53 -5
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 63684c35a1618be19a8a593c01271deda04e42afce5bb29b604b9af5bc6bba32
4
- data.tar.gz: 7e431b41e130d528a4528fbcba7c4aef6efb1c44228c43691c1cad8a58afb690
3
+ metadata.gz: 48906395af94f2d71160604c547ba3855d46440ff1f29b60f11b0b1fbe6d9d12
4
+ data.tar.gz: fcc42c3924b9bdcf1135ce967298e08b9089610ae9240bcb3fe45421fc658b06
5
5
  SHA512:
6
- metadata.gz: 19c9d15f55a75ef46d56b0b45e1058472afb6d69a8ce496730d5154d563c07f95ce52e099b0ab95115c0c3833b5b030c34d76cdbe78035d336deec6b84357432
7
- data.tar.gz: d4e1e3ea2f38b898a527e05ce841f5f9d981fdb685a5dd706734e02b1f79baeb57f031e67ca20a34f4c492da18dafc0e138acc05b38bbaee61164f548e1962b7
6
+ metadata.gz: 189c8a3d0f7db4274c10bd0baa57542fbfd82c0d0ddedf9bb7da5429b5045e1bad9dc6434248737db0deb2be792af34f8f8067ef8397ba85a3c3cc9f0ae29f5e
7
+ data.tar.gz: 16039e69ed139efee3304bb64086391f1ee8e44bf42732793c8700fc3941d62c1f011cf87f514a931336ad4b20560b150364debcbe1547cbc3cfe75a735b5e05
data/lib/foreman_inventory_upload/generators/slice.rb CHANGED
@@ -126,6 +126,7 @@ module ForemanInventoryUpload
126
126
  ) { |v| os_release_value(*v) }
127
127
  @stream.simple_field('os_kernel_version', fact_value(host, 'uname::release'))
128
128
  @stream.simple_field('arch', host.architecture&.name)
129
+ @stream.simple_field('subscription_status', host.subscription_status_label)
129
130
  @stream.simple_field('katello_agent_running', false)
130
131
  @stream.simple_field(
131
132
  'infrastructure_type',
data/lib/foreman_rh_cloud/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanRhCloud
2
- VERSION = '9.0.57'.freeze
2
+ VERSION = '9.0.58'.freeze
3
3
  end
data/lib/inventory_sync/async/inventory_hosts_sync.rb CHANGED
@@ -68,7 +68,7 @@ module InventorySync
68
68
 
69
69
  def to_ip_address_string(ip_addresses)
70
70
  string_size = 0
71
- ip_addresses.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
71
+ ip_addresses&.take_while { |address| (string_size += address.length) <= MAX_IP_STRING_SIZE }
72
72
  end
73
73
 
74
74
  def plan_self_host_sync
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "foreman_rh_cloud",
3
- "version": "9.0.57",
3
+ "version": "9.0.58",
4
4
  "description": "Inventory Upload =============",
5
5
  "main": "index.js",
6
6
  "scripts": {
data/test/jobs/inventory_hosts_sync_test.rb CHANGED
@@ -44,11 +44,59 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
44
44
 
45
45
  inventory_json = <<-INVENTORY_JSON
46
46
  {
47
- "total": 3,
48
- "count": 3,
47
+ "total": 4,
48
+ "count": 4,
49
49
  "page": 1,
50
- "per_page": 3,
50
+ "per_page": 4,
51
51
  "results": [
52
+ {
53
+ "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f39",
54
+ "rhel_machine_id": null,
55
+ "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1c",
56
+ "satellite_id": "bb72bf95-0a19-4090-8009-f0d8c68aca61",
57
+ "bios_uuid": "b48a7e5f-cb50-4029-a75e-366bf43db642",
58
+ "fqdn": "rhel81-demo.oss-lab.net",
59
+ "mac_addresses": [
60
+ "52:54:00:aa:12:12",
61
+ "00:00:00:00:00:00"
62
+ ],
63
+ "external_id": null,
64
+ "id": "59ab38db-c25b-4fc7-bfb2-c8eb01d865a4",
65
+ "account": "1460290",
66
+ "display_name": "insights-rh71.example.com",
67
+ "ansible_host": null,
68
+ "facts": [
69
+ {
70
+ "namespace": "satellite",
71
+ "facts": {
72
+ "virtual_host_name": "virt-who-nobody.home-1",
73
+ "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
74
+ "is_simple_content_access": false,
75
+ "distribution_version": "7.3",
76
+ "satellite_version": "6.8.4",
77
+ "organization_id": 1,
78
+ "is_hostname_obfuscated": false,
79
+ "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
80
+ }
81
+ },
82
+ {
83
+ "namespace": "yupana",
84
+ "facts": {
85
+ "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
86
+ "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
87
+ "source": "Satellite",
88
+ "yupana_host_id": "e85958b6-58db-4cfd-aeb6-01ee81bc0f43",
89
+ "account": "1460290"
90
+ }
91
+ }
92
+ ],
93
+ "reporter": "puptoo",
94
+ "stale_timestamp": "2021-03-19T07:57:42.466399+00:00",
95
+ "stale_warning_timestamp": "2021-03-26T07:57:42.466399+00:00",
96
+ "culled_timestamp": "2021-04-02T07:57:42.466399+00:00",
97
+ "created": "2021-02-08T14:36:03.613880+00:00",
98
+ "updated": "2021-03-18T02:57:42.535250+00:00"
99
+ },
52
100
  {
53
101
  "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f36",
54
102
  "rhel_machine_id": null,
@@ -307,7 +355,7 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
307
355
 
308
356
  ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
309
357
 
310
- assert_equal 2, InsightsMissingHost.count
358
+ assert_equal 3, InsightsMissingHost.count
311
359
  end
312
360
 
313
361
  test 'Inventory should remove old missing host records' do
@@ -324,6 +372,6 @@ class InventoryHostsSyncTest < ActiveSupport::TestCase
324
372
 
325
373
  ForemanTasks.sync_task(InventorySync::Async::InventoryHostsSync, [org])
326
374
 
327
- assert_equal 2, InsightsMissingHost.count
375
+ assert_equal 3, InsightsMissingHost.count
328
376
  end
329
377
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_rh_cloud
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.0.57
4
+ version: 9.0.58
5
5
  platform: ruby
6
6
  authors:
7
7
  - Foreman Red Hat Cloud team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-08-06 00:00:00.000000000 Z
11
+ date: 2024-09-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreman_ansible
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: foreman-tasks
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: 9.0.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0'
40
+ version: 9.0.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: katello
43
43
  requirement: !ruby/object:Gem::Requirement