foreman_discovery 13.0.1 → 14.0.0

data/test/test_plugin_helper.rb

@@ -1,7 +1,6 @@
-# This calls the main test_helper in Foreman-core
+# requires the main test_helper from Foreman-core
 require 'test_helper'
-
-require 'test_helper_discovery'
+require_relative './test_helper_discovery'
 
 # Add plugin to FactoryBot's paths
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')

data/test/unit/discovered_extensions_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class DiscoveredExtensionsTest < ActiveSupport::TestCase
   include Foreman::Controller::DiscoveredExtensions
@@ -157,7 +157,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     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)
-    assert managed_host = perform_auto_provision(host, r1)
+    managed_host = perform_auto_provision(host, r1)
+    assert_empty host.errors
+    assert managed_host
     assert_empty managed_host.errors
     refute_nil hostgroup.pxe_loader, managed_host.pxe_loader
     assert_equal hostgroup.pxe_loader, managed_host.pxe_loader
@@ -187,7 +189,9 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     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)
-    assert managed_host = perform_auto_provision(host, r1)
+    managed_host = perform_auto_provision(host, r1)
+    assert_empty host.errors
+    assert managed_host
     assert_empty managed_host.errors
     refute_nil hostgroup.pxe_loader, managed_host.pxe_loader
     assert_equal hostgroup.pxe_loader, managed_host.pxe_loader

data/test/unit/discovered_mailer_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class DiscoveredMailerTest < ActiveSupport::TestCase
   setup do

data/test/unit/discovery_attribute_set_test.rb

@@ -1,11 +1,11 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   include FactImporterIsolation
   allow_transactions_for_any_importer
 
   setup do
