foreman_discovery 24.0.1 → 25.0.0

data/locale/zh_TW/foreman_discovery.edit.po

@@ -117,7 +117,7 @@ msgstr ""
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:163
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:164
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr ""
 
@@ -125,7 +125,7 @@ msgstr ""
 msgid "Unable to provision %{host}: %{errors}"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:170
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:171
 msgid "No rule found for host %s"
 msgstr ""
 
@@ -133,11 +133,11 @@ msgstr ""
 msgid "Execute rules against all currently discovered hosts"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:176
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:177
 msgid "Errors during auto provisioning: %s"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:179
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:180
 msgid "No discovered hosts to provision"
 msgstr ""
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Rebooting all discovered hosts"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:132
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:133
 msgid "Discovered hosts are rebooting now"
 msgstr ""
 
@@ -241,71 +241,71 @@ msgstr ""
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:100
+#: ../app/controllers/discovered_hosts_controller.rb:101
 msgid "Facts refreshed for %s"
 msgstr "%s 的詳情已刷新"
 
-#: ../app/controllers/discovered_hosts_controller.rb:102
+#: ../app/controllers/discovered_hosts_controller.rb:103
 msgid "Failed to refresh facts for %s"
 msgstr "刷新 %s 的詳情失敗"
 
-#: ../app/controllers/discovered_hosts_controller.rb:105
+#: ../app/controllers/discovered_hosts_controller.rb:106
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:113
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:116
+#: ../app/controllers/discovered_hosts_controller.rb:117
 msgid "Rebooting host %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:118
+#: ../app/controllers/discovered_hosts_controller.rb:119
 msgid "Failed to reboot host %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:121
+#: ../app/controllers/discovered_hosts_controller.rb:122
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:135
+#: ../app/controllers/discovered_hosts_controller.rb:136
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:153
+#: ../app/controllers/discovered_hosts_controller.rb:154
 msgid "Destroyed selected hosts"
 msgstr "刪除選擇的主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:155
+#: ../app/controllers/discovered_hosts_controller.rb:156
 msgid "The following hosts were not deleted: %s"
 msgstr "下列主機尚未刪除：%s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:167
+#: ../app/controllers/discovered_hosts_controller.rb:168
 msgid "Failed to auto provision host %s: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:195
+#: ../app/controllers/discovered_hosts_controller.rb:196
 msgid "Discovered hosts are provisioning now"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:280
+#: ../app/controllers/discovered_hosts_controller.rb:285
 msgid "Discovered host reported from unknown subnet, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:285
+#: ../app/controllers/discovered_hosts_controller.rb:290
 msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:299
+#: ../app/controllers/discovered_hosts_controller.rb:304
 msgid "No hosts were found with that id or name"
 msgstr "沒有找到擁有此 ID 或名稱的主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:303
+#: ../app/controllers/discovered_hosts_controller.rb:308
 msgid "No hosts selected"
 msgstr "未選擇主機"
 
-#: ../app/controllers/discovered_hosts_controller.rb:309
+#: ../app/controllers/discovered_hosts_controller.rb:314
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "選擇主機時發生了錯誤 - %s"
 
@@ -325,7 +325,7 @@ msgstr ""
 msgid "Refresh facts"
 msgstr "刷新詳情"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42 ../lib/foreman_discovery/engine.rb:92
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42 ../lib/foreman_discovery/engine.rb:91
 msgid "Reboot"
 msgstr "重新開機"
 
@@ -377,7 +377,7 @@ msgstr ""
 msgid "Provision"
 msgstr "佈建"
 
-#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:311 ../lib/foreman_discovery/engine.rb:326
+#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:5 ../lib/foreman_discovery/engine.rb:309 ../lib/foreman_discovery/engine.rb:324
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -815,7 +815,7 @@ msgstr "複製 %s"
 msgid "Edit %s"
 msgstr "編輯 %s"
 
-#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:316 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:20
+#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:314 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:20
 msgid "Discovery Rules"
 msgstr ""
 
@@ -851,7 +851,7 @@ msgstr ""
 msgid "New Discovery Rule"
 msgstr ""
 
-#: ../app/views/discovery_rules/welcome.html.erb:8
+#: ../app/views/discovery_rules/welcome.html.erb:5
 msgid "Discovered Rules"
 msgstr ""
 
@@ -923,23 +923,23 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:78
+#: ../lib/foreman_discovery/engine.rb:79
 msgid "Hostname facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:79
+#: ../lib/foreman_discovery/engine.rb:80
 msgid "List of facts to use for the hostname (first wins)"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:86
+#: ../lib/foreman_discovery/engine.rb:85
 msgid "Auto provisioning"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:87
+#: ../lib/foreman_discovery/engine.rb:86
 msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:93
