foreman_discovery 4.0.0 → 4.1.0

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

@@ -13,17 +13,23 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     User.current = User.find_by_login "admin"
     @request.env['HTTP_REFERER'] = '/discovery_rules'
     @facts = {
-      "interfaces"       => "lo,eth0",
-      "ipaddress"        => "192.168.100.42",
-      "ipaddress_eth0"   => "192.168.100.42",
-      "macaddress_eth0"  => "AA:BB:CC:DD:EE:FF",
-      "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
-      "memorysize_mb"    => "42000.42",
+      "interfaces"        => "lo,eth0",
+      "ipaddress"         => "192.168.100.42",
+      "ipaddress_eth0"    => "192.168.100.42",
+      "macaddress_eth0"   => "AA:BB:CC:DD:EE:FF",
+      "discovery_bootif"  => "AA:BB:CC:DD:EE:FF",
+      "memorysize_mb"     => "42000.42",
+      "discovery_version" => "3.0.0",
     }
     FactoryGirl.create(:setting,
                        :name => 'discovery_auto',
                        :value => true,
                        :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_reboot',
+                       :value => true,
+                       :category => 'Setting::Discovered')
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:reboot).returns(true)
   end
 
   def test_get_index
@@ -75,13 +81,26 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_auto_provision_success
     disable_orchestration
-    facts = @facts.merge({"somefact" => "abc"})
+    facts = @facts.merge({"somefact" => "abc", "discovery_version" => "2.9.9"})
     host = Host::Discovered.import_host_and_facts(facts).first
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+    rule = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
                        :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass),
                        :organizations => [host.organization], :locations => [host.location])
     post :auto_provision, { :id => host.id }
-    assert_match host.name, @response.body
+    assert_match /Host #{host.name} was provisioned with rule #{rule.name}/, @response.body
+    assert_response :success
+  end
+
+  def test_auto_provision_kexec_success
+    ::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_and_facts(facts).first
+    rule = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc",
+                       :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass),
+                       :organizations => [host.organization], :locations => [host.location])
+    post :auto_provision, { :id => host.id }
+    assert_match /Host #{host.name} was provisioned with rule #{rule.name}/, @response.body
     assert_response :success
   end
 
@@ -144,7 +163,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
                        :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass), :organizations => [host.organization],
                        :locations => [host.location])
     post :auto_provision_all, {}
-    assert_equal '{}', @response.body
+    assert_match /1 discovered hosts were provisioned/, @response.body
     assert_response :success
   end
 
@@ -153,7 +172,7 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     facts = @facts.merge({"somefact" => "abc"})
     Host::Discovered.import_host_and_facts(facts).first
     post :auto_provision_all, {}
-    assert_equal '{}', @response.body
+    assert_match /0 discovered hosts were provisioned/, @response.body
     assert_response :success
   end
 

data/test/functional/discovered_hosts_controller_test.rb

@@ -12,11 +12,13 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
       "macaddress_eth0"        => "AA:BB:CC:DD:EE:FF",
       "discovery_bootif"       => "AA:BB:CC:DD:EE:FF",
       "physicalprocessorcount" => "42",
+      "discovery_version"      => "3.0.0",
     }
     FactoryGirl.create(:setting,
                        :name => 'discovery_reboot',
                        :value => true,
                        :category => 'Setting::Discovered')
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.stubs(:reboot).returns(true)
   end
 
   def test_index
@@ -63,21 +65,31 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_success
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = FactoryGirl.create(:host,
-                              :ip   => '1.2.3.4',
-                              :type => "Host::Discovered")
-    ::ProxyAPI::BMC.any_instance.stubs(:power).returns(true)
+    host = Host::Discovered.import_host_and_facts(@facts).first
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
     post "reboot", { :id => host.id }, set_session_user
     assert_redirected_to discovered_hosts_url
+    assert_nil flash[:error]
+    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_and_facts(facts).first
+    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)
+    post "reboot", { :id => host.id }, set_session_user
+    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 = FactoryGirl.create(:host,
-                              :ip   => '1.2.3.4',
-                              :type => "Host::Discovered")
-    ::ProxyAPI::BMC.any_instance.stubs(:power).returns(false)
+    host = Host::Discovered.import_host_and_facts(@facts).first
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
     post "reboot", { :id => host.id }, set_session_user
     assert_redirected_to discovered_hosts_url
     assert_equal "Failed to reboot host #{host.name}", flash[:error]
@@ -85,13 +97,11 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_error
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = FactoryGirl.create(:host,
-                              :ip   => '1.2.3.4',
-                              :type => "Host::Discovered")
-    ::ProxyAPI::BMC.any_instance.expects(:power).raises("request failed")
+    host = Host::Discovered.import_host_and_facts(@facts).first
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post "reboot", { :id => host.id }, set_session_user
     assert_redirected_to discovered_hosts_url
-    assert_match(/ERF50-6734/, flash[:error])
+    assert_match(/ERF50-4973/, flash[:error])
   end
 
   def test_auto_provision_success
@@ -135,10 +145,8 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_success
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = FactoryGirl.create(:host,
-                              :ip   => '1.2.3.4',
-                              :type => "Host::Discovered")
-    ::ProxyAPI::BMC.any_instance.stubs(:power).returns(true)
+    host = Host::Discovered.import_host_and_facts(@facts).first
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
     post "reboot", { :id => host.id }, set_session_user
     assert_redirected_to discovered_hosts_url
     assert_equal "Rebooting host #{host.name}", flash[:notice]
@@ -146,10 +154,8 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_failure
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = FactoryGirl.create(:host,
-                              :ip   => '1.2.3.4',
-                              :type => "Host::Discovered")
-    ::ProxyAPI::BMC.any_instance.stubs(:power).returns(false)
+    host = Host::Discovered.import_host_and_facts(@facts).first
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
     post "reboot_all", { }, set_session_user
     assert_redirected_to discovered_hosts_url
     assert_equal "Errors during reboot: #{host.name}: failed to reboot", flash[:error]
@@ -157,13 +163,11 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_error
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    FactoryGirl.create(:host,
-                       :ip   => '1.2.3.4',
-                       :type => "Host::Discovered")
-    ::ProxyAPI::BMC.any_instance.expects(:power).raises("request must fail")
+    host = Host::Discovered.import_host_and_facts(@facts).first
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post "reboot_all", { }, set_session_user
     assert_redirected_to discovered_hosts_url
-    assert_match(/ERF50-6734/, flash[:error])
+    assert_match(/ERF50-4973/, flash[:error])
   end
 
   private

data/test/unit/discovered_extensions_test.rb

@@ -135,7 +135,7 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
                               :hostname => '<%= "" %>',
                               :organizations => [host.organization],
                               :locations => [host.location])
-      perform_auto_provision host, r1
+      refute perform_auto_provision host, r1
       assert_equal "macaabbccddeeff", host.name
     end
 
@@ -146,7 +146,7 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
                               :hostname => 'x<%= 1+1 %>',
                               :organizations => [host.organization],
                               :locations => [host.location])
-      perform_auto_provision host, r1
+      refute perform_auto_provision host, r1
       assert_equal "x2", host.name
     end
 
@@ -157,7 +157,7 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
                               :hostname => 'x<%= rand(4) %>',
                               :organizations => [host.organization],
                               :locations => [host.location])
-      perform_auto_provision host, r1
+      refute perform_auto_provision host, r1
       assert_match(/x[0123]/, host.name)
     end
 
@@ -168,7 +168,7 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
                               :hostname => 'x<%= @host.name %>',
                               :organizations => [host.organization],
                               :locations => [host.location])
-      perform_auto_provision host, r1
+      refute perform_auto_provision host, r1
       assert_equal "xmacaabbccddeeff", host.name
     end
 
@@ -179,19 +179,19 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
                               :hostname => 'x<%= @host.ip.gsub(".","-") %>',
                               :organizations => [host.organization],
                               :locations => [host.location])
-      perform_auto_provision host, r1
+      refute perform_auto_provision host, r1
       assert_equal "x192-168-100-42", host.name
     end
 
     test "hostname attribute facts_hash is renderer properly using #{renderer_name}" do
-      skip "until http://projects.theforeman.org/issues/2948 is fixed"
-      host = Host::Discovered.import_host_and_facts(@facts).first
+      facts = @facts.merge({"somefact" => "abc"})
+      host = Host::Discovered.import_host_and_facts(facts).first
       r1 = FactoryGirl.create(:discovery_rule,
                               :search => "facts.somefact = abc",
                               :hostname => 'x<%= @host.facts["somefact"] %>',
                               :organizations => [host.organization],
                               :locations => [host.location])
