foreman_discovery 5.0.0 → 5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (81) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/discovered_hosts_controller.rb +41 -51
  3. data/app/controllers/concerns/foreman/controller/discovered_extensions.rb +20 -23
  4. data/app/controllers/discovered_hosts_controller.rb +50 -46
  5. data/app/helpers/concerns/foreman_discovery/settings_helper_extensions.rb +34 -0
  6. data/app/helpers/discovery_rules_helper.rb +5 -6
  7. data/app/mailers/discovered_mailer.rb +19 -0
  8. data/app/models/discovery_rule.rb +3 -3
  9. data/app/models/host/discovered.rb +33 -11
  10. data/app/models/host/managed_extensions.rb +10 -0
  11. data/app/models/hostgroup_extensions.rb +1 -1
  12. data/app/models/setting/discovered.rb +17 -11
  13. data/app/services/foreman_discovery/fact_parser.rb +16 -0
  14. data/app/services/foreman_discovery/host_converter.rb +0 -4
  15. data/app/services/foreman_discovery/node_api/power.rb +3 -3
  16. data/app/views/discovered_hosts/_discovered_host.html.erb +4 -2
  17. data/app/views/discovered_hosts/_discovered_hosts_list.html.erb +1 -1
  18. data/app/views/discovered_mailer/_discovered_host.html.erb +10 -0
  19. data/app/views/discovered_mailer/discovered_summary.html.erb +35 -0
  20. data/app/views/discovered_mailer/discovered_summary.text.erb +24 -0
  21. data/config/routes.rb +3 -3
  22. data/db/seeds.d/70_discovery_mail_notification.rb +9 -0
  23. data/lib/foreman_discovery/engine.rb +12 -9
  24. data/lib/foreman_discovery/version.rb +1 -1
  25. data/locale/ca/LC_MESSAGES/foreman_discovery.mo +0 -0
  26. data/locale/ca/foreman_discovery.edit.po +780 -0
  27. data/locale/ca/foreman_discovery.po +358 -261
  28. data/locale/de/LC_MESSAGES/foreman_discovery.mo +0 -0
  29. data/locale/de/foreman_discovery.edit.po +774 -0
  30. data/locale/de/foreman_discovery.po +418 -311
  31. data/locale/en_GB/LC_MESSAGES/foreman_discovery.mo +0 -0
  32. data/locale/en_GB/foreman_discovery.edit.po +779 -0
  33. data/locale/en_GB/foreman_discovery.po +423 -313
  34. data/locale/es/LC_MESSAGES/foreman_discovery.mo +0 -0
  35. data/locale/es/foreman_discovery.edit.po +781 -0
  36. data/locale/es/foreman_discovery.po +425 -313
  37. data/locale/foreman_discovery.pot +496 -159
  38. data/locale/fr/LC_MESSAGES/foreman_discovery.mo +0 -0
  39. data/locale/fr/foreman_discovery.edit.po +778 -0
  40. data/locale/fr/foreman_discovery.po +458 -322
  41. data/locale/gl/LC_MESSAGES/foreman_discovery.mo +0 -0
  42. data/locale/gl/foreman_discovery.edit.po +757 -0
  43. data/locale/gl/foreman_discovery.po +306 -215
  44. data/locale/it/LC_MESSAGES/foreman_discovery.mo +0 -0
  45. data/locale/it/foreman_discovery.edit.po +771 -0
  46. data/locale/it/foreman_discovery.po +411 -301
  47. data/locale/ja/LC_MESSAGES/foreman_discovery.mo +0 -0
  48. data/locale/ja/foreman_discovery.edit.po +770 -0
  49. data/locale/ja/foreman_discovery.po +395 -300
  50. data/locale/ko/LC_MESSAGES/foreman_discovery.mo +0 -0
  51. data/locale/ko/foreman_discovery.edit.po +768 -0
  52. data/locale/ko/foreman_discovery.po +393 -299
  53. data/locale/pt_BR/LC_MESSAGES/foreman_discovery.mo +0 -0
  54. data/locale/pt_BR/foreman_discovery.edit.po +780 -0
  55. data/locale/pt_BR/foreman_discovery.po +438 -309
  56. data/locale/ru/LC_MESSAGES/foreman_discovery.mo +0 -0
  57. data/locale/ru/foreman_discovery.edit.po +775 -0
  58. data/locale/ru/foreman_discovery.po +413 -308
  59. data/locale/sv_SE/LC_MESSAGES/foreman_discovery.mo +0 -0
  60. data/locale/sv_SE/foreman_discovery.edit.po +766 -0
  61. data/locale/sv_SE/foreman_discovery.po +321 -232
  62. data/locale/zh_CN/LC_MESSAGES/foreman_discovery.mo +0 -0
  63. data/locale/zh_CN/foreman_discovery.edit.po +769 -0
  64. data/locale/zh_CN/foreman_discovery.po +393 -302
  65. data/locale/zh_TW/LC_MESSAGES/foreman_discovery.mo +0 -0
  66. data/locale/zh_TW/foreman_discovery.edit.po +769 -0
  67. data/locale/zh_TW/foreman_discovery.po +395 -302
  68. data/test/functional/api/v2/discovered_hosts_controller_test.rb +8 -0
  69. data/test/functional/api/v2/discovery_rules_controller_test.rb +9 -0
  70. data/test/functional/discovered_hosts_controller_test.rb +26 -17
  71. data/test/functional/discovery_rules_controller_test.rb +9 -8
  72. data/test/test_helper.rb +0 -4
  73. data/test/test_helper_discovery.rb +24 -0
  74. data/test/unit/discovered_extensions_test.rb +31 -0
  75. data/test/unit/discovered_mailer_test.rb +44 -0
  76. data/test/unit/discovery_attribute_set_test.rb +12 -0
  77. data/test/unit/discovery_rule_test.rb +20 -0
  78. data/test/unit/{puppet_fact_parser_extensions_test.rb → fact_parser_test.rb} +3 -16
  79. data/test/unit/host_discovered_test.rb +56 -11
  80. metadata +29 -5
  81. data/app/lib/puppet_fact_parser_extensions.rb +0 -29
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_discovery
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.0
4
+ version: 5.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Amos Benari
@@ -32,7 +32,7 @@ authors:
32
32
  autorequire:
