foreman_discovery 17.0.4 → 18.0.0

data/test/unit/discovered_extensions_test.rb

@@ -156,7 +156,17 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     subnet = FactoryBot.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
     host = discover_host_from_facts(facts)
     assert_equal subnet, host.subnet
-    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
+    if defined? ForemanPuppet
+      hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_rootpass, :with_os,
+        pxe_loader: "PXELinux BIOS",
+        subnet: subnet,
+        domain: domain)
+    else
+      hostgroup = FactoryBot.create(:hostgroup, :with_rootpass, :with_os,
+        pxe_loader: "PXELinux BIOS",
+        subnet: subnet,
+        domain: domain)
+    end
     r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
     host.primary_interface.expects(:queue_tftp).at_least(1)
     host.primary_interface.expects(:queue_dhcp).at_least(1)
@@ -174,12 +184,12 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     assert_equal hostgroup.subnet, managed_host.provision_interface.subnet
     refute_nil hostgroup.domain, managed_host.domain
     assert_equal hostgroup.domain, managed_host.domain
-    refute_nil hostgroup.environment, managed_host.environment
-    assert_equal hostgroup.environment, managed_host.environment
-    refute_nil hostgroup.puppet_proxy, managed_host.puppet_proxy
-    assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
-    refute_nil hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
-    assert_equal hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
+    if defined? ForemanPuppet
+      refute_nil hostgroup.environment, managed_host.environment
+      assert_equal hostgroup.environment, managed_host.environment
+      refute_nil hostgroup.puppet_proxy, managed_host.puppet_proxy
+      assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
+    end
   end
 
   class StubIPAM
@@ -196,7 +206,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     subnet2 = FactoryBot.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_101', :network => '192.168.101.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
     host = discover_host_from_facts(facts)
     assert_equal subnet, host.subnet
-    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet2, :domain => domain)
+    hostgroup = FactoryBot.create(:hostgroup, :with_rootpass, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet2, :domain => domain)
     r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
     Subnet.any_instance.expects(:unused_ip).with(host.mac).returns(StubIPAM.new)
     host.primary_interface.stubs(:queue_tftp)
@@ -219,7 +229,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     subnet2 = FactoryBot.create(:subnet_ipv6, :tftp, :dhcp, :network => "2001:db9::/32", :mask => "ffff:ffff::", :name => "ipv6_provision", :ipam => IPAM::MODES[:eui64], :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
     host = discover_host_from_facts(facts)
     assert_equal subnet, host.subnet6
-    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet6 => subnet2, :domain => domain)
+    hostgroup = FactoryBot.create(:hostgroup, :with_rootpass, :with_os, :pxe_loader => "PXELinux BIOS", :subnet6 => subnet2, :domain => domain)
     r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
     host.primary_interface.stubs(:queue_tftp)
     host.primary_interface.stubs(:queue_dhcp)
@@ -239,7 +249,17 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     refute host.subnet
     domain = FactoryBot.create(:domain)
     subnet = FactoryBot.create(:subnet_ipv4, :tftp, :dhcp, :name => 'subnet_100', :network => '192.168.100.0', :organizations => [Organization.find_by_name("Organization 1")], :locations => [Location.find_by_name("Location 1")])
-    hostgroup = FactoryBot.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
+    if defined? ForemanPuppet
+      hostgroup = FactoryBot.create(:hostgroup, :with_puppet_enc, :with_rootpass, :with_os,
+        pxe_loader: "PXELinux BIOS",
+        subnet: subnet,
+        domain: domain)
+    else
+      hostgroup = FactoryBot.create(:hostgroup, :with_rootpass, :with_os,
+        pxe_loader: "PXELinux BIOS",
+        subnet: subnet,
+        domain: domain)
+    end
     r1 = FactoryBot.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
     host.primary_interface.expects(:queue_tftp).at_least(1)
     host.primary_interface.expects(:queue_dhcp).at_least(1)
@@ -257,12 +277,12 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     assert_equal hostgroup.subnet, managed_host.provision_interface.subnet
     refute_nil hostgroup.domain, managed_host.domain
     assert_equal hostgroup.domain, managed_host.domain
-    refute_nil hostgroup.environment, managed_host.environment
-    assert_equal hostgroup.environment, managed_host.environment
-    refute_nil hostgroup.puppet_proxy, managed_host.puppet_proxy
-    assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
-    refute_nil hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
-    assert_equal hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
+    if defined? ForemanPuppet
+      refute_nil hostgroup.environment, managed_host.environment
+      assert_equal hostgroup.environment, managed_host.environment
+      refute_nil hostgroup.puppet_proxy, managed_host.puppet_proxy
+      assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
+    end
   end
 
   def setup_normal_renderer

data/test/unit/discovery_attribute_set_test.rb

