foreman_discovery 9.1.5 → 10.0.0

data/test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb

@@ -7,16 +7,15 @@ module ForemanDiscovery
 
       context 'hosts controller requests from discovered_hosts url' do
         test 'get "host" params from "discovered_hosts" params' do
-          architecture = FactoryGirl.create(:architecture)
+          os = FactoryGirl.create(:operatingsystem, :with_associations)
+          arch_id = os.architectures.first.id
           discovered_host_params = {
-            'discovered_host' => { 'architecture_id' => architecture.id }
+            'discovered_host' => { 'architecture_id' => arch_id }
           }
 
-          @request.stubs(:path).
-            returns(architecture_selected_discovered_hosts_path)
-
+          @request.stubs(:path).returns(architecture_selected_discovered_hosts_path)
           post :architecture_selected, discovered_host_params, set_session_user
-          assert assigns('architecture'), architecture
+          assert_match(/"#{os.id}"/, response.body)
         end
       end
     end

data/test/test_helper_discovery.rb

@@ -109,3 +109,21 @@ end
 def location_one
   Location.find_by_name('Location 1')
 end
+
+def facts_simple_network100_42
+  {
+    "interfaces"       => "lo,eth0,eth1",
+    "ipaddress"        => "192.168.100.42",
+    "ipaddress_eth0"   => "192.168.100.42",
+    "ipaddress_eth1"   => "192.168.100.15",
+    "macaddress_eth0"  => "AA:BB:CC:DD:EE:FF",
+    "macaddress_eth1"  => "AA:BB:CC:DD:EE:F1",
+    "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
+  }
+end
+
+def discover_host_from_facts(facts)
+  User.as_anonymous_admin do
+    Host::Discovered.import_host(facts)
+  end
+end

data/test/unit/discovered_extensions_test.rb

@@ -4,38 +4,30 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
   include Foreman::Controller::DiscoveredExtensions
 
   setup do
-    @facts = {
-      "interfaces"       => "lo,eth0,eth1",
-      "ipaddress"        => "192.168.100.42",
-      "ipaddress_eth0"   => "192.168.100.42",
-      "ipaddress_eth1"   => "192.168.100.15",
-      "macaddress_eth0"  => "AA:BB:CC:DD:EE:FF",
-      "macaddress_eth1"  => "AA:BB:CC:DD:EE:F1",
-      "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
-    }
+    @facts = facts_simple_network100_42
     set_default_settings
   end
 
   test "no rule is found for empty rule set" do
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     refute find_discovery_rule(host)
   end
 
   test "no rule is found out of one for a discovered host with no facts" do
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     FactoryGirl.create(:discovery_rule, :search => "facts.foo = bar")
     refute find_discovery_rule(host)
   end
 
   test "no rule is found out of one for a discovered host with some facts" do
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     FactoryGirl.create(:discovery_rule, :search => "facts.foo = doesnotexist")
     refute find_discovery_rule(host)
   end
 
   test "no rule is found out of two for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = xxx")
     FactoryGirl.create(:discovery_rule, :priority => 2, :search => "facts.somefact = zzz")
     refute find_discovery_rule(host)
@@ -43,7 +35,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "rule out of one is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_equal find_discovery_rule(host), r1
@@ -51,7 +43,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "first rule out of two is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = x",
@@ -61,7 +53,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "second rule out of two is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = x",
                        :organizations => [host.organization], :locations => [host.location])
     r2 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
