foreman_discovery 9.1.5 → 10.0.0

data/locale/fr/foreman_discovery.edit.po

@@ -7,10 +7,10 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014,2016-2017
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:20+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: French (http://www.transifex.com/foreman/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"

data/locale/fr/foreman_discovery.po

@@ -7,9 +7,9 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014,2016-2017
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:20+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: French (http://www.transifex.com/foreman/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"

data/locale/gl/foreman_discovery.edit.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
 "PO-Revision-Date: 2017-10-17 23:23+0000\n"

data/locale/gl/foreman_discovery.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/it/foreman_discovery.edit.po

@@ -7,10 +7,10 @@
 # caifti <caifti@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:20+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Italian (http://www.transifex.com/foreman/foreman/language/it/)\n"
 "MIME-Version: 1.0\n"

data/locale/it/foreman_discovery.po

@@ -7,9 +7,9 @@
 # caifti <caifti@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:20+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Italian (http://www.transifex.com/foreman/foreman/language/it/)"
 "\n"

data/locale/ja/foreman_discovery.edit.po

@@ -6,10 +6,10 @@
 # Shuji Yamada <uzy.exe@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:21+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/ja/)\n"
 "MIME-Version: 1.0\n"

data/locale/ja/foreman_discovery.po

@@ -6,9 +6,9 @@
 # Shuji Yamada <uzy.exe@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:21+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Japanese (http://www.transifex.com/foreman/foreman/language/ja/"
 ")\n"

data/locale/ko/foreman_discovery.edit.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:22+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Korean (http://www.transifex.com/foreman/foreman/language/ko/)\n"
 "MIME-Version: 1.0\n"

data/locale/ko/foreman_discovery.po

@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:22+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Korean (http://www.transifex.com/foreman/foreman/language/ko/)\n"
 "MIME-Version: 1.0\n"

data/locale/pt_BR/foreman_discovery.edit.po

@@ -10,10 +10,10 @@
 # Valeria S Silva <valeriassilva@live.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:23+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/foreman/foreman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"

data/locale/pt_BR/foreman_discovery.po

@@ -10,9 +10,9 @@
 # Valeria S Silva <valeriassilva@live.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:23+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/foreman/foreman/l"
 "anguage/pt_BR/)\n"

data/locale/ru/foreman_discovery.edit.po

@@ -10,10 +10,10 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:24+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)\n"
 "MIME-Version: 1.0\n"

data/locale/ru/foreman_discovery.po

@@ -10,9 +10,9 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:24+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Russian (http://www.transifex.com/foreman/foreman/language/ru/)"
 "\n"

data/locale/sv_SE/foreman_discovery.edit.po

@@ -8,7 +8,7 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
 "PO-Revision-Date: 2017-10-17 23:23+0000\n"

data/locale/sv_SE/foreman_discovery.po

@@ -8,7 +8,7 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/zh_CN/foreman_discovery.edit.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:24+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"

data/locale/zh_CN/foreman_discovery.po

@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:24+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"

data/locale/zh_TW/foreman_discovery.edit.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-20 17:25+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"

data/locale/zh_TW/foreman_discovery.po

@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.4\n"
+"Project-Id-Version: foreman_discovery 9.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-20 17:25+0000\n"
+"PO-Revision-Date: 2017-10-17 23:23+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"

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

@@ -35,7 +35,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_show_host
     FactoryGirl.create(:organization, :name => 'SomeOrg')
     FactoryGirl.create(:location, :name => 'SomeLoc')
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     get :show, { :id => host.id }
     assert_response :success
     show_response = ActiveSupport::JSON.decode(@response.body)
@@ -48,7 +48,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_delete_discovered_host
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     delete :destroy, { :id => host.id }
     assert_response :success
   end
@@ -56,7 +56,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_provision_host
     FactoryGirl.create(:organization, :name => 'SomeOrg')
     FactoryGirl.create(:location, :name => 'SomeLoc')
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     hostgroup = setup_hostgroup(host)
     put :update,
         id: host.id,
@@ -64,7 +64,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
           hostgroup_id: hostgroup.id
         }
 
-    assert_match /#{host.name}/, @response.body
+    assert_match(/#{host.name}/, @response.body)
     assert_response :success
 
     # Get the managed host instance from the DB
@@ -83,7 +83,6 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_auto_provision_success_via_upload
     reset_api_credentials
-    User.current = nil
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
     taxonomy = { :organizations => [organization_one], :locations => [location_one] }
@@ -102,11 +101,11 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_auto_provision_success
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc", "discovery_version" => "2.9.9"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     taxonomy = { :organizations => [host.organization], :locations => [host.location] }
     rule = FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
     post :auto_provision, { :id => host.id }
-    assert_match /Host #{host.name} was provisioned with rule #{rule.name}/, @response.body
+    assert_match(/Host #{host.name} was provisioned with rule #{rule.name}/, @response.body)
     managed_host = Host.unscoped.find(host.id)
     assert managed_host.build
     assert_response :success
@@ -116,11 +115,11 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:kexec).returns(true)
     Host::Managed::any_instance.stubs(:provisioning_template).with(:kind => 'kexec').returns("")
     facts = @facts.merge({"somefact" => "abc", "discovery_kexec" => "kexec-tools 2.0.8 released 15 February 2015"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     taxonomy = { :organizations => [host.organization], :locations => [host.location] }
     rule = FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
     post :auto_provision, { :id => host.id }
-    assert_match /Host #{host.name} was provisioned with rule #{rule.name}/, @response.body
+    assert_match(/Host #{host.name} was provisioned with rule #{rule.name}/, @response.body)
     managed_host = Host.unscoped.find(host.id)
     assert managed_host.build
     assert_response :success
@@ -129,7 +128,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_auto_provision_with_wrong_org_or_loc_fail
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     taxonomy = { :organizations => [FactoryGirl.create(:organization)], :locations => [FactoryGirl.create(:location)] }
     FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
     post :auto_provision, { :id => host.id }
@@ -141,7 +140,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     disable_orchestration
     SETTINGS[:organizations_enabled] = false
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     taxonomy = { :locations => [host.location] }
     FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
     post :auto_provision, { :id => host.id }
@@ -154,7 +153,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_auto_provision_success_and_delete
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     taxonomy = { :organizations => [host.organization], :locations => [host.location] }
     FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
     post :auto_provision, { :id => host.id }
@@ -170,7 +169,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_auto_provision_no_rule_error
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     post :auto_provision, { :id => host.id }
     assert_response :not_found
     show_response = ActiveSupport::JSON.decode(@response.body)
@@ -180,11 +179,11 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_auto_provision_all_success
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
+    host = discover_host_from_facts(facts)
     taxonomy = { :organizations => [host.organization], :locations => [host.location] }
     FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
     post :auto_provision_all, {}
-    assert_match /1 discovered hosts were provisioned/, @response.body
+    assert_match(/1 discovered hosts were provisioned/, @response.body)
     managed_host = Host.unscoped.find(host.id)
     assert managed_host.build
     assert_response :success
@@ -193,9 +192,9 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   def test_auto_provision_all_no_rule_success
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
-    Host::Discovered.import_host(facts)
+    discover_host_from_facts(facts)
     post :auto_provision_all, {}
-    assert_match /0 discovered hosts were provisioned/, @response.body
+    assert_match(/0 discovered hosts were provisioned/, @response.body)
     assert_response :success
   end
 

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

@@ -2,7 +2,6 @@ require 'test_plugin_helper'
 
 class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
   setup do
-    User.current = User.find_by_login "admin"
     set_default_settings
   end
 
@@ -39,10 +38,11 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
         :name => "foo",
         :search => "bar",
         :hostgroup_id => hostgroup.id,
-        :organization_ids => [organization_one],
+        :organization_ids => [organization_one.id],
         :location_ids => [location_one.id],
         :hostname => "",
         :priority => 1}}
+      refute_match /error/, response.body
     end
     assert_response :success
   end
@@ -55,7 +55,6 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
 
   test "should update taxonomy for discovery rule" do
     rule = FactoryGirl.create(:discovery_rule)
-    organization = FactoryGirl.create(:organization)
     put :update, { :id => rule.to_param, :discovery_rule => { :organization_ids => [rule.organizations.first.id] } }
     assert_response :success
   end

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

@@ -26,7 +26,7 @@ module Api
       test 'list discovered host facts' do
         disable_orchestration
         facts = @facts.merge({ "somefact" => "abc" })
-        host = Host::Discovered.import_host(facts)
+        host = discover_host_from_facts(facts)
         get :index, { :host_id => host.id }
         assert_response :success
         show_response = ActiveSupport::JSON.decode(@response.body)

data/test/functional/discovered_hosts_controller_test.rb

@@ -30,14 +30,14 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
                        :value => "bios_vendor",
                        :category => 'Setting::Discovered')
     facts = @facts.merge({"bios_vendor" => "QEMU"})
-    Host::Discovered.import_host(facts)
+    discover_host_from_facts(facts)
     get :index, {}, set_session_user_default_reader
     assert_select "td", /QEMU/
     assert_response :success
   end
 
   def test_show_multiple_actions
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     [:multiple_destroy, :select_multiple_organization, :select_multiple_location].each do |path|
       xhr :post, path, {:host_ids => [host.id]}, set_session_user
       assert_response :success
@@ -46,7 +46,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_show_page_categories
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     get :show, {:id => host.id}, set_session_user_default_reader
     assert_select "#category-highlights" do
       assert_select "#fact-ipaddress" do
@@ -57,7 +57,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_edit_form_elements
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     get :edit, {:id => host.id}, set_session_user_default_manager
     assert_select "select" do |elements|
       elements.each do |element|
@@ -68,7 +68,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_edit_form_attributes
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     get :edit, {:id => host.id}, set_session_user_default_reader
     assert_not_nil host.cpu_count
   end
@@ -82,7 +82,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_edit_form_quick_submit
     disable_taxonomies do
-      host = Host::Discovered.import_host(@facts)
+      host = discover_host_from_facts(@facts)
       domain = FactoryGirl.create(:domain)
       hostgroup = FactoryGirl.create(:hostgroup, :with_subnet, :with_environment, :with_rootpass, :with_os, :domain => domain)
       get :edit, {
@@ -101,7 +101,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_edit_form_submit_parameters
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     hostgroup = setup_hostgroup(host)
     get :edit, {
       :id => host.id,
@@ -134,31 +134,29 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_update_inheritance
-    as_default_manager do
-      host = Host::Discovered.import_host(@facts)
-      hostgroup = setup_hostgroup(host)
-      put :update, {
-        commit: 'Update',
-        id: host.id,
-        host: {
-          name: 'mytest',
-          hostgroup_id: hostgroup.id
-        }
-      }, set_session_user(User.current)
-
-      # Get the managed host instance from the DB
-      actual = Host.find(host.id)
-
-      assert_equal hostgroup.id, actual.hostgroup_id
-      assert_equal hostgroup.architecture_id, actual.architecture_id
-      assert_equal hostgroup.operatingsystem_id, actual.operatingsystem_id
-      assert_equal hostgroup.medium_id, actual.medium_id
-      assert_equal hostgroup.ptable_id, actual.ptable_id
-      assert_equal hostgroup.domain_id, actual.domain_id
-      assert_equal hostgroup.environment_id, actual.environment_id
-      assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
-      assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
-    end
+    host = discover_host_from_facts(@facts)
+    hostgroup = setup_hostgroup(host)
+    put :update, {
+      commit: 'Update',
+      id: host.id,
+      host: {
+        name: 'mytest',
+        hostgroup_id: hostgroup.id
+      }
+    }, set_session_user(User.current)
+
+    # Get the managed host instance from the DB
+    actual = Host.find(host.id)
+
+    assert_equal hostgroup.id, actual.hostgroup_id
+    assert_equal hostgroup.architecture_id, actual.architecture_id
+    assert_equal hostgroup.operatingsystem_id, actual.operatingsystem_id
+    assert_equal hostgroup.medium_id, actual.medium_id
+    assert_equal hostgroup.ptable_id, actual.ptable_id
+    assert_equal hostgroup.domain_id, actual.domain_id
+    assert_equal hostgroup.environment_id, actual.environment_id
+    assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
+    assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
   end
 
   def test_add_entry_to_nav_menu
@@ -168,7 +166,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_success
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
     post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -176,24 +174,9 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     assert_equal "Rebooting host #{host.name}", flash[:notice]
   end
 
-  def test_reboot_success_legacy
-    @request.env["HTTP_REFERER"] = discovered_hosts_url
-    facts = @facts.merge({"somefact" => "abc", "discovery_version" => "2.9.9"})
-    host = Host::Discovered.import_host(facts)
-    Host::Discovered::any_instance.stubs(:proxied?).returns(false)
-    Host::Discovered::any_instance.stubs(:proxy_url).returns("http://1.2.3.4:8443")
-    ::ForemanDiscovery::NodeAPI::PowerLegacyDirectService.any_instance.expects(:reboot).returns(true)
-    ActiveSupport::Deprecation.silence do
-      post "reboot", { :id => host.id }, set_session_user
-    end
-    assert_redirected_to discovered_hosts_url
-    assert_nil flash[:error]
-    assert_equal "Rebooting host #{host.name}", flash[:notice]
-  end
-
   def test_reboot_failure
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
     post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -202,7 +185,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_error
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -210,68 +193,60 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_auto_provision_success
-    as_default_manager do
-      disable_orchestration
-      facts = @facts.merge({"somefact" => "abc"})
-      host = Host::Discovered.import_host(facts)
-      hostgroup = setup_hostgroup(host)
-      FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroup, :organizations => [host.organization], :locations => [host.location])
-      post :auto_provision, { :id => host.id }, set_session_user(User.current)
-      assert_response :redirect
-      assert_nil flash[:error]
-      assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:notice])
-      managed_host = Host.find(host.id)
-      assert managed_host.build
-    end
+    disable_orchestration
+    facts = @facts.merge({"somefact" => "abc"})
+    host = discover_host_from_facts(facts)
+    hostgroup = setup_hostgroup(host)
+    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroup, :organizations => [host.organization], :locations => [host.location])
+    post :auto_provision, { :id => host.id }, set_session_user(User.current)
+    assert_response :redirect
+    assert_nil flash[:error]
+    assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:notice])
+    managed_host = Host.find(host.id)
+    assert managed_host.build
   end
 
   def test_auto_provision_no_rule_success