@@ -6,14 +6,8 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
 
   setup do
     @facts = parse_json_fixture('regular_host', true)
-    FactoryBot.create(:setting,
-                       :name => 'discovery_hostname',
-                       :value => 'discovery_bootif',
-                       :category => 'Setting::Discovered')
-    FactoryBot.create(:setting,
-                       :name => 'discovery_prefix',
-                       :value => 'mac',
-                       :category => 'Setting::Discovered')
+    Setting['discovery_hostname'] = 'discovery_bootif'
+    Setting['discovery_prefix'] = 'mac'
     ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 

data/test/unit/fact_parser_test.rb

@@ -55,10 +55,7 @@ class FactParserTest < ActiveSupport::TestCase
   end
 
   test "#suggested_primary_interface detects interface even when 'ignore_puppet_facts_for_provisioning' is set" do
-    FactoryBot.create(:setting,
-                       :name => 'ignore_puppet_facts_for_provisioning',
-                       :value => true,
-                       :category => 'Setting::Provisioning')
+    Setting['ignore_puppet_facts_for_provisioning'] = true
     assert_equal 'eth2', @parser.suggested_primary_interface(@host).try(:first)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 17.0.4
+  version: 18.0.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -41,6 +41,7 @@ authors:
 - Lukáš Zapletal
 - Marek Hulan
 - Marek Hulán
+- MariaAga
 - Martin Bačovský
 - Matt Jarvis
 - Michael Moll
@@ -73,7 +74,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -100,12 +101,14 @@ files:
 - app/mailers/discovered_mailer.rb
 - app/models/concerns/discovery_taxonomy_extensions.rb
 - app/models/discovery_attribute_set.rb
+- app/models/discovery_fact_name.rb
 - app/models/discovery_rule.rb
 - app/models/host/discovered.rb
 - 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
 - app/services/foreman_discovery/host_converter.rb
@@ -266,12 +269,10 @@ 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/api/v2/settings_controller_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/models/setting_test.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
 - test/unit/discovered_extensions_test.rb
@@ -284,7 +285,6 @@ files:
 - test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
 - test/unit/managed_extensions_test.rb
-- test/unit/setting_discovered_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
 - webpack/__mocks__/foremanReact/common/I18n.js
@@ -351,24 +351,21 @@ test_files:
 - test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
-- test/functional/api/v2/settings_controller_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/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_taxonomy_extensions_test.rb
 - test/unit/lldp_neighbors_test.rb
+- test/unit/host_discovered_test.rb
 - test/unit/discovery_rule_test.rb
 - test/unit/fact_to_category_resolver_test.rb
-- test/unit/discovered_extensions_test.rb
+- test/unit/managed_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/setting_discovered_test.rb
-- test/unit/managed_extensions_test.rb
-- test/unit/host_discovered_test.rb
-- test/models/setting_test.rb
+- test/unit/discovered_extensions_test.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb

data/test/functional/api/v2/settings_controller_test.rb

@@ -1,22 +0,0 @@
-require_relative '../../../test_plugin_helper'
-
-class Api::V2::SettingsControllerTest < ActionController::TestCase
-  setup do
-    FactoryBot.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
-  end
-
-  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
-  test "should not update hostname prefix without value" do
-    setting = Setting.find_by_name("discovery_prefix")
-    put :update, params: { :id => setting.id, :setting => { :value => '' } }
-    assert_nil JSON.parse(@response.body)['value']
-  end
-
-  test_attributes :pid => '4969994d-f934-4f0e-9a98-476b87eb0527'
-  test "should update hostname prefix" do
-    value = RFauxFactory.gen_alpha
-    setting = Setting.find_by_name("discovery_prefix")
-    put :update, params: { :id => setting.id, :setting => { :value => value } }
-    assert_equal JSON.parse(@response.body)['value'], value, "Can't update discovery_prefix setting with valid value #{value}"
-  end
-end

data/test/models/setting_test.rb

@@ -1,11 +0,0 @@
-require_relative '../test_plugin_helper'
-
-class SettingTest < ActiveSupport::TestCase
-  test "should update hostname prefix with multiple valid values" do
-    setting = FactoryBot.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
-    RFauxFactory.gen_strings(exclude: [:numeric, :alphanumeric]).values.each do |value|
-      setting.value = value
-      assert setting.valid?, "Can't update discovery_prefix setting with valid value #{value}"
-    end
-  end
-end

data/test/unit/setting_discovered_test.rb

@@ -1,9 +0,0 @@
-require_relative '../test_plugin_helper'
-
-class SettingDiscoveredTest < ActiveSupport::TestCase
-  test "can create setting of discovered type" do
-    assert Setting.create(:name => "foo", :default => "bar", :description => "test foo", :category => "Setting::Discovered")
-    s = Setting::Discovered.first
-    assert_equal "foo", s.name
-  end
-end