@@ -71,7 +63,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "first rule out of two with different priorities is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :name => "A", :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     r2 = FactoryGirl.create(:discovery_rule, :name => "B", :priority => 2, :search => "facts.somefact = abc",
@@ -81,7 +73,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "second rule out of two with different priorities is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :name => "A", :priority => 2, :search => "facts.somefact = abc",
                        :organizations => [host.organization], :locations => [host.location])
     r2 = FactoryGirl.create(:discovery_rule, :name => "B", :priority => 1, :search => "facts.somefact = abc",
@@ -91,7 +83,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "older rule out of two is found for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                        :organizations => [host.organization], :locations => [host.location])
     r2 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
@@ -102,7 +94,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "drained rule does not match for a discovered host" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :max_count => 1,
                             :organizations => [host.organization], :locations => [host.location])
     r2 = FactoryGirl.create(:discovery_rule, :priority => 2, :search => "facts.somefact = abc",
@@ -113,7 +105,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "discovery rule is associated after auto provisioning" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     perform_auto_provision host, r1
@@ -125,7 +117,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "auto provisioning fails for rule without a hostgroup" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     r1.hostgroup = nil
@@ -137,7 +129,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "existing rule revent from hostgroup deletion" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     assert_raises(ActiveRecord::RecordNotDestroyed) do
@@ -147,7 +139,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "rules with incorrect syntax are skipped" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     FactoryGirl.create(:discovery_rule, :priority => 1, :search => '=!^$#@?x',
                        :organizations => [host.organization], :locations => [host.location])
     r2 = FactoryGirl.create(:discovery_rule, :priority => 2, :search => "facts.somefact = abc",
@@ -157,7 +149,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "hostname is copied after auto provisioning" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                             :organizations => [host.organization], :locations => [host.location])
     perform_auto_provision host, r1
@@ -168,7 +160,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     facts = @facts.merge({"somefact" => "abc"})
     domain = FactoryGirl.create(:domain)
     subnet = FactoryGirl.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 = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     assert_equal subnet, host.subnet
     hostgroup = FactoryGirl.create(:hostgroup, :with_environment, :with_rootpass, :with_puppet_orchestration, :with_os, :pxe_loader => "PXELinux BIOS", :subnet => subnet, :domain => domain)
     r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :organizations => [host.organization], :locations => [host.location], :hostgroup => hostgroup)
@@ -196,7 +188,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
   test "attributes from hostgroup are copied after auto provisioning for host without subnet detected" do
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     refute host.subnet
     domain = FactoryGirl.create(:domain)
     subnet = FactoryGirl.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")])
@@ -245,7 +237,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     end
 
     test "hostname falls back to original name on empty response via #{renderer_name}" do
-      host = Host::Discovered.import_host(@facts)
+      host = discover_host_from_facts(@facts)
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => '<%= "" %>',
@@ -256,7 +248,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     end
 
     test "hostname is rendered after auto provisioning using #{renderer_name}" do
-      host = Host::Discovered.import_host(@facts)
+      host = discover_host_from_facts(@facts)
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= 1+1 %>',
@@ -267,7 +259,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     end
 
     test "function rand is renderer properly using #{renderer_name}" do
-      host = Host::Discovered.import_host(@facts)
+      host = discover_host_from_facts(@facts)
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= rand(4) %>',
@@ -278,7 +270,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     end
 
     test "hostname attribute name is renderer properly using #{renderer_name}" do
-      host = Host::Discovered.import_host(@facts)
+      host = discover_host_from_facts(@facts)
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.name %>',
@@ -289,7 +281,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
     end
 
     test "hostname attribute ip is renderer properly using #{renderer_name}" do
-      host = Host::Discovered.import_host(@facts)
+      host = discover_host_from_facts(@facts)
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.ip.gsub(".","-") %>',
@@ -301,7 +293,7 @@ class DiscoveredExtensionsTest < ActiveSupport::TestCase
 
     test "hostname attribute facts_hash is renderer properly using #{renderer_name}" do
       facts = @facts.merge({"somefact" => "abc"})
-      host = Host::Discovered.import_host(facts)
+      host = discover_host_from_facts(facts)
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.facts["somefact"] %>',

data/test/unit/discovery_attribute_set_test.rb

@@ -3,6 +3,7 @@ require 'test_plugin_helper'
 class DiscoveryAttributeSetTest < ActiveSupport::TestCase
 
   setup do
+    @facts = parse_json_fixture('/facts.json')['facts']
     FactoryGirl.create(:setting,
                        :name => 'discovery_hostname',
                        :value => 'discovery_bootif',
@@ -14,8 +15,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   end
 
   test "can search discovered hosts by cpu" do
-    raw = parse_json_fixture('/facts.json')
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     results = Host::Discovered.search_for("cpu_count = #{host.facts_hash['physicalprocessorcount'].to_i}")
     assert_equal 1, results.count
     results = Host::Discovered.search_for("cpu_count > #{host.facts_hash['physicalprocessorcount'].to_i}")
@@ -23,8 +23,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   end
 
   test "can search discovered hosts by memory" do
-    raw = parse_json_fixture('/facts.json')
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     results = Host::Discovered.search_for("memory = #{host.facts_hash['memorysize_mb'].to_f.ceil}")
     assert_equal 1, results.count
     results = Host::Discovered.search_for("memory > #{host.facts_hash['memorysize_mb'].to_f.ceil}")
@@ -32,8 +31,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   end
 
   test "can search discovered hosts by disk_count" do
-    raw = parse_json_fixture('/facts.json')
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     results = Host::Discovered.search_for("disk_count = 1")
     assert_equal 1, results.count
     results = Host::Discovered.search_for("disk_count = 3")
@@ -41,8 +39,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   end
 
   test "can search discovered hosts by disks_size" do
-    raw = parse_json_fixture('/facts.json')
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     disks_size = (host.facts_hash['blockdevice_sda_size'].to_f / 1024 / 1024).ceil
     results = Host::Discovered.search_for("disks_size = #{disks_size}")
     assert_equal 1, results.count

data/test/unit/discovery_taxonomy_extensions_test.rb

@@ -2,14 +2,14 @@ require 'test_plugin_helper'
 
 class DiscoveryTaxonomyExtensionsTest < ActiveSupport::TestCase
   setup do
+    @facts = parse_json_fixture('/facts.json')['facts']
     set_default_settings
   end
 
   test 'deleting location does not hard fail if there is associated discovered host' do
     location = FactoryGirl.create(:location)
 
-    raw = parse_json_fixture('/facts.json')
-    assert (host = Host::Discovered.import_host(raw['facts']))
+    assert (host = discover_host_from_facts(@facts))
     host.location = location
     assert host.save
 

data/test/unit/host_discovered_test.rb

@@ -2,6 +2,7 @@ require 'test_plugin_helper'
 
 class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
+    @facts = parse_json_fixture('/facts.json')['facts']
     set_default_settings
   end
 
@@ -11,8 +12,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "should import facts from yaml as Host::Discovered" do
-    raw = parse_json_fixture('/facts.json')
-    assert Host::Discovered.import_host(raw['facts'])
+    assert discover_host_from_facts(@facts)
     assert Host::Discovered.find_by_name('mace41f13cc3658')
   end
 
@@ -26,7 +26,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
 
@@ -38,7 +38,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
 
@@ -46,11 +46,11 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     org = FactoryGirl.create(:organization, :name => "subnet_org_via_fact")
     loc = FactoryGirl.create(:location, :name => "subnet_loc_via_fact")
     raw = parse_json_fixture('/facts.json')
-    raw['facts']['foreman_organization'] = org.name
-    raw['facts']['foreman_location'] = loc.name
+    @facts['foreman_organization'] = org.name
+    @facts['foreman_location'] = loc.name
     subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
 
@@ -64,7 +64,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     subnet = FactoryGirl.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
     Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     assert_equal org, host.organization
     assert_equal loc, host.location
   end
@@ -73,7 +73,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_fact] = 'macaddress_foo'
     exception = assert_raises(::Foreman::Exception) do
-      Host::Discovered.import_host(raw['facts'])
+      discover_host_from_facts(@facts)
     end
     assert_match(/Expected discovery_fact '\w+' is missing/, exception.message)
   end
@@ -81,15 +81,15 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should be able to refresh facts" do
     host = Host.create :name => "mydiscoveredhost", :ip => "1.2.3.4", :type => "Host::Discovered"
     raw = parse_json_fixture('/facts.json')
-    ::ForemanDiscovery::NodeAPI::Inventory.any_instance.stubs(:facter).returns(raw['facts'])
+    ::ForemanDiscovery::NodeAPI::Inventory.any_instance.stubs(:facter).returns(@facts)
     assert host.refresh_facts
   end
 
   test "should create discovered host with hostname if a fact was supplied" do
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_hostname] = 'somefact'
-    facts = raw['facts'].merge({"somefact" => "somename"})
-    host = Host::Discovered.import_host(facts)
+    facts = @facts.merge({"somefact" => "somename"})
+    host = discover_host_from_facts(facts)
     assert_equal 'macsomename', host.name
     refute_equal 'e4:1f:13:cc:36:5a', host.mac
   end
@@ -115,7 +115,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
           :template => "test"
       )
     end
-    assert Host::Discovered.import_host(raw['facts'])
+    assert discover_host_from_facts(@facts)
     assert Host::Discovered.find_by_name('mace41f13cc3658')
     refute Host::Managed.find_by_name('mace41f13cc3658')
   end
@@ -124,8 +124,8 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_fact] = 'somefact'
     Setting[:discovery_hostname] = 'somefact'
-    facts = raw['facts'].merge({"somefact" => "E4:1F:13:CC:36:5A"})
-    host = Host::Discovered.import_host(facts)
+    facts = @facts.merge({"somefact" => "E4:1F:13:CC:36:5A"})
+    host = discover_host_from_facts(facts)
     assert_equal 'mace41f13cc365a', host.name
     assert_equal 'e4:1f:13:cc:36:5a', host.mac
   end
