foreman_discovery 22.0.2 → 22.0.4

data/test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb

@@ -0,0 +1,89 @@
+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 test_discovery_hostname_string
+    Setting['discovery_hostname'] = 'discovery_bootif'
+
+    migrate_up
+
+    assert_equal ['discovery_bootif'], Setting['discovery_hostname']
+  end
+
+  def test_discovery_hostname_multistring
+    setting = Setting.find_or_create_by(name: 'discovery_hostname')
+    setting.value = 'discovery_bootif, fqdn'
+    setting.save(validate: false)
+
+    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
+    setting = Setting.find_or_create_by(name: 'discovery_fact_column')
+    setting.value = ''
+    setting.save(validate: false)
+
+    migrate_up
+
+    assert_equal [], Setting['discovery_fact_column']
+  end
+
+  def test_discovery_fact_column_string
+    Setting['discovery_fact_column'] = 'bios_vendor'
+
+    migrate_up
+
+    assert_equal ['bios_vendor'], Setting['discovery_fact_column']
+  end
+
+  def test_discovery_fact_column_multistring
+    setting = Setting.find_or_create_by(name: 'discovery_fact_column')
+    setting.value = 'bios_vendor, fqdn'
+    setting.save(validate: false)
+
+    migrate_up
+
+    assert_equal ['bios_vendor', 'fqdn'], Setting['discovery_fact_column']
+  end
+
+  def test_discovery_fact_column_array
+    Setting['discovery_fact_column'] = ['bios_vendor']
+
+    migrate_up
+
+    assert_equal ['bios_vendor'], Setting['discovery_fact_column']
+  end
+end

data/test/test_helper_discovery.rb

@@ -53,7 +53,7 @@ end
 
 def set_default_settings
   Setting['discovery_fact'] = 'discovery_bootif'
-  Setting['discovery_hostname'] = 'discovery_bootif'
+  Setting['discovery_hostname'] = ['discovery_bootif']
   Setting['discovery_auto'] = true
   Setting['discovery_reboot'] = true
   Setting['discovery_organization'] = "Organization 1"

data/test/unit/discovery_attribute_set_test.rb

@@ -6,7 +6,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
 
   setup do
     @facts = parse_json_fixture('regular_host', true)
-    Setting['discovery_hostname'] = 'discovery_bootif'
+    Setting['discovery_hostname'] = ['discovery_bootif']
     Setting['discovery_prefix'] = 'mac'
     ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end

data/test/unit/host_discovered_test.rb

@@ -181,7 +181,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "should create discovered host with hostname if a fact was supplied" do
-    Setting[:discovery_hostname] = 'somefact'
+    Setting[:discovery_hostname] = ['somefact']
     facts = @facts.merge({"somefact" => "somename"})
     host = discover_host_from_facts(facts)
     assert_equal 'macsomename', host.name
@@ -219,7 +219,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "should create discovered host with fact_name as a name if it is a valid mac" do
     Setting[:discovery_fact] = 'somefact'
-    Setting[:discovery_hostname] = 'somefact'
+    Setting[:discovery_hostname] = ['somefact']
     facts = @facts.merge({"somefact" => "E4:1F:13:CC:36:5A"})
     host = discover_host_from_facts(facts)
     assert_equal 'mace41f13cc365a', host.name
@@ -277,7 +277,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "should raise when hostname fact cannot be found" do
-    Setting[:discovery_hostname] = 'macaddress_foo'
+    Setting[:discovery_hostname] = ['macaddress_foo']
     exception = assert_raises(::Foreman::Exception) do
       discover_host_from_facts(@facts)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 22.0.2
+  version: 22.0.4
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -76,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -109,7 +109,6 @@ files:
 - app/models/host/managed_extensions.rb
 - app/models/hostgroup_extensions.rb
 - app/models/nic/managed_extensions.rb
-- app/models/setting/discovered.rb
 - app/services/discovery_fact_importer.rb
 - app/services/foreman_discovery/fact_parser.rb
 - app/services/foreman_discovery/fact_to_category_resolver.rb
@@ -190,6 +189,7 @@ files:
 - db/migrate/20171222120314_add_constraints_on_discovery_rules_hostgroups.rb
 - db/migrate/20180412124505_add_priority_score_to_discovery_rules.rb
 - db/migrate/20221102065954_fix_discovery_settings_category_to_dsl.rb
+- db/migrate/20221102075151_migrate_discovery_hostname_and_fact_column_to_array.rb
 - db/seeds.d/60_discovery_proxy_feature.rb
 - db/seeds.d/70_discovery_mail_notification.rb
 - db/seeds.d/80_discovery_ui_notification.rb
@@ -219,6 +219,8 @@ files:
 - locale/it/foreman_discovery.po
 - locale/ja/LC_MESSAGES/foreman_discovery.mo
 - locale/ja/foreman_discovery.po
+- locale/ka/LC_MESSAGES/foreman_discovery.mo
+- locale/ka/foreman_discovery.po
 - locale/ko/LC_MESSAGES/foreman_discovery.mo
 - locale/ko/foreman_discovery.po
 - locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
@@ -257,6 +259,7 @@ files:
 - test/functional/discovery_rules_controller_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/integration/discovered_hosts_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
@@ -315,6 +318,18 @@ signing_key:
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
+- test/unit/discovered_extensions_test.rb
+- test/unit/discovered_mailer_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/lldp_neighbors_test.rb
+- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/ui_notifications/new_host_test.rb
+- test/unit/discovery_attribute_set_test.rb
+- test/unit/host_discovered_test.rb
+- test/unit/managed_extensions_test.rb
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
 - test/facts/bond0-eth0-eth1-active-passive.json
@@ -336,22 +351,11 @@ 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/discovery_rules_controller_test.rb
+- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/functional/discovered_hosts_controller_test.rb
 - test/integration/discovered_hosts_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/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/lldp_neighbors_test.rb
-- test/unit/discovered_extensions_test.rb
-- test/unit/host_discovered_test.rb
-- test/unit/managed_extensions_test.rb
-- test/test_helper_discovery.rb
 - test/test_plugin_helper.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

data/app/models/setting/discovered.rb

@@ -1,22 +0,0 @@
-class Setting::Discovered
-  def self.discovery_fact_column_array
-    from_array(Setting['discovery_fact_column'])
-  end
-
-  def self.discovery_hostname_fact_array
-    return [] if !Setting['discovery_hostname'].present?
-    from_array Setting['discovery_hostname']
-  end
-
-  def self.discovery_lock?
-    Foreman::Cast.to_bool(Setting['discovery_lock'])
-  end
-
-  def self.from_array(setting)
-    return [] unless setting.present?
-    setting.to_s.split(",").map(&:strip)
-  rescue Exception => e
-    logger.warn "Failed to parse discovery_fact_column, ignoring: #{e}"
-    []
-  end
-end