-    as_default_manager do
-      disable_orchestration
-      facts = @facts.merge({"somefact" => "abc"})
-      host = Host::Discovered.import_host(facts)
-      post :auto_provision, { :id => host.id }, set_session_user(User.current)
-    end
+    disable_orchestration
+    facts = @facts.merge({"somefact" => "abc"})
+    host = discover_host_from_facts(facts)
+    post :auto_provision, { :id => host.id }, set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
     assert_equal "No rule found for host macaabbccddeeff", flash[:notice]
   end
 
   def test_auto_provision_all_success
-    as_default_manager do
-      disable_orchestration
-      facts = @facts.merge({"somefact" => "abc"})
-      host = Host::Discovered.import_host(facts)
-      hostgroup = setup_hostgroup(host)
-      FactoryGirl.create(
-        :discovery_rule,
-        :priority => 1,
-        :search => "facts.somefact = abc",
-        :hostgroup => hostgroup,
-        :organizations => [host.organization], :locations => [host.location]
-      )
-      post :auto_provision_all, {}, set_session_user(User.current)
-    end
+    disable_orchestration
+    facts = @facts.merge({"somefact" => "abc"})
+    host = discover_host_from_facts(facts)
+    hostgroup = setup_hostgroup(host)
+    FactoryGirl.create(
+      :discovery_rule,
+      :priority => 1,
+      :search => "facts.somefact = abc",
+      :hostgroup => hostgroup,
+      :organizations => [host.organization], :locations => [host.location]
+    )
+    post :auto_provision_all, {}, set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
     assert_equal "Discovered hosts are provisioning now", flash[:notice]
   end
 
   def test_auto_provision_all_no_rule_success
-    as_default_manager do
-      disable_orchestration
-      facts = @facts.merge({"somefact" => "abc"})
-      host = Host::Discovered.import_host(facts)
-      hostgroup = setup_hostgroup(host)
-      FactoryGirl.create(
-        :discovery_rule,
-        :priority => 1,
-        :search => "facts.somefact = abc",
-        :hostgroup => hostgroup,
-        :organizations => [host.organization], :locations => [host.location]
-      )
-      post :auto_provision_all, {}, set_session_user(User.current)
-    end
+    disable_orchestration
+    facts = @facts.merge({"somefact" => "abc"})
+    host = discover_host_from_facts(facts)
+    hostgroup = setup_hostgroup(host)
+    FactoryGirl.create(
+      :discovery_rule,
+      :priority => 1,
+      :search => "facts.somefact = abc",
+      :hostgroup => hostgroup,
+      :organizations => [host.organization], :locations => [host.location]
+    )
+    post :auto_provision_all, {}, set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
     assert_equal "Discovered hosts are provisioning now", flash[:notice]
@@ -279,7 +254,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_success
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
     post "reboot", { :id => host.id }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -290,7 +265,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_failure
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
     post "reboot_all", { }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -300,7 +275,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_error
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    Host::Discovered.import_host(@facts)
+    discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post "reboot_all", { }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -309,44 +284,38 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_no_dns_rebuild_if_dns_pending
-    as_default_manager do
-      host = Host::Discovered.import_host(@facts)
-      hostgroup = prepare_hostgroup_for_dns_rebuild(host)
-      Nic::Managed.any_instance.expects(:rebuild_dns).never
-      Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
-      put :update, {:commit => "Update", :id => host.id,
-                    :host => {
-        :name => 'mytest',
-        :hostgroup_id => hostgroup.id,
-      }
-      }, set_session_user(User.current)
-    end
+    host = discover_host_from_facts(@facts)
+    hostgroup = prepare_hostgroup_for_dns_rebuild(host)
+    Nic::Managed.any_instance.expects(:rebuild_dns).never
+    Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+    put :update, {:commit => "Update", :id => host.id,
+                  :host => {
+      :name => 'mytest',
+      :hostgroup_id => hostgroup.id,
+    }
+    }, set_session_user(User.current)
   end
 
   def test_dns_rebuild