-    @facts = parse_json_fixture('/facts.json')['facts']
+    @facts = parse_json_fixture('regular_host', true)
     FactoryBot.create(:setting,
                        :name => 'discovery_hostname',
                        :value => 'discovery_bootif',
@@ -48,8 +48,4 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
     results = Host::Discovered.search_for("disks_size > #{disks_size}")
     assert_equal 0, results.count
   end
-
-  def parse_json_fixture(relative_path)
-    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
-  end
 end

data/test/unit/discovery_rule_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class DiscoveryRuleTest < ActiveSupport::TestCase
   setup do

data/test/unit/discovery_taxonomy_extensions_test.rb

@@ -1,8 +1,11 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class DiscoveryTaxonomyExtensionsTest < ActiveSupport::TestCase
+  include FactImporterIsolation
+  allow_transactions_for_any_importer
+
   setup do
-    @facts = parse_json_fixture('/facts.json')['facts']
+    @facts = parse_json_fixture('regular_host', true)
     set_default_settings
   end
 
@@ -17,8 +20,4 @@ class DiscoveryTaxonomyExtensionsTest < ActiveSupport::TestCase
       refute location.destroy, 'Location was destroyed but it should not be allowed'
     end
   end
-
-  def parse_json_fixture(relative_path)
-    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
-  end
 end

data/test/unit/fact_parser_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class FactParserTest < ActiveSupport::TestCase
   setup do

data/test/unit/host_discovered_test.rb

@@ -1,11 +1,11 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class HostDiscoveredTest < ActiveSupport::TestCase
   include FactImporterIsolation
   allow_transactions_for_any_importer
 
   setup do
-    @facts = parse_json_fixture('/facts.json')['facts']
+    @facts = parse_json_fixture('regular_host', true)
     set_default_settings
   end
 
@@ -112,28 +112,32 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "should lock host into discovery via PXE configuration" do
-    Host::Discovered.delete('mace41f13cc3658')
-    Setting[:discovery_lock] = "true"
-    subnet = FactoryBot.create(:subnet,
-                                :tftp,
-                                :network => '10.35.27.0',
-                                :cidr    => '24',
-                                :mask    => '255.255.255.0',
-                                :organizations => [organization_one],
-                                :locations => [location_one]
-    )
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
-    ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(3)
-    TemplateKind::PXE.each do |kind|
-      ProvisioningTemplate.where(:name => "#{kind.downcase}_discovery").first_or_create(
-          :template_kind_id => template_kinds(kind.downcase.to_sym),
-          :snippet => true,
-          :template => "test"
+    begin
+      Host::Discovered.delete('mace41f13cc3658')
+      Setting[:discovery_lock] = true
+      subnet = FactoryBot.create(:subnet,
+                                  :tftp,
+                                  :network => '10.35.27.0',
+                                  :cidr    => '24',
+                                  :mask    => '255.255.255.0',
+                                  :organizations => [organization_one],
+                                  :locations => [location_one]
       )
+      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(3)
+      TemplateKind::PXE.each do |kind|
+        ProvisioningTemplate.where(:name => "#{kind.downcase}_discovery").first_or_create(
+            :template_kind_id => template_kinds(kind.downcase.to_sym),
+            :snippet => true,
+            :template => "test"
+        )
+      end
+      assert discover_host_from_facts(@facts)
+      assert Host::Discovered.find_by_name('mace41f13cc3658')
+      refute Host::Managed.find_by_name('mace41f13cc3658')
+    ensure
+      Setting[:discovery_lock] = false
     end
-    assert discover_host_from_facts(@facts)
-    assert Host::Discovered.find_by_name('mace41f13cc3658')
-    refute Host::Managed.find_by_name('mace41f13cc3658')
   end
 
   test "should create discovered host with fact_name as a name if it is a valid mac" do
@@ -258,7 +262,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "all non-discovery facts are deleted after managed conversion" do
     Setting[:discovery_clean_facts] = true
-    raw = parse_json_fixture('/facts.json')['facts']
+    raw = parse_json_fixture('regular_host', true)
     raw.merge!({
       'delete_me' => "content",
       'discovery_keep_me' => "content",
@@ -272,7 +276,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "primary interface is preserved after managed conversion" do
-    raw = parse_json_fixture('/facts.json')['facts']
+    raw = parse_json_fixture('regular_host', true)
     raw.merge!({
       'keep_me' => "content",
       'discovery_keep_me' => "content",
@@ -285,7 +289,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "provision interface is preserved after managed conversion" do
-    raw = parse_json_fixture('/facts.json')['facts']
+    raw = parse_json_fixture('regular_host', true)
     raw.merge!({
       'keep_me' => "content",
       'discovery_keep_me' => "content",
@@ -298,7 +302,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "provision interface host association is preserved after managed conversion" do
-    raw = parse_json_fixture('/facts.json')['facts']
+    raw = parse_json_fixture('regular_host', true)
     raw.merge!({
       'keep_me' => "content",
       'discovery_keep_me' => "content",
@@ -311,7 +315,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "all facts are preserved after managed conversion" do
-    raw = parse_json_fixture('/facts.json')['facts']
+    raw = parse_json_fixture('regular_host', true)
     raw.merge!({
       'keep_me' => "content",
       'discovery_keep_me' => "content",
@@ -380,7 +384,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "primary interface isn't touched with no LLDP facts" do
     Setting[:discovery_auto_bond] = true
-    raw = parse_json_fixture('/facts.json')['facts']
+    raw = parse_json_fixture('regular_host', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
     assert_equal "eth0", host.primary_interface.identifier
@@ -388,7 +392,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "provision_interface isn't touched with no peer on the same VLAN" do
     Setting[:discovery_auto_bond] = true
-    raw = parse_json_fixture('/facts_with_lldp.json')['facts']
+    raw = parse_json_fixture('facts_with_lldp', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
     assert_equal "eth0", host.primary_interface.identifier
@@ -396,7 +400,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "provision_interface is switched to bond0 with more than one interface on the same VLAN" do
     Setting[:discovery_auto_bond] = true
-    raw = parse_json_fixture('/facts_with_lldp_bond_candidate.json')['facts']
+    raw = parse_json_fixture('facts_with_lldp_bond_candidate', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
     assert_equal "bond0", host.primary_interface.identifier
@@ -404,7 +408,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "provision_interface is not switched to bond0 if disabled" do
     Setting[:discovery_auto_bond] = false
-    raw = parse_json_fixture('/facts_with_lldp_bond_candidate.json')['facts']
+    raw = parse_json_fixture('facts_with_lldp_bond_candidate', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
     assert_equal "eth0", host.primary_interface.identifier
@@ -412,7 +416,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "former provision_interface is cleanup up after switching to bond0" do
     Setting[:discovery_auto_bond] = true
-    raw = parse_json_fixture('/facts_with_lldp_bond_candidate.json')['facts']
+    raw = parse_json_fixture('facts_with_lldp_bond_candidate', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
 
@@ -427,8 +431,4 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_nil former_interface.name
     assert_equal false, former_interface.primary
   end
-
-  def parse_json_fixture(relative_path)
-    JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
-  end
 end

data/test/unit/lldp_neighbors_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class LldpNeighborsTest < ActiveSupport::TestCase
   test "#get_neighbors_by_interface gives nothing with no LLDP facts" do
@@ -35,7 +35,7 @@ class LldpNeighborsTest < ActiveSupport::TestCase
   private
 
   def simple_facts
-    neighbors 'facts'
+    neighbors 'regular_host'
   end
 
   def lldp_facts
@@ -47,10 +47,6 @@ class LldpNeighborsTest < ActiveSupport::TestCase
   end
 
   def neighbors(name)
-    ForemanDiscovery::LldpNeighbors.from_facts(get_facts name)
-  end
-
-  def get_facts(name)
-    JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + "/#{name}.json")))['facts']
+    ForemanDiscovery::LldpNeighbors.from_facts(parse_json_fixture(name, true))
   end
 end

data/test/unit/managed_extensions_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class ManagedExtensionsTest < ActiveSupport::TestCase
   class StubHost < ApplicationRecord
@@ -33,19 +33,17 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
   end
 
   test "queue_reboot enques reboot command when there is no kexec fact" do
-    @host.stubs(:type_changed?).returns(true)
+    @host.stubs(:will_save_change_to_attribute?).with(:type, from: 'Host::Discovered').returns(true)
     @host.stubs(:new_record?).returns(false)
     @host.id = 130513
-    ::Host::Base.stubs(:find).with(@host.id).returns(@host)
     @post_queue.expects(:create).with(has_entry(:action, [@host, :setReboot])).once
     @host.queue_reboot
   end
 
   test "queue_reboot enques reboot command when there is no kexec template" do
-    @host.stubs(:type_changed?).returns(true)
+    @host.stubs(:will_save_change_to_attribute?).with(:type, from: 'Host::Discovered').returns(true)
     @host.stubs(:new_record?).returns(false)
     @host.id = 130513
-    ::Host::Base.stubs(:find).with(@host.id).returns(@host)
     @facts['discovery_kexec'] = "Kexec version X.Y.Z"
     @host.stubs(:provisioning_template).returns(nil)
     @post_queue.expects(:create).with(has_entry(:action, [@host, :setReboot])).once
@@ -53,10 +51,9 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
   end
 
   test "queue_reboot enques kexec command" do
-    @host.stubs(:type_changed?).returns(true)
+    @host.stubs(:will_save_change_to_attribute?).with(:type, from: 'Host::Discovered').returns(true)
     @host.stubs(:new_record?).returns(false)
     @host.id = 130513
-    ::Host::Base.stubs(:find).with(@host.id).returns(@host)
     @facts['discovery_kexec'] = "Kexec version X.Y.Z"
     @post_queue.expects(:create).with(has_entry(:action, [@host, :setKexec])).once
     @host.queue_reboot

data/test/unit/setting_discovered_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../test_plugin_helper'
 
 class SettingDiscoveredTest < ActiveSupport::TestCase
   test "can create setting of discovered type" do

data/test/unit/ui_notifications/destroy_host_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../../test_plugin_helper'
 
 class DestroyHostNotificationTest < ActiveSupport::TestCase
   alias_method  :blueprint, :discovered_notification_blueprint
@@ -51,8 +51,4 @@ class DestroyHostNotificationTest < ActiveSupport::TestCase
     assert new_host.save!
     assert_equal 1, blueprint.notifications.count
   end
-
-  def parse_json_fixture(relative_path)
-    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
-  end
 end

data/test/unit/ui_notifications/new_host_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require_relative '../../test_plugin_helper'
 
 class NewHostNotificationTest < ActiveSupport::TestCase
   include FactImporterIsolation
@@ -12,7 +12,7 @@ class NewHostNotificationTest < ActiveSupport::TestCase
   test 'new discovered host should generate a notification' do
     set_default_settings
     assert_difference('blueprint.notifications.count') do
-      discover_host_from_facts(parse_json_fixture('/../facts.json')['facts'])
+      discover_host_from_facts(parse_json_fixture('regular_host', true))
     end
   end
 
@@ -26,8 +26,4 @@ class NewHostNotificationTest < ActiveSupport::TestCase
     assert_equal 1, blueprint.notifications.count
     assert_not_equal expired_at, blueprint.notifications.first.expired_at
   end
-
-  def parse_json_fixture(relative_path)
-    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
-  end
 end

metadata

@@ -1,9 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 13.0.1
+  version: 14.0.0
 platform: ruby
 authors:
+- Aditi Puntambekar
 - alongoldboim
 - Alon Goldboim
 - amirfefer
@@ -17,6 +18,7 @@ authors:
 - Daniel Lobato García
 - Danny Smit
 - David Davis
+- Djebran Lezzoum
 - Dominic Cleal
 - Eric D. Helms
 - Ewoud Kohl van Wijngaarden
@@ -65,7 +67,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -100,6 +102,12 @@ files:
 - app/models/setting/discovered.rb
 - app/services/foreman_discovery/fact_parser.rb
 - app/services/foreman_discovery/host_converter.rb
+- app/services/foreman_discovery/import_hook.rb
+- app/services/foreman_discovery/import_hook_service.rb
+- app/services/foreman_discovery/import_hooks/discovery_attribute.rb
+- app/services/foreman_discovery/import_hooks/lldp_neighbor.rb
+- app/services/foreman_discovery/import_hooks/lock_templates.rb
+- app/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb
 - app/services/foreman_discovery/lldp_neighbors.rb
 - app/services/foreman_discovery/node_api/inventory.rb
 - app/services/foreman_discovery/node_api/node_resource.rb
@@ -171,14 +179,6 @@ files:
 - db/seeds.d/80_discovery_ui_notification.rb
 - db/seeds.d/90_add_permissions_from_default_roles.rb
 - extra/discover-host
-- extra/discovery/default.json
-- extra/discovery/many_ems.json
-- extra/discovery/pxeless-vlan.json
-- extra/discovery/rhel-dl380-1kdisks.json
-- extra/discovery/rhel-r730.json
-- extra/discovery/rhel7-vlan.json
-- extra/discovery/simple-bond.json
-- extra/discovery/suse-vmware.json
 - extra/generate-authors-file
 - lib/discovery.rake
 - lib/foreman_discovery.rb
@@ -233,6 +233,20 @@ files:
 - locale/zh_TW/foreman_discovery.po
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
+- test/facts/default.json
+- test/facts/dell_npars.json
+- test/facts/dell_vlan.json
+- test/facts/facts_with_lldp.json
+- test/facts/facts_with_lldp_bond_candidate.json
+- test/facts/puppet3-virtual.json
+- test/facts/pxeless-vlan.json
+- test/facts/regular_host.json
+- test/facts/rhel-dl380-1kdisks.json
+- test/facts/rhel-r730.json
+- test/facts/rhel7-vlan.json
+- test/facts/simple-bond.json
+- test/facts/suse-vmware.json
+- test/facts/vmware_local.json
 - 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
@@ -250,9 +264,6 @@ files:
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/facts.json
-- test/unit/facts_with_lldp.json
-- test/unit/facts_with_lldp_bond_candidate.json
 - test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
 - test/unit/managed_extensions_test.rb
@@ -288,10 +299,22 @@ test_files:
 - test/test_plugin_helper.rb
 - test/test_helper_discovery.rb
 - test/integration/discovered_hosts_test.rb
-- test/unit/facts_with_lldp.json
+- test/facts/facts_with_lldp.json
+- test/facts/dell_vlan.json
+- test/facts/rhel-r730.json
+- test/facts/regular_host.json
+- test/facts/vmware_local.json
+- test/facts/pxeless-vlan.json
+- test/facts/dell_npars.json
+- test/facts/simple-bond.json
+- test/facts/puppet3-virtual.json
+- test/facts/rhel-dl380-1kdisks.json
+- test/facts/suse-vmware.json
+- test/facts/default.json
+- test/facts/rhel7-vlan.json
+- test/facts/facts_with_lldp_bond_candidate.json
 - test/unit/lldp_neighbors_test.rb
 - test/unit/discovery_attribute_set_test.rb
-- test/unit/facts.json
 - test/unit/discovered_mailer_test.rb
 - test/unit/managed_extensions_test.rb
 - test/unit/discovery_rule_test.rb
@@ -302,7 +325,6 @@ test_files:
 - test/unit/setting_discovered_test.rb
 - test/unit/host_discovered_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/facts_with_lldp_bond_candidate.json
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb