foreman_discovery 16.0.0 → 16.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c64a4f3c756e207293b6e5be67190294b9c4f2ab5054e08edd8d085718556f
-  data.tar.gz: b22ef9bf418ac18e94170429e7368cb1c6f94b9b0d2290b60341a9415e908b01
+  metadata.gz: daf02841d730bd8c0bce174762bd59b42f323d1a971b40dc72a6bd5a32d350fd
+  data.tar.gz: 4c89487acc8feab8fdba5d76be4d8f54dc78970a0cff7b2b85945d6824890c9c
 SHA512:
-  metadata.gz: d9f9013fa2d04e883da3c0c8c42b5a6e3552093323698359b8e9b70179f0284ccf35d633eac5720cc03fa79678af915b5eda3c7508be775b0836128ef6d738d8
-  data.tar.gz: 688c8d68c1a87aff1fda0a00eef057daf0c35a06ce007746e568763e868c82ee718d15a51d1124cb9dc1a47498ec94bc7f33e62d986ba7ed23e3eb6babfd140f
+  metadata.gz: 662c55ac2db702681b11bddcffa199048c6c62e2cc8d2b81a374426a45f8a6659fadf1a56642bc3667e534c534983acf970c5e7e1e7ec9b804d7b97a3ce58692
+  data.tar.gz: 2b185dcda6bb7eaa610c58eed077f753e0e5f4fb537276adb4cd48b8d339a154931d6cbdec64ec1416e91137f97fb9479c5a05b0b89d39f1d2469b3a5bc6c5ac

data/app/models/host/discovered.rb

@@ -137,12 +137,12 @@ class Host::Discovered < ::Host::Base
     subnet.present? && subnet.discovery.present?
   end
 
-  def proxy_url
-    proxied? ? subnet.discovery.url + "/discovery/#{self.ip}" : "https://#{self.ip}:8443"
+  def proxy_url(node_ip)
+    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{node_ip}:8443"
   end
 
   def refresh_facts
-    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url).facter
+    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
     self.class.import_host facts
     import_facts facts
   rescue => e
@@ -150,20 +150,42 @@ class Host::Discovered < ::Host::Base
     raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url, :error => e)
   end
 
-  def reboot
-    resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => proxy_url)
-    resource.reboot
-  rescue => e
-    ::Foreman::Logging.exception("Unable to reboot #{name}", e)
-    raise ::Foreman::WrappedException.new(e, N_("Unable to reboot %{name} via %{url}: %{msg}"), :name => name, :url => proxy_url, :msg => e.to_s)
+  def reboot(node_ip = nil)
+    # perform the action against the original lease as well as the new reservation
+    [node_ip || facts["discovery_bootip"] || facts["ipaddress"], self.ip].compact.each do |next_ip|
+      begin
+        node_url = proxy_url(next_ip)
+        logger.debug "Performing reboot call against #{node_url}"
+        resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
+        return true if resource.reboot
+      rescue => e
+        msg = N_("Unable to perform reboot on %{name} (%{url}): %{msg}")
+        ::Foreman::Logging.exception(msg % { :name => name, :url => node_url, :msg => e.to_s }, e)
+        if next_ip == self.ip
+          raise ::Foreman::WrappedException.new(e, msg, :name => name, :url => node_url, :msg => e.to_s)
+        end
+      end
+    end
+    false
   end
 
-  def kexec json
-    resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => proxy_url)
-    resource.kexec json
-  rescue => e
-    ::Foreman::Logging.exception("Unable to perform kexec on #{name}", e)
-    raise ::Foreman::WrappedException.new(e, N_("Unable to perform kexec on %{name} via %{url}: %{msg}"), :name => name, :url => proxy_url, :msg => e.to_s)
+  def kexec(json, node_ip = nil)
+    # perform the action against the original lease as well as the new reservation
+    [node_ip || facts["discovery_bootip"] || facts["ipaddress"], self.ip].compact.each do |next_ip|
+      begin
+        node_url = proxy_url(next_ip)
+        logger.debug "Performing kexec call against #{node_url}"
+        resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
+        return true if resource.kexec(json)
+      rescue => e
+        msg = N_("Unable to perform kexec on %{name} (%{url}): %{msg}")
+        ::Foreman::Logging.exception(msg % { :name => name, :url => node_url, :msg => e.to_s }, e)
+        if next_ip == self.ip
+          raise ::Foreman::WrappedException.new(e, msg, :name => name, :url => node_url, :msg => e.to_s)
+        end
+      end
+    end
+    false
   end
 
   def self.model_name

data/app/models/host/managed_extensions.rb

@@ -27,7 +27,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    old.becomes(Host::Discovered).reboot
+    old.becomes(Host::Discovered).reboot(facts["discovery_bootip"] || facts["ipaddress"])
     # It is too late to report error in the post_queue, we catch them and
     # continue. If flash is implemented for new hosts (http://projects.theforeman.org/issues/10559)
     # we can report the error to the user perhaps.

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "16.0.0"
+  VERSION = "16.0.1"
 end

data/test/functional/discovered_hosts_controller_test.rb

@@ -183,7 +183,7 @@ 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).returns(false)
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).twice.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]
@@ -195,7 +195,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-4973/, flash[:error])
+    assert_match(/ERF50-9494/, flash[:error])
   end
 
   def test_auto_provision_success
@@ -271,7 +271,7 @@ 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).returns(false)
+    ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).twice.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]
@@ -284,7 +284,7 @@ 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-4973/, flash[:error])
+    assert_match(/ERF50-9494/, flash[:error])
     assert_nil flash[:success]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 16.0.0
+  version: 16.0.1
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -69,7 +69,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com