+#: ../lib/foreman_discovery/engine.rb:92
 msgid "Automatically reboot or kexec discovered host during provisioning"
 msgstr ""
 
@@ -951,135 +951,135 @@ msgstr ""
 msgid "The default prefix to use for the host name, must start with a letter"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:106
+#: ../lib/foreman_discovery/engine.rb:104
 msgid "Fact columns"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:107
+#: ../lib/foreman_discovery/engine.rb:105
 msgid "Extra facter columns to show in host lists"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:112
+#: ../lib/foreman_discovery/engine.rb:110
 msgid "Highlighted facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:113
+#: ../lib/foreman_discovery/engine.rb:111
 msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:118
+#: ../lib/foreman_discovery/engine.rb:116
 msgid "Storage facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:119
+#: ../lib/foreman_discovery/engine.rb:117
 msgid "Regex to organize facts for storage section"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:124
+#: ../lib/foreman_discovery/engine.rb:122
 msgid "Software facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:125
+#: ../lib/foreman_discovery/engine.rb:123
 msgid "Regex to organize facts for software section"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:130
+#: ../lib/foreman_discovery/engine.rb:128
 msgid "Hardware facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:131
+#: ../lib/foreman_discovery/engine.rb:129
 msgid "Regex to organize facts for hardware section"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:136
+#: ../lib/foreman_discovery/engine.rb:134
 msgid "Network facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:137
+#: ../lib/foreman_discovery/engine.rb:135
 msgid "Regex to organize facts for network section"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:142
+#: ../lib/foreman_discovery/engine.rb:140
 msgid "IPMI facts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:143
+#: ../lib/foreman_discovery/engine.rb:141
 msgid "Regex to organize facts for ipmi section"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:148
+#: ../lib/foreman_discovery/engine.rb:146
 msgid "Lock PXE"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:149
+#: ../lib/foreman_discovery/engine.rb:147
 msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:155
+#: ../lib/foreman_discovery/engine.rb:153
 msgid "Locked PXELinux template name"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:156
+#: ../lib/foreman_discovery/engine.rb:154
 msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:162
+#: ../lib/foreman_discovery/engine.rb:160
 msgid "Locked PXEGrub template name"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:163
+#: ../lib/foreman_discovery/engine.rb:161
 msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:169
+#: ../lib/foreman_discovery/engine.rb:167
 msgid "Locked PXEGrub2 template name"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:170
+#: ../lib/foreman_discovery/engine.rb:168
 msgid "PXEGrub2 template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:175
+#: ../lib/foreman_discovery/engine.rb:173
 msgid "Force DNS"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:176
+#: ../lib/foreman_discovery/engine.rb:174
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:181
+#: ../lib/foreman_discovery/engine.rb:179
 msgid "Error on existing NIC"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:182
+#: ../lib/foreman_discovery/engine.rb:180
 msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:188
+#: ../lib/foreman_discovery/engine.rb:186
 msgid "Type of name generator"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:189
+#: ../lib/foreman_discovery/engine.rb:187
 msgid "Discovery hostname naming pattern"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:194
+#: ../lib/foreman_discovery/engine.rb:192
 msgid "Prefer IPv6"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:195
+#: ../lib/foreman_discovery/engine.rb:193
 msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:335
+#: ../lib/foreman_discovery/engine.rb:333
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:336
+#: ../lib/foreman_discovery/engine.rb:334
 msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:337
+#: ../lib/foreman_discovery/engine.rb:335
 msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 

data/package.json