-    as_default_manager do
-      host = prepare_host_for_dns_rebuild
-      hostgroup = prepare_hostgroup_for_dns_rebuild(host)
-      Nic::Managed.any_instance.expects(:rebuild_dns)
-      Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
-      put :update, {:commit => "Update", :id => host.id,
-                    :host => {
-        :name => 'mytest',
-        :hostgroup_id => hostgroup.id,
-      }
-      }, set_session_user(User.current)
-    end
+    host = prepare_host_for_dns_rebuild
+    hostgroup = prepare_hostgroup_for_dns_rebuild(host)
+    Nic::Managed.any_instance.expects(:rebuild_dns)
+    Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+    put :update, {:commit => "Update", :id => host.id,
+                  :host => {
+      :name => 'mytest',
+      :hostgroup_id => hostgroup.id,
+    }
+    }, set_session_user(User.current)
   end
 
   def test_dns_rebuild_with_auto_provision
-    as_default_manager do
-      host = prepare_host_for_dns_rebuild
-      hostgroup = prepare_hostgroup_for_dns_rebuild(host)
-      Nic::Managed.any_instance.expects(:rebuild_dns)
-      Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
-      FactoryGirl.create(:discovery_rule, :priority => 1, :search => "name = mytest.myorchdomain.net", :hostgroup_id => hostgroup.id, :organizations => [host.organization], :locations => [host.location])
-      post :auto_provision, { :id => host.id }, set_session_user(User.current)
-    end
+    host = prepare_host_for_dns_rebuild
+    hostgroup = prepare_hostgroup_for_dns_rebuild(host)
+    Nic::Managed.any_instance.expects(:rebuild_dns)
+    Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "name = mytest.myorchdomain.net", :hostgroup_id => hostgroup.id, :organizations => [host.organization], :locations => [host.location])
+    post :auto_provision, { :id => host.id }, set_session_user(User.current)
   end
 
   private
@@ -356,7 +325,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def prepare_host_for_dns_rebuild
-    host = Host::Discovered.import_host(@facts)
+    host = discover_host_from_facts(@facts)
     host.name = 'mytest.myorchdomain.net'
     host.save
     host