-      perform_auto_provision host, r1
+      refute perform_auto_provision host, r1
       assert_equal "xabc", host.name
     end
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Greg Sutcliffe
+- Lukas Zapletal
+- Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -39,6 +41,9 @@ files:
 - app/controllers/api/v2/discovered_hosts_controller.rb
 - app/lib/puppet_fact_parser_extensions.rb
 - app/lib/facter_utils.rb
+- app/services/foreman_discovery/node_api/node_resource.rb
+- app/services/foreman_discovery/node_api/power.rb
+- app/services/foreman_discovery/proxy_operations.rb
 - app/services/foreman_discovery/host_converter.rb
 - app/helpers/discovery_rules_helper.rb
 - app/helpers/discovered_hosts_helper.rb
@@ -71,11 +76,10 @@ files:
 - app/views/api/v2/discovery_rules/show.json.rabl
 - app/views/api/v2/discovered_hosts/index.json.rabl
 - app/views/api/v2/discovered_hosts/update.json.rabl
-- app/views/api/v2/discovered_hosts/auto_provision_all.json.rabl
 - app/views/api/v2/discovered_hosts/base.json.rabl
 - app/views/api/v2/discovered_hosts/main.json.rabl
-- app/views/api/v2/discovered_hosts/auto_provision.json.rabl
 - app/views/api/v2/discovered_hosts/show.json.rabl
+- app/views/foreman_discovery/redhat_kexec.erb
 - extra/build_iso.sh
 - extra/wait_for_network.sh
 - extra/disk_facts.rb
@@ -97,54 +101,26 @@ files:
 - db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb
 - db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb
 - db/migrate/20150714144500_review_discovery_permissions.rb
+- db/seeds.d/50_discovery_templates.rb
 - db/seeds.d/60_discovery_proxy_feature.rb
 - lib/discovery.rake
 - lib/foreman_discovery.rb
-- lib/foreman_discovery/proxy_operations.rb
 - lib/foreman_discovery/version.rb
 - lib/foreman_discovery/engine.rb
-- locale/foreman_discovery.pot
-- locale/Makefile
 - locale/ru/foreman_discovery.po
-- locale/ru/foreman_discovery.pox
-- locale/ru/LC_MESSAGES/foreman_discovery.mo
 - locale/de/foreman_discovery.po
-- locale/de/foreman_discovery.pox
-- locale/de/LC_MESSAGES/foreman_discovery.mo
 - locale/pt_BR/foreman_discovery.po
-- locale/pt_BR/foreman_discovery.pox
-- locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
 - locale/en_GB/foreman_discovery.po
-- locale/en_GB/foreman_discovery.pox
-- locale/en_GB/LC_MESSAGES/foreman_discovery.mo
 - locale/zh_TW/foreman_discovery.po
-- locale/zh_TW/foreman_discovery.pox
-- locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
 - locale/es/foreman_discovery.po
-- locale/es/foreman_discovery.pox
-- locale/es/LC_MESSAGES/foreman_discovery.mo
 - locale/fr/foreman_discovery.po
-- locale/fr/foreman_discovery.pox
-- locale/fr/LC_MESSAGES/foreman_discovery.mo
 - locale/it/foreman_discovery.po
-- locale/it/foreman_discovery.pox
-- locale/it/LC_MESSAGES/foreman_discovery.mo
-- locale/messages.mo
 - locale/ja/foreman_discovery.po
-- locale/ja/foreman_discovery.pox
-- locale/ja/LC_MESSAGES/foreman_discovery.mo
 - locale/ko/foreman_discovery.po
-- locale/ko/foreman_discovery.pox
-- locale/ko/LC_MESSAGES/foreman_discovery.mo
 - locale/zh_CN/foreman_discovery.po
-- locale/zh_CN/foreman_discovery.pox
-- locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
-- locale/zanata.xml
 - locale/gl/foreman_discovery.po
-- locale/gl/foreman_discovery.pox
-- locale/gl/LC_MESSAGES/foreman_discovery.mo
 - locale/sv_SE/foreman_discovery.po
-- locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
+- locale/foreman_discovery.pot
 - LICENSE
 - README.md
 - test/functional/discovery_rules_controller_test.rb

data/app/views/api/v2/discovered_hosts/auto_provision.json.rabl

@@ -1,3 +0,0 @@
-object @discovered_host
-
-extends "api/v2/hosts/main"

data/app/views/api/v2/discovered_hosts/auto_provision_all.json.rabl

@@ -1,3 +0,0 @@
-object @discovered_host
-
-extends "api/v2/hosts/main"

data/locale/Makefile

@@ -1,62 +0,0 @@
-#
-# Makefile for PO merging and MO generation. More info in the README.
-#
-# make all-mo (default) - generate MO files
-# make check - check translations using translate-tool
-# make tx-update - download and merge translations from Transifex
-# make clean - clean everything
-#
-DOMAIN = foreman_discovery
-VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
-POTFILE = $(DOMAIN).pot
-MOFILE = $(DOMAIN).mo
-POFILES = $(shell find . -name '*.po')
-MOFILES = $(patsubst %.po,%.mo,$(POFILES))
-POXFILES = $(patsubst %.po,%.pox,$(POFILES))
-
-%.mo: %.po
-	mkdir -p $(shell dirname $@)/LC_MESSAGES
-	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
-
-# Generate MO files from PO files
-all-mo: $(MOFILES)
-
-# Check for malformed strings
-%.pox: %.po
-	msgfmt -c $<
-	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
-		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
-	cat $@
-	! grep -q msgid $@
-
-check: $(POXFILES)
-	msgfmt -c ${POTFILE}
-
-# Merge PO files
-update-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
-	done
-
-# Unify duplicate translations
-uniq-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msguniq $$f -o $$f ; \
-	done
-
-tx-pull:
-	tx pull -f
-	for f in $(POFILES) ; do \
-		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
-	done
-	-git commit -a -m "i18n - pulling from tx"
-
-reset-po:
-	# merging po files is unnecessary when using transifex.com
-	git checkout -- ../locale/*/*po
-
-tx-update: tx-pull reset-po $(MOFILES)
-	# amend mo files
-	git add ../locale/*/LC_MESSAGES
-	git commit -a --amend -m "i18n - pulling from tx"
-	-echo Changes commited!

data/locale/de/foreman_discovery.pox

@@ -1,40 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: foreman_discovery 3.0.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-28 17:53+0100\n"
-"PO-Revision-Date: 2015-06-29 19:06+0000\n"
-"Last-Translator: Christina Gurski <Gurski_christina@yahoo.de>\n"
-"Language-Team: German "
-"(http://www.transifex.com/foreman/foreman/language/de/)\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Translate Toolkit 1.9.0\n"
-
-# (pofilter) puncspacing: Different spacing around punctuation
-msgid "Could not get facts from proxy %{url}: %{error}"
-msgstr "Konnte keine Facts von Proxy %{url} empfangen: %{error}"
-
-# (pofilter) endwhitespace: Different whitespace at the end
-msgid ""
-"Specify target hostname template pattern in the same syntax as in "
-"Provisioning Templates (ERB)."
-msgstr "Spezifizieren Sie die Ziel-Hostnamen-Bereitstellungsvorlage in derselben Syntax wie in Bereitstellungstabellen (ERB). "
-
-# (pofilter) puncspacing: Different spacing around punctuation
-msgid ""
-"When creating hostname patterns, make sure the resulting host names are "
-"unique. Hostnames must not start with numbers. A good approach is to use "
-"unique information provided by facter (MAC address, BIOS or serial ID)."
-msgstr "Versichern Sie sich beim Erstellen von Hostnamen-Patterns, dass die resultierenden Hostnamen eindeutig sind. Hostnamen dürfen nicht mit Zahlen beginnen. Ein guter Ansatz besteht darin, eindeutige vom Facter gelieferte Informationen (MAC-Adresse, BIOS oder serielle Kennung) zu verwenden."
-
-# (pofilter) endpunc: Different punctuation at the end
-msgid "can't contain white spaces."
-msgstr "kann keine Leerzeichen enthalten"
-
-# (pofilter) endpunc: Different punctuation at the end
-msgid "must start with a letter or ERB."
-msgstr "muss mit einem Buchstaben oder ERB beginnen"