foreman_discovery 17.0.3 → 17.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8d075f8a3a3048021cb510037e84ce925e805d3cb915a2d739bd188a99d08f
-  data.tar.gz: 2851a8920c2e7da750c92104e26ce286cd723aab684e8f3e08d452ea458f5d3e
+  metadata.gz: 35fdf9e36a5a8093c7532a47c9e9a8fd2bae879a30eab70fcc286c9b6c1cd256
+  data.tar.gz: 145fc876af62068eebcdc997f6e8ffaa1bc9861ff6aab63ef992396da32277f3
 SHA512:
-  metadata.gz: 1ddc4a716ab29ec7cf78c052e8238184962c97d528592f171e074664e2542e603ffc9d3bce44bf255c787c82cc3df82faf6a7d61a98d9046fca544a957589e4a
-  data.tar.gz: 3d72b88c68fb69a56e1f691c1df6a93bc42b5c2157f79ee0ad9293ea85b4aa15510ebd130e1d8464fdb6593d6aed01e0adee3c688f6d698a8194cca8f281158a
+  metadata.gz: 87665e788d3aa6db8d3b9b13d5165a23ca4509dfb1bd98cd76bdc46f6779d6aa279aa95a044ac0ae515ac652d88d28c0a792f7c8eeb7b664ec57dabc3aab2023
+  data.tar.gz: 5cad4226da69dd1ed80fcfa89ff20c4a590373c00753f1a390ceb0a324401b8c96f52aabece9f86ed70c86be542e6afd73e5dcbdd70367f1f2ddcfdd5cd7f924

data/app/models/host/discovered.rb

@@ -133,26 +133,39 @@ class Host::Discovered < ::Host::Base
     subnet.present? && subnet.discovery.present?
   end
 
+  def ip4or6
+    if Setting[:discovery_prefer_ipv6]
+      IPAddr.new(self.ip6 || self.ip)
+    else
+      IPAddr.new(self.ip || self.ip6)
+    end
+  end
+
   def proxy_url(node_ip)
-    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{node_ip}:8443"
+    wrapped_ip = node_ip.ipv6? ? "[#{node_ip}]" : node_ip
+    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{wrapped_ip}:8443"
   end
 
   def refresh_facts
-    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
+    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(ip4or6)).facter
     self.class.import_host facts
     ::ForemanDiscovery::HostFactImporter.new(self).import_facts facts
   rescue => e
     ::Foreman::Logging.exception("Unable to get facts from proxy", e)
-    raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url(self.ip), :error => e)
+    raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url(ip4or6), :error => e)
   end
 
-  def reboot(old_ip = nil, new_ip = nil)
+  def reboot(old_ip = nil, new_ip = nil, old_ip6 = nil, new_ip6 = nil)
     # perform the action against the original lease as well as the new reservation
-    ips = [old_ip, new_ip, self.ip].compact.uniq
+    if Setting[:discovery_prefer_ipv6]
+      ips = [old_ip6, new_ip6, self.ip6, old_ip, new_ip, self.ip].compact.uniq
+    else
+      ips = [old_ip, new_ip, self.ip, old_ip6, new_ip6, self.ip6].compact.uniq
+    end
     logger.debug "Performing reboot calls against #{ips.to_sentence}, facts left #{facts.count}"
     ips.each do |next_ip|
       begin
-        node_url = proxy_url(next_ip)
+        node_url = proxy_url(IPAddr.new(next_ip))
         logger.debug "Performing reboot call against #{node_url}"
         resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
         return true if resource.reboot
@@ -165,13 +178,17 @@ class Host::Discovered < ::Host::Base
     raise ::Foreman::Exception.new(msg, action: "reboot", ips: ips.to_sentence)
   end
 
-  def kexec(json, old_ip = nil, new_ip = nil)
+  def kexec(json, old_ip = nil, new_ip = nil, old_ip6 = nil, new_ip6 = nil)
     # perform the action against the original lease as well as the new reservation
-    ips = [old_ip, new_ip, self.ip].compact.uniq
+    if Setting[:discovery_prefer_ipv6]
+      ips = [old_ip6, new_ip6, self.ip6, old_ip, new_ip, self.ip].compact.uniq
+    else
+      ips = [old_ip, new_ip, self.ip, old_ip6, new_ip6, self.ip6].compact.uniq
+    end
     logger.debug "Performing kexec calls against #{ips.to_sentence}, #{facts.count} facts left"
     ips.each do |next_ip|
       begin
-        node_url = proxy_url(next_ip)
+        node_url = proxy_url(IPAddr.new(next_ip))
         logger.debug "Performing kexec call against #{node_url}"
         resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
         return true if resource.kexec(json)

data/app/models/host/managed_extensions.rb

@@ -27,7 +27,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    old.becomes(Host::Discovered).reboot(old.ip, ip)
+    old.becomes(Host::Discovered).reboot(old.ip, ip, old.ip6, ip6)
     # 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.
@@ -55,7 +55,7 @@ module Host::ManagedExtensions
   end
 
   def setKexec
-    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json, old.ip, ip)
+    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json, old.ip, ip, old.ip6, ip6)
     true
   rescue ::Foreman::Exception => e
     Foreman::Logging.exception("Unable to kexec", e)

data/app/models/setting/discovered.rb

@@ -37,6 +37,7 @@ class Setting::Discovered < ::Setting
       self.set('discovery_always_rebuild_dns', N_("Force DNS entries creation when provisioning discovered host"), true, N_("Force DNS")),
       self.set('discovery_error_on_existing', N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"), false, N_("Error on existing NIC")),
       self.set('discovery_naming', N_("Discovery hostname naming pattern"), 'Fact', N_("Type of name generator"), nil, {:collection => Proc.new {::Host::Discovered::NAMING_PATTERNS} }),
+      self.set('discovery_prefer_ipv6', N_("Prefer IPv6 to IPv4 when calling discovered nodes"), false, N_("Prefer IPv6")),
     ]
   end
 

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "17.0.3"
+  VERSION = "17.0.4"
 end

data/test/unit/managed_extensions_test.rb

@@ -19,6 +19,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
       @host = StubHost.new
       @host.type = "Host::Discovered"
       @host.stubs(:ip).returns("192.168.1.1")
+      @host.stubs(:ip6).returns(nil)
       @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: 17.0.3
+  version: 17.0.4
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -73,7 +73,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -366,8 +366,8 @@ test_files:
 - test/unit/discovered_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/managed_extensions_test.rb
 - test/unit/setting_discovered_test.rb
+- test/unit/managed_extensions_test.rb
 - test/unit/host_discovered_test.rb
 - test/models/setting_test.rb
 - test/test_helper_discovery.rb