foreman_discovery 16.1.0 → 16.2.0

data/test/functional/discovered_hosts_controller_test.rb

@@ -8,7 +8,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   setup do
     assert discovered_notification_blueprint
     @request.env['HTTP_REFERER'] = '/discovery_rules'
-    FactoryBot.create(:subnet, :network => "192.168.100.1", :mask => "255.255.255.0", :locations => [location_one], :organizations => [organization_one])
+    FactoryBot.create(:subnet, :dhcp, :network => "192.168.100.1", :mask => "255.255.255.0", :locations => [location_one], :organizations => [organization_one])
     @facts = {
       "interfaces"             => "lo,eth0",
       "ipaddress"              => "192.168.100.42",
@@ -115,7 +115,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
       } }, session: set_session_user_default_manager
     # all inherit buttons are pressed
     assert_select('button[name=is_overridden_btn]') do |e|
-      e.attribute("class") =~ /active/
+      e.attribute("class").to_s =~ /active/
     end
     # particular fields are set
     assert_select '#host_hostgroup_id [selected]' do |e|
@@ -140,6 +140,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_update_inheritance
     host = discover_host_from_facts(@facts)
+    ForemanDiscovery::HostConverter.stubs(:unused_ip_for_subnet).returns(host.ip)
     hostgroup = setup_hostgroup(host)
     put :update, params: {
       commit: 'Update',
@@ -183,10 +184,10 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   def test_reboot_failure
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = discover_host_from_facts(@facts)
-    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).twice.returns(false)
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
     post :reboot, params: { :id => host.id }, session: set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
-    assert_equal "Failed to reboot host #{host.name}", flash[:error]
+    assert_match(/ERF42-4036/, flash[:error])
   end
 
   def test_reboot_error
@@ -195,7 +196,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post :reboot, params: { :id => host.id }, session: set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
-    assert_match(/ERF50-9494/, flash[:error])
+    assert_match(/ERF42-4036/, flash[:error])
   end
 
   def test_auto_provision_success
@@ -271,10 +272,10 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   def test_multiple_reboot_failure
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = discover_host_from_facts(@facts)
-    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).twice.returns(false)
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
     post :submit_multiple_reboot, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_redirected_to discovered_hosts_url
-    assert_equal "Errors during reboot: #{host.name}: failed to reboot", flash[:error]
+    assert_match(/ERF42-4036/, flash[:error])
     assert_nil flash[:success]
   end
 
@@ -284,12 +285,15 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post :submit_multiple_reboot, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_redirected_to discovered_hosts_url
-    assert_match(/ERF50-9494/, flash[:error])
+    assert_match(/ERF42-4036/, flash[:error])
     assert_nil flash[:success]
   end
 
   def test_no_dns_rebuild_if_dns_pending
     host = discover_host_from_facts(@facts)
+    ForemanDiscovery::HostConverter.stubs(:unused_ip_for_subnet).returns(host.ip)
+    Nic::Managed.any_instance.stubs(:dhcp_update_required?).returns(false)
+    Net::DHCP::Record.any_instance.stubs(:conflicting?).returns(false)
     hostgroup = prepare_hostgroup_for_dns_rebuild(host)
     Nic::Managed.any_instance.expects(:rebuild_dns).never
     Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
@@ -306,6 +310,9 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_dns_rebuild
     host = prepare_host_for_dns_rebuild
+    ForemanDiscovery::HostConverter.stubs(:unused_ip_for_subnet).returns(host.ip)
+    Nic::Managed.any_instance.stubs(:dhcp_update_required?).returns(false)
+    Net::DHCP::Record.any_instance.stubs(:conflicting?).returns(false)
     hostgroup = prepare_hostgroup_for_dns_rebuild(host)
     Nic::Managed.any_instance.expects(:rebuild_dns)
     Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
@@ -319,6 +326,8 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_dns_rebuild_with_auto_provision
     host = prepare_host_for_dns_rebuild
+    ForemanDiscovery::HostConverter.stubs(:unused_ip_for_subnet).returns(host.ip)
+    Nic::Managed.any_instance.stubs(:dhcp_update_required?).returns(false)
     hostgroup = prepare_hostgroup_for_dns_rebuild(host)
     Nic::Managed.any_instance.expects(:rebuild_dns)
     Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)