@@ -9,8 +9,6 @@
     "test:watch": "tfm-test --plugin --watchAll",
     "test:current": "tfm-test --plugin --watch",
     "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
     "create-react-component": "yo react-domain"
   },
   "repository": {

data/test/functional/discovered_hosts_controller_test.rb

@@ -41,7 +41,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     [:multiple_destroy, :select_multiple_organization, :select_multiple_location].each do |action|
       process action, method: :post, params: {:host_ids => [host.id]}, session: set_session_user, xhr: true
       assert_response :success
-      assert response.body =~ /#{host.name}/
+      assert_includes(response.body, host.name)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 24.0.1
+  version: 25.0.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -76,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -184,6 +184,7 @@ files:
 - app/views/discovery_rules/welcome.html.erb
 - config/as_deprecation_whitelist.yaml
 - config/initializers/discovery_setup.rb
+- config/initializers/inflections.rb
 - config/routes.rb
 - db/migrate/20141107091416_create_discovery_rules.rb
 - db/migrate/20141107091417_add_discovery_rule_to_host.rb
@@ -297,7 +298,6 @@ files:
 - test/integration/discovered_hosts_test.rb
 - test/integration/menu_test.rb
 - test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
-- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig
 - test/static_fixtures/redhat_kexec.erb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
@@ -351,13 +351,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/factories/discovery_rule_related.rb
 - test/factories/discovery_host_related.rb
+- test/factories/discovery_rule_related.rb
 - test/facts/bond0-eth0-eth1-active-passive.json
 - test/facts/default.json
 - test/facts/dell_npars.json
@@ -377,25 +377,24 @@ test_files:
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
-- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
+- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/integration/discovered_hosts_test.rb
 - test/integration/menu_test.rb
-- test/unit/ui_notifications/destroy_host_test.rb
-- test/unit/ui_notifications/new_host_test.rb
-- test/unit/discovered_mailer_test.rb
+- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
+- test/static_fixtures/redhat_kexec.erb
+- test/test_helper_discovery.rb
+- test/test_plugin_helper.rb
 - test/unit/discovered_extensions_test.rb
+- test/unit/discovered_mailer_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/fact_parser_test.rb
 - test/unit/fact_to_category_resolver_test.rb
+- test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
 - test/unit/managed_extensions_test.rb
-- test/unit/host_discovered_test.rb
-- test/test_plugin_helper.rb
-- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig
-- test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
-- test/static_fixtures/redhat_kexec.erb
-- test/test_helper_discovery.rb
+- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/ui_notifications/new_host_test.rb

data/test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig

@@ -1,81 +0,0 @@
-require_relative '../test_plugin_helper'
-require ForemanDiscovery::Engine.root.join('db/migrate/20221102075151_migrate_discovery_hostname_and_fact_column_to_array')
-
-class MigrateDiscoveryHostnameAndFactColumnToArrayTest < ActiveSupport::TestCase
-  let(:migrations_paths) { ActiveRecord::Migrator.migrations_paths + [ForemanDiscovery::Engine.root.join('db/migrate/').to_s] }
-
-  let(:previous_version) { '20221102065954'.to_i }
-  let(:current_version) { '20221102075151'.to_i }
-
-  #only load the two migrations we care about (previous one and current one)
-  let(:migrations) do
-    [
-      ActiveRecord::MigrationProxy.new("FixDiscoverySettingsCategoryToDsl", previous_version, "#{ForemanDiscovery::Engine.root}/db/migrate/20221102065954_fix_discovery_settings_category_to_dsl.rb", ""),
-      ActiveRecord::MigrationProxy.new("MigrateDiscoveryHostnameAndFactColumnToArray", current_version, "#{ForemanDiscovery::Engine.root}/db/migrate/20221102075151_migrate_discovery_hostname_and_fact_column_to_array.rb", "")
-    ]
-  end
-
-  def migrate_up
-    ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, current_version).migrate
-  end
-
-  def setup
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migrator.new(:down, migrations, ActiveRecord::SchemaMigration, previous_version).migrate
-    end
-  end
-
-  def setup_setting(name, value)
-    setting = Setting.find_or_create_by(name: name)
-    setting.value = value
-    setting.save(validate: false)
-  end
-
-  def test_discovery_hostname_string
-    setup_setting('discovery_hostname', 'discovery_bootif')
-    migrate_up
-    assert_equal ['discovery_bootif'], Setting['discovery_hostname']
-  end
-
-  def test_discovery_hostname_multistring
-    setup_setting('discovery_hostname', 'discovery_bootif, fqdn')
-    migrate_up
-    assert_equal ['discovery_bootif', 'fqdn'], Setting['discovery_hostname']
-  end
-
-  def test_discovery_hostname_array
-    Setting['discovery_hostname'] = ['discovery_bootif']
-    migrate_up
-    assert_equal ['discovery_bootif'], Setting['discovery_hostname']
-  end
-
-  def test_discovery_fact_column_empty
-    setup_setting('discovery_fact_column', '')
-    migrate_up
-    assert_equal [], Setting['discovery_fact_column']
-  end
-
-  def test_discovery_fact_column_string
-    setup_setting('discovery_fact_column', 'bios_vendor')
-    migrate_up
-    assert_equal ['bios_vendor'], Setting['discovery_fact_column']
-  end
-
-  def test_discovery_fact_column_multistring
-    setup_setting('discovery_fact_column', 'bios_vendor, fqdn')
-    migrate_up
-    assert_equal ['bios_vendor', 'fqdn'], Setting['discovery_fact_column']
-  end
-
-  def test_discovery_fact_column_array
-    Setting['discovery_fact_column'] = ['bios_vendor']
-<<<<<<< HEAD
-    migrate_up
-=======
-    
-    migrate_up
-    
->>>>>>> fd3524f (Fix tests for array settings migrations)
-    assert_equal ['bios_vendor'], Setting['discovery_fact_column']
-  end
-end