@@ -134,7 +134,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_fact] = 'lsbdistcodename'
     exception = assert_raises(::Foreman::Exception) do
-      Host::Discovered.import_host(raw['facts'])
+      discover_host_from_facts(@facts)
     end
     assert_match(/Unable to detect primary interface using MAC/, exception.message)
   end
@@ -143,7 +143,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     FactoryGirl.create(:host, :mac => 'E4:1F:13:CC:36:58')
     raw = parse_json_fixture('/facts.json')
     exception = assert_raises(::Foreman::Exception) do
-      Host::Discovered.import_host(raw['facts'])
+      discover_host_from_facts(@facts)
     end
     assert_match(/Host already exists as managed/, exception.message)
   end
@@ -151,14 +151,14 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should create discovered host with prefix" do
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_prefix] = 'test'
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     assert_equal 'teste41f13cc3658', host.name
   end
 
   test "should create discovered host without prefix" do
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_prefix] = ''
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     assert_equal 'e41f13cc3658',host.name
   end
 
@@ -166,8 +166,8 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     interface = mock()
     interface.stubs(:host).returns(Host.create(:name => "xyz", :type => "Host::Discovered"))
-    ::Nic::Managed.stubs(:where).with(:mac => raw['facts']['discovery_bootif'].downcase, :primary => true).returns([interface])
-    host = Host::Discovered.import_host(raw['facts'])
+    ::Nic::Managed.stubs(:where).with(:mac => @facts['discovery_bootif'].downcase, :primary => true).returns([interface])
+    host = discover_host_from_facts(@facts)
     assert_equal 'xyz', host.name
   end
 
@@ -175,18 +175,18 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_hostname] = 'macaddress_foo'
     exception = assert_raises(::Foreman::Exception) do
-      Host::Discovered.import_host(raw['facts'])
+      discover_host_from_facts(@facts)
     end
     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
     raw = parse_json_fixture('/facts.json')
-    raw['facts']['invalidhostnamefact'] = '...'
+    @facts['invalidhostnamefact'] = '...'
     Setting[:discovery_hostname] = 'invalidhostnamefact'
     Setting[:discovery_prefix] = ''
     exception = assert_raises(::Foreman::Exception) do
-      Host::Discovered.import_host(raw['facts'])
+      discover_host_from_facts(@facts)
     end
     assert_match(/Invalid hostname: Could not normalize the hostname/, exception.message)
   end
@@ -222,7 +222,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Setting[:token_duration] = 30 #enable tokens so that we only test the CR
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_prefix] = '123'
-    host = Host::Discovered.import_host(raw['facts'])
+    host = discover_host_from_facts(@facts)
     host.save
     h = ::ForemanDiscovery::HostConverter.to_managed(host)
     refute_valid h
@@ -236,7 +236,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       'delete_me' => "content",
       'discovery_keep_me' => "content",
       })
-    host = Host::Discovered.import_host(raw)
+    host = discover_host_from_facts(raw)
     host.save
     managed = ::ForemanDiscovery::HostConverter.to_managed(host)
     managed.clear_facts
@@ -250,7 +250,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       'keep_me' => "content",
       'discovery_keep_me' => "content",
       })
-    host = Host::Discovered.import_host(raw)
+    host = discover_host_from_facts(raw)
     host.save
     managed = ::ForemanDiscovery::HostConverter.to_managed(host)
     refute_nil managed.primary_interface
@@ -263,7 +263,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       'keep_me' => "content",
       'discovery_keep_me' => "content",
       })
-    host = Host::Discovered.import_host(raw)
+    host = discover_host_from_facts(raw)
     host.save
     managed = ::ForemanDiscovery::HostConverter.to_managed(host)
     refute_nil managed.provision_interface
@@ -276,7 +276,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       'keep_me' => "content",
       'discovery_keep_me' => "content",
       })
-    host = Host::Discovered.import_host(raw)
+    host = discover_host_from_facts(raw)
     host.save
     managed = ::ForemanDiscovery::HostConverter.to_managed(host)
     refute_nil managed.provision_interface
@@ -289,7 +289,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       'keep_me' => "content",
       'discovery_keep_me' => "content",
       })
-    host = Host::Discovered.import_host(raw)
+    host = discover_host_from_facts(raw)
     host.save
     managed = ::ForemanDiscovery::HostConverter.to_managed(host)
     managed.clear_facts