data/test/unit/discovered_extensions_test.rb

@@ -9,6 +9,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     @facts = facts_simple_network100_42
     @facts_ipv6 = facts_network_2001_db8
     set_default_settings
+    ProxyAPI::DHCP.any_instance.stubs(:record).returns(nil)
     ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 

data/test/unit/host_discovered_test.rb

@@ -260,12 +260,6 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal 'teste41f13cc3658', host.name
   end
 
-  test "should create discovered host without prefix" do
-    Setting[:discovery_prefix] = ''
-    host = discover_host_from_facts(@facts)
-    assert_equal 'e41f13cc3658',host.name
-  end
-
   test "should refresh facts and NICs of an existing discovered host" do
     host1 = discover_host_from_facts(@facts)
     assert_equal 'mace41f13cc3658', host1.name
@@ -290,16 +284,6 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_match(/Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting:/, exception.message)
   end
 
-  test "should raise when hostname cannot be computed due to normlization and no prefix" do
-    @facts['invalidhostnamefact'] = '...'
-    Setting[:discovery_hostname] = 'invalidhostnamefact'
-    Setting[:discovery_prefix] = ''
-    exception = assert_raises(::Foreman::Exception) do
-      discover_host_from_facts(@facts)
-    end
-    assert_match(/Invalid hostname: Could not normalize the hostname/, exception.message)
-  end
-
   test 'discovered host can be searched in multiple taxonomies' do
     org1 = FactoryBot.create(:organization)
     org2 = FactoryBot.create(:organization)

data/test/unit/managed_extensions_test.rb

@@ -18,6 +18,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
 
       @host = StubHost.new
       @host.type = "Host::Discovered"
+      @host.stubs(:ip).returns("192.168.1.1")
       @host.stubs(:old).returns(@host)
       @facts = {}
       @host.stubs(:facts).returns(@facts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 16.1.0
+  version: 16.2.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -71,7 +71,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -106,6 +106,7 @@ files:
 - app/models/setting/discovered.rb
 - app/services/foreman_discovery/fact_parser.rb
 - app/services/foreman_discovery/host_converter.rb
+- app/services/foreman_discovery/host_fact_importer.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
@@ -244,12 +245,14 @@ files:
 - test/facts/dell_vlan.json
 - test/facts/facts_with_lldp.json
 - test/facts/facts_with_lldp_bond_candidate.json
+- test/facts/only-ipv6.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/skylake-ipv6.json
 - test/facts/suse-vmware.json
 - test/facts/vmware_local.json
 - test/functional/api/v2/discovered_hosts_controller_test.rb
@@ -294,47 +297,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
-- test/functional/discovered_hosts_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/api/v2/discovery_rules_controller_test.rb
-- test/functional/discovery_rules_controller_test.rb
-- test/integration/discovered_hosts_test.rb
-- test/test_plugin_helper.rb
-- test/facts/facts_with_lldp.json
-- test/facts/dell_vlan.json
+- test/factories/discovery_host_related.rb
+- test/factories/discovery_rule_related.rb
 - test/facts/bond0-eth0-eth1-active-passive.json
-- test/facts/simple-bond.json
-- test/facts/rhel-r730.json
+- 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/pxeless-vlan.json
 - test/facts/regular_host.json
-- test/facts/facts_with_lldp_bond_candidate.json
-- test/facts/rhel7-vlan.json
-- test/facts/default.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/facts/only-ipv6.json
+- test/facts/skylake-ipv6.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
+- test/functional/api/v2/settings_controller_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/models/setting_test.rb
+- test/test_helper_discovery.rb
+- test/test_plugin_helper.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/discovered_mailer_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/discovered_extensions_test.rb
-- test/unit/setting_discovered_test.rb
-- test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
+- test/unit/setting_discovered_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/discovered_extensions_test.rb
 - test/unit/managed_extensions_test.rb
-- test/models/setting_test.rb
-- test/test_helper_discovery.rb
-- test/factories/discovery_rule_related.rb
-- test/factories/discovery_host_related.rb