33
33
  bindir: bin
34
34
  cert_chain: []
35
- date: 2016-01-26 00:00:00.000000000 Z
35
+ date: 2016-02-26 00:00:00.000000000 Z
36
36
  dependencies:
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: deface
@@ -56,12 +56,12 @@ extra_rdoc_files:
56
56
  - LICENSE
57
57
  - README.md
58
58
  files:
59
+ - app/mailers/discovered_mailer.rb
59
60
  - app/controllers/discovery_rules_controller.rb
60
61
  - app/controllers/discovered_hosts_controller.rb
61
62
  - app/controllers/concerns/foreman/controller/discovered_extensions.rb
62
63
  - app/controllers/api/v2/discovery_rules_controller.rb
63
64
  - app/controllers/api/v2/discovered_hosts_controller.rb
64
- - app/lib/puppet_fact_parser_extensions.rb
65
65
  - app/lib/facter_utils.rb
66
66
  - app/services/foreman_discovery/node_api/power_service.rb
67
67
  - app/services/foreman_discovery/node_api/power_legacy_direct_service.rb
@@ -69,8 +69,10 @@ files:
69
69
  - app/services/foreman_discovery/node_api/power_legacy_proxied_service.rb
70
70
  - app/services/foreman_discovery/node_api/power.rb
71
71
  - app/services/foreman_discovery/node_api/inventory.rb
72
+ - app/services/foreman_discovery/fact_parser.rb
72
73
  - app/services/foreman_discovery/host_converter.rb
73
74
  - app/helpers/discovery_rules_helper.rb
75
+ - app/helpers/concerns/foreman_discovery/settings_helper_extensions.rb
74
76
  - app/helpers/discovered_hosts_helper.rb
75
77
  - app/overrides/subnet_form_with_discovery_proxy.rb
76
78
  - app/models/setting/discovered.rb
@@ -87,6 +89,9 @@ files:
87
89
  - app/views/discovery_rules/edit.html.erb
88
90
  - app/views/discovery_rules/index.html.erb
89
91
  - app/views/discovery_rules/_form.html.erb
92
+ - app/views/discovered_mailer/_discovered_host.html.erb
93
+ - app/views/discovered_mailer/discovered_summary.text.erb
94
+ - app/views/discovered_mailer/discovered_summary.html.erb
90
95
  - app/views/discovered_hosts/_discovered_host.html.erb
91
96
  - app/views/discovered_hosts/_selected_hosts.html.erb
92
97
  - app/views/discovered_hosts/multiple_destroy.html.erb
@@ -128,6 +133,7 @@ files:
128
133
  - db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb
129
134
  - db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb
130
135
  - db/migrate/20150714144500_review_discovery_permissions.rb
136
+ - db/seeds.d/70_discovery_mail_notification.rb
131
137
  - db/seeds.d/50_discovery_templates.rb
132
138
  - db/seeds.d/60_discovery_proxy_feature.rb
133
139
  - lib/discovery.rake
@@ -135,19 +141,33 @@ files:
135
141
  - lib/foreman_discovery/version.rb
136
142
  - lib/foreman_discovery/engine.rb
137
143
  - locale/ru/foreman_discovery.po
144
+ - locale/ru/foreman_discovery.edit.po
138
145
  - locale/de/foreman_discovery.po
146
+ - locale/de/foreman_discovery.edit.po
139
147
  - locale/pt_BR/foreman_discovery.po
148
+ - locale/pt_BR/foreman_discovery.edit.po
140
149
  - locale/en_GB/foreman_discovery.po
150
+ - locale/en_GB/foreman_discovery.edit.po
141
151
  - locale/zh_TW/foreman_discovery.po
152
+ - locale/zh_TW/foreman_discovery.edit.po
142
153
  - locale/es/foreman_discovery.po
154
+ - locale/es/foreman_discovery.edit.po
143
155
  - locale/fr/foreman_discovery.po
156
+ - locale/fr/foreman_discovery.edit.po
144
157
  - locale/it/foreman_discovery.po
158
+ - locale/it/foreman_discovery.edit.po
145
159
  - locale/ca/foreman_discovery.po
160
+ - locale/ca/foreman_discovery.edit.po
146
161
  - locale/ja/foreman_discovery.po
162
+ - locale/ja/foreman_discovery.edit.po
147
163
  - locale/ko/foreman_discovery.po
164
+ - locale/ko/foreman_discovery.edit.po
148
165
  - locale/zh_CN/foreman_discovery.po
166
+ - locale/zh_CN/foreman_discovery.edit.po
149
167
  - locale/gl/foreman_discovery.po
168
+ - locale/gl/foreman_discovery.edit.po
150
169
  - locale/sv_SE/foreman_discovery.po
170
+ - locale/sv_SE/foreman_discovery.edit.po
151
171
  - locale/foreman_discovery.pot
152
172
  - locale/ru/LC_MESSAGES/foreman_discovery.mo
153
173
  - locale/de/LC_MESSAGES/foreman_discovery.mo
@@ -172,12 +192,14 @@ files:
172
192
  - test/functional/discovered_hosts_controller_test.rb
173
193
  - test/factories/discovery_rule_related.rb
174
194
  - test/unit/discovered_extensions_test.rb
195
+ - test/unit/fact_parser_test.rb
175
196
  - test/unit/discovery_attribute_set_test.rb
176
197
  - test/unit/setting_discovered_test.rb
177
198
  - test/unit/facts.json
178
- - test/unit/puppet_fact_parser_extensions_test.rb
199
+ - test/unit/discovered_mailer_test.rb
179
200
  - test/unit/discovery_rule_test.rb
180
201
  - test/unit/host_discovered_test.rb
202
+ - test/test_helper_discovery.rb
181
203
  - test/test_plugin_helper.rb
182
204
  - test/test_helper.rb
183
205
  homepage: http://github.com/theforeman/foreman_discovery
@@ -211,12 +233,14 @@ test_files:
211
233
  - test/functional/discovered_hosts_controller_test.rb
212
234
  - test/factories/discovery_rule_related.rb
213
235
  - test/unit/discovered_extensions_test.rb
236
+ - test/unit/fact_parser_test.rb
214
237
  - test/unit/discovery_attribute_set_test.rb
215
238
  - test/unit/setting_discovered_test.rb
216
239
  - test/unit/facts.json
217
- - test/unit/puppet_fact_parser_extensions_test.rb
240
+ - test/unit/discovered_mailer_test.rb
218
241
  - test/unit/discovery_rule_test.rb
219
242
  - test/unit/host_discovered_test.rb
243
+ - test/test_helper_discovery.rb
220
244
  - test/test_plugin_helper.rb
221
245
  - test/test_helper.rb
222
246
  has_rdoc:
@@ -1,29 +0,0 @@
1
- module PuppetFactParserExtensions
2
- extend ActiveSupport::Concern
3
-
4
- included do
5
- begin
6
- raise "method: suggested_primary_interface" unless instance_methods.include?(:suggested_primary_interface)
7
- raise "method: parse_interfaces?" unless instance_methods.include?(:parse_interfaces?)
8
- alias_method_chain :suggested_primary_interface, :bootif
9
- alias_method_chain :parse_interfaces?, :bootif
10
- rescue Exception => e
11
- raise ::Foreman::WrappedException.new(e, N_("Incompatible version of puppet fact parser"))
12
- end
13
- end
14
-
15
- # discovery has its own method of finding primary iface
16
- def suggested_primary_interface_with_bootif(host)
17
- return suggested_primary_interface_without_bootif(host) if host.type != "Host::Discovered"
18
- bootif_mac = FacterUtils::bootif_mac(facts).try(:downcase)
19
- detected = interfaces.detect { |_, values| values[:macaddress].try(:downcase) == bootif_mac }
20
- Rails.logger.debug "Detected primary interface: #{detected}"
21
- # return the detected interface as array [name, facts]
22
- detected || raise(::Foreman::Exception.new(N_("Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'") % {:mac => bootif_mac, :fact => FacterUtils::bootif_name}))
23
- end
24
-
25
- # make 'ignore_puppet_facts_for_provisioning' setting non-effective
26
- def parse_interfaces_with_bootif?
27
- true
28
- end
29
- end