foreman_discovery 25.0.0 → 25.1.0

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -53,6 +53,7 @@ module Api
         param :name, String
         param :environment_id, String, :desc => N_("required if host is managed and value is not inherited from host group")
         param :ip, String, :desc => N_("not required if using a subnet with DHCP proxy")
+        param :ip6, String, :desc => N_("not required if using an IPv6 subnet with DHCP proxy")
         param :mac, String, :desc => N_("not required if it's a virtual machine")
         param :architecture_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
         param :domain_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
@@ -62,6 +63,7 @@ module Api
         param :medium_id, String, :desc => N_("required if not imaged based provisioning and host is managed and value is not inherited from host group")
         param :ptable_id, :number, :desc => N_("required if host is managed and custom partition has not been defined")
         param :subnet_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
+        param :subnet6_id, :number, :desc => N_("required if host is managed, does not have IPv4 IP / Subnet, or the value is not inherited from the host group")
         param :sp_subnet_id, :number
         param :model_id, :number
         param :hostgroup_id, :number

data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb

@@ -1,43 +1,49 @@
-module Foreman::Controller::Parameters::DiscoveredHost
-  extend ActiveSupport::Concern
-  include Foreman::Controller::Parameters::Host
-  if defined?(ForemanPuppet)
-    include ForemanPuppet::Extensions::ParametersHost
-  end
+module Foreman
+  module Controller
+    module Parameters
+      module DiscoveredHost
+        extend ActiveSupport::Concern
+        include Foreman::Controller::Parameters::Host
+        if defined?(ForemanPuppet)
+          include ForemanPuppet::Extensions::ParametersHost
+        end
 
-  class_methods do
-    def discovered_host_params_filter
-      Foreman::ParameterFilter.new(::Host::Discovered).tap do |filter|
-        filter.permit :discovery_rule_id
+        class_methods do
+          def discovered_host_params_filter
+            Foreman::ParameterFilter.new(::Host::Discovered).tap do |filter|
+              filter.permit :discovery_rule_id
 
-        add_host_base_params_filter(filter)
-        add_host_common_params_filter(filter)
-        add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
-      end
-    end
-  end
+              add_host_base_params_filter(filter)
+              add_host_common_params_filter(filter)
+              add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
+            end
+          end
+        end
 
-  def discovered_host_params
-    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
-  end
+        def discovered_host_params
+          filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
 
-  def discovered_host_params_host
-    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
-  end
+        def discovered_host_params_host
+          filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
 
-  def managed_host_params_host
-    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
-  end
+        def managed_host_params_host
+          filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
 
-  def managed_host_params
-    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
-    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
-    filtered_params
+        def managed_host_params
+          filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
+          process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+          filtered_params
+        end
+      end
+    end
   end
 end

data/app/controllers/concerns/foreman/controller/parameters/discovery_rule.rb

@@ -1,17 +1,23 @@
-module Foreman::Controller::Parameters::DiscoveryRule
-  extend ActiveSupport::Concern
-  include Foreman::Controller::Parameters::Taxonomix
+module Foreman
+  module Controller
+    module Parameters
+      module DiscoveryRule
+        extend ActiveSupport::Concern
+        include Foreman::Controller::Parameters::Taxonomix
 
-  class_methods do
-    def discovery_rule_params_filter
-      Foreman::ParameterFilter.new(::DiscoveryRule).tap do |filter|
-        filter.permit :name, :search, :hostname, :priority, :enabled, :hostgroup, :hostgroup_id, :max_count
-        add_taxonomix_params_filter(filter)
+        class_methods do
+          def discovery_rule_params_filter
+            Foreman::ParameterFilter.new(::DiscoveryRule).tap do |filter|
+              filter.permit :name, :search, :hostname, :priority, :enabled, :hostgroup, :hostgroup_id, :max_count
+              add_taxonomix_params_filter(filter)
+            end
+          end
+        end
+
+        def discovery_rule_params
+          self.class.discovery_rule_params_filter.filter_params(params, parameter_filter_context)
+        end
       end
     end
   end
-
-  def discovery_rule_params
-    self.class.discovery_rule_params_filter.filter_params(params, parameter_filter_context)
-  end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -335,19 +335,6 @@ class DiscoveredHostsController < ::ApplicationController
     Bullet.enable = true if defined? Bullet
   end
 
-  def get_interfaces
-    @host.interfaces.each do |interface|
-      @interfaces << {:identifier => interface["identifier"], :type => interface["type"], :mac => interface["mac"], :ip => interface["ip"]? interface["ip"] : "N/A", :primary => interface["primary"], :provision => interface["provision"]}
-    end
-  end
-
-  def add_custom_facts
-    unless @host.primary_interface.subnet.nil?
-      discovery_subnet = "#{@host.primary_interface.subnet.name} (#{@host.primary_interface.subnet.network})"
-      assign_fact_to_category("discovery_subnet", discovery_subnet)
-    end
-  end
-
   def process_warning(hash = {})
     warning hash[:warning_msg]
   end

data/app/controllers/discovered_hosts_controller.rb.orig

@@ -0,0 +1,354 @@
+class DiscoveredHostsController < ::ApplicationController
+  include Foreman::Controller::Parameters::DiscoveredHost
+  include Foreman::Controller::AutoCompleteSearch
+  include Foreman::Controller::TaxonomyMultiple
+  include Foreman::Controller::DiscoveredExtensions
+  include ActionView::Helpers::NumberHelper
+
+  before_action :find_by_name, :only => %w[edit update destroy refresh_facts convert reboot auto_provision]
+  before_action :find_by_name_incl_subnet, :only => [:show]
+  before_action :find_multiple, :only => [:multiple_destroy, :submit_multiple_destroy, :multiple_reboot, :submit_multiple_reboot, :multiple_auto_provision, :submit_multiple_auto_provision]
+  before_action :taxonomy_scope, :only => [:edit]
+  before_action :check_for_subnet, :only => [:reboot, :auto_provision, :submit_multiple_reboot, :submit_multiple_auto_provision]
+
+  around_action :skip_bullet, :only => [:edit]
+
+  helper :hosts
+  if defined?(ForemanPuppet)
+    helper ForemanPuppet::HostsHelper
+    helper ForemanPuppet::HostsAndHostgroupsHelper
+    helper ForemanPuppet::PuppetclassesHelper
+    helper ForemanPuppet::PuppetclassLookupKeysHelper
+  end
+
+  layout 'layouts/application'
+
+  def model_of_controller
+    Host::Discovered
+  end
+
+  def index
+    @hosts = resource_base_search_and_page.includes([
+      :location,
+      :organization,
+      :model,
+      :discovery_attribute_set
+    ], {:interfaces => :subnet})
+    fact_array = @hosts.collect do |host|
+      [host.id, Hash[host.fact_values.joins(:fact_name).where('fact_names.name' => Setting['discovery_fact_column']).pluck(:name, :value)]]
+    end
+    @host_facts = Hash[fact_array]
+  end
+
+  def show
+    # filter graph time range
+    @range = nil
+    # summary report text
+    @report_summary = nil
+    resolver = ForemanDiscovery::FactToCategoryResolver.new(@host)
+    @categories_names = ForemanDiscovery::FactToCategoryResolver::CATEGORIES_NAMES
+    @categories = resolver.categories
+    @interfaces = resolver.interfaces
+  end
+
+  def destroy
+    @host.destroy
+    redirect_to :action => 'index'
+  end
+
+  def edit
+    quick = params.delete(:quick_submit)
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false, discovered_host_params_host) unless @host.nil?
+    setup_host_class_variables
+    @override_taxonomy = true
+    # need to permit this one but don't know how
+    if quick
+      perform_update(@host, _('Successfully provisioned %s') % @host.name)
+    else
+      @host.build = true
+      render :template => 'discovered_hosts/edit'
+    end
+  end
+
+  def update
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, true, managed_host_params_host)
+    forward_url_options
+
+    @override_taxonomy = true
+    perform_update(@host)
+  end
+
+  def perform_update(host, success_message = nil)
+    Taxonomy.no_taxonomy_scope do
+      ::ForemanDiscovery::HostConverter.set_build_clean_facts(host)
+      ::ForemanDiscovery::HostConverter.unused_ip_for_host(host)
+      if host.save
+        host_path = Setting['host_details_ui'] ? host_details_page_path(host) : host_path(host)
+        success_options = { :success_redirect => host_path, :redirect_xhr => request.xhr? }
+        success_options[:success_msg] = success_message if success_message
+        process_success success_options
+      else
+        taxonomy_scope
+        load_vars_for_ajax
+        offer_to_overwrite_conflicts
+        process_error :object => host, :render => 'discovered_hosts/edit'
+      end
+    end
+  end
+
+  def refresh_facts
+    if @host.is_a?(::Host::Discovered) && @host.refresh_facts
+      process_success :success_msg => _("Facts refreshed for %s") % @host.name, :success_redirect => :back
+    else
+      process_error :error_msg => _("Failed to refresh facts for %s") % @host.name, :redirect => :back
+    end
+  rescue => e
+    exception = Foreman::WrappedException.new(e, N_("Failed to refresh facts for %{hostname} with error %{error_message}"), :hostname => @host.name, :error_message => e.message)
+    Foreman::Logging.exception exception.message, e
+    process_error :error_msg => exception.message, :redirect => :back
+  end
+
+  def reboot
+    unless @host.is_a?(::Host::Discovered)
+      process_error :error_msg => _("Host of type %s can not be rebooted") % @host.type, :redirect => :back
+    end
+
+    if @host.reboot
+      process_success :success_msg => _("Rebooting host %s") % @host.name, :success_redirect => :back
+    else
+      process_error :error_msg => _("Failed to reboot host %s") % @host.name, :redirect => :back
+    end
+  rescue => e
+    exception = Foreman::WrappedException.new(e, N_("Failed to reboot host %{hostname} with error %{error_message}"), :hostname => @host.name, :error_message => e.message)
+    Foreman::Logging.exception exception.message, e
+    process_error :error_msg => exception.message, :redirect => :back
+  end
+
+  def submit_multiple_reboot
+    error_message = perform_reboot_all(@hosts)
+
+    if error_message
+      process_error :error_msg => error_message, :redirect => :back
+    else
+      process_success :success_msg => _("Discovered hosts are rebooting now"), :success_redirect => :back
+    end
+  rescue => e
+    exception = Foreman::WrappedException.new(e, N_("Failed to reboot hosts with error %s"), e.message)
+    Foreman::Logging.exception exception.message, e
+    process_error :error_msg => exception.message, :redirect => :back
+  end
+
+  def multiple_destroy
+  end
+
+  def multiple_reboot
+  end
+
+  def multiple_auto_provision
+  end
+
+  def submit_multiple_destroy
+    # keep all the ones that were not deleted for notification.
+    missed_hosts = @hosts.select {|host| !host.destroy }
+    if missed_hosts
+      success _("Destroyed selected hosts")
+    else
+      error _("The following hosts were not deleted: %s") % missed_hosts
+    end
+    redirect_to(discovered_hosts_path)
+  end
+
+  def auto_provision
+    if rule = find_discovery_rule(@host)
+      if perform_auto_provision(@host, rule)
+        process_success :success_msg => _("Host %{host} was provisioned with rule %{rule}") % {:host => @host.name, :rule => rule.name}, :success_redirect => discovered_hosts_path
+      else
+        errors = @host.errors.full_messages.join(' ')
+        logger.warn "Failed to auto provision host %s: %s" % [@host.name, errors]
+        process_error :error_msg => _("Failed to auto provision host %s: %s") % [@host.name, errors], :redirect => :back
+      end
+    else
+      process_success :success_msg => _("No rule found for host %s") % @host.name, :success_redirect => :back
+    end
+  end
+
+  def submit_multiple_auto_provision
+    result = true
+    error_message = _("Errors during auto provisioning: %s")
+
+    if Host::Discovered.count == 0
+      error_message = _("No discovered hosts to provision")
+      result = false
+    end
+
+    overall_errors = ""
+    @hosts.each do |discovered_host|
+      if rule = find_discovery_rule(discovered_host)
+        result &= perform_auto_provision(discovered_host, rule)
+        unless discovered_host.errors.empty?
+          errors = discovered_host.errors.full_messages.join(' ')
+          logger.warn "Failed to auto provision host %s: %s" % [discovered_host.name, errors]
+          overall_errors << "#{discovered_host.name}: #{errors} "
+        end
+      end
+    end
+    if result
+      process_success :success_msg => _("Discovered hosts are provisioning now"), :success_redirect => :back
+    else
+      process_error :error_msg => error_message % overall_errors, :redirect => :back
+    end
+  end
+
+  def resource_class
+    Host::Discovered
+  end
+
+  private
+
+  def setup_host_class_variables
+    if @host.hostgroup
+      subnet = @host.hostgroup.subnet || @host.subnet
+      subnet6 = @host.hostgroup.subnet6 || @host.subnet6
+      @architecture    = @host.hostgroup.architecture
+      @operatingsystem = @host.hostgroup.operatingsystem
+      if defined?(ForemanPuppet)
+        @environment     = @host.hostgroup.environment
+        @host.environment = @environment
+      end
+      @domain          = @host.hostgroup.domain
+      @subnet          = subnet
+      @subnet6         = subnet6
+      @compute_profile = @host.hostgroup.compute_profile
+      @realm           = @host.hostgroup.realm
+      @host.interfaces.first.assign_attributes(subnet: subnet, subnet6: subnet6, domain: @domain)
+    end
+  end
+
+  def resource_base
+    @resource_base ||= ::Host::Discovered.authorized(current_permission, ::Host::Discovered)
+  end
+
+  def load_vars_for_ajax
+    return unless @host
+    if defined?(ForemanPuppet)
+      @environment     = @host.environment
+    end
+    @architecture    = @host.architecture
+    @domain          = @host.domain
+    @operatingsystem = @host.operatingsystem
+    @medium          = @host.medium
+  end
+
+  # this is required for template generation (such as pxelinux) which is not done via a web request
+  def forward_url_options(host = @host)
+    host.url_options = url_options if @host.respond_to?(:url_options)
+  end
+
+  # if a save failed and the only reason was network conflicts then flag this so that the view
+  # is rendered differently and the next save operation will be forced
+  def offer_to_overwrite_conflicts
+    @host.overwrite = "true" if @host.errors.any? and @host.errors.are_all_conflicts?
+  end
+
+  def controller_permission
+    'discovered_hosts'
+  end
+
+  def action_permission
+    case params[:action]
+      when 'refresh_facts', 'reboot', 'multiple_reboot', 'update_multiple_location',
+        'select_multiple_organization', 'update_multiple_organization', 'select_multiple_location', 'submit_multiple_reboot'
+        :edit
+      when 'submit_multiple_destroy', 'multiple_destroy'
+        :destroy
+      when 'auto_provision', 'multiple_auto_provision', 'submit_multiple_auto_provision'
+        :auto_provision
+      else
+        super
+    end
+  end
+
+  def find_by_name(*includes)
+    not_found and return false if (id = params[:id]).blank?
+    id.downcase!
+    @host = includes.empty? ? resource_base.find_by_id(id) : resource_base.includes(includes).find_by_id(id)
+    @host ||= includes.empty? ? resource_base.find_by_name(id) : resource_base.includes(includes).find_by_name(id)
+    not_found and return(false) unless @host
+    @host
+  end
+
+  def check_for_subnet
+    hosts_without_subnet = []
+    case params[:action]
+      when 'reboot', 'auto_provision'
+        if @host.subnet.nil?
+          process_warning :warning_msg => _("Discovered host reported from unknown subnet, communication will not be proxied.")
+        end
+      when 'submit_multiple_reboot', 'submit_multiple_auto_provision'
+        hosts_without_subnet = @hosts.limit(3).select { |host| host.subnet.nil? }.pluck(:name)
+        if hosts_without_subnet.present?
+          process_warning :warning_msg => _("Discovered hosts reported from unknown subnet are %s, communication will not be proxied.") % hosts_without_subnet.join(', ')
+        end
+    end
+  end
+
+  def find_by_name_incl_subnet
+    find_by_name({:interfaces => :subnet})
+  end
+
+  def find_multiple
+    # Lets search by name or id and make sure one of them exists first
+    if params[:host_names].present? or params[:host_ids].present?
+      @hosts = Host::Discovered.includes(:model, :fact_values, :interfaces, :location, :organization).where("id IN (?) or name IN (?)", params[:host_ids], params[:host_names] )
+      if @hosts.empty?
+        error _('No hosts were found with that id or name')
+        redirect_to(discovered_hosts_path) and return false
+      end
+    else
+      error _('No hosts selected')
+      redirect_to(discovered_hosts_path) and return false
+    end
+
+    return @hosts
+  rescue => e
+    error _("Something went wrong while selecting hosts - %s") % e
+    redirect_to discovered_hosts_path
+  end
+
+  def taxonomy_scope
+    if @host
+      @organization = @host.organization
+      @location = @host.location
+    end
+
+    @organization ||= Organization.current
+    @organization ||= Organization.my_organizations.first
+    @location ||= Location.current
+    @location ||= Location.my_locations.first
+  end
+
+  # particular actions will always raise N+1 queries
+  def skip_bullet
+    Bullet.enable = false if defined? Bullet
+    yield
+  ensure
+    Bullet.enable = true if defined? Bullet
+  end
+
+<<<<<<< HEAD
+  def add_custom_facts
+    unless @host.primary_interface.subnet.nil?
+      discovery_subnet = "#{@host.primary_interface.subnet.name} (#{@host.primary_interface.subnet.network})"
+      assign_fact_to_category("discovery_subnet", discovery_subnet)
+=======
+  def get_interfaces
+    @host.interfaces.each do |interface|
+      @interfaces << {:identifier => interface["identifier"], :type => interface["type"], :mac => interface["mac"], :ip => interface["ip"]? interface["ip"] : "N/A", :primary => interface["primary"], :provision => interface["provision"]}
+>>>>>>> 58baad5 (Support subnet6 facts in FactToCategoryResolver)
+    end
+  end
+
+  def process_warning(hash = {})
+    warning hash[:warning_msg]
+  end
+end

data/app/models/host/discovered.rb

@@ -18,6 +18,7 @@ class Host::Discovered < ::Host::Base
   scoped_search :on => :created_at, :default_order => :desc, :only_explicit => true
   scoped_search :on => :last_report, :complete_value => true, :only_explicit => true
   scoped_search :relation => :primary_interface, :on => :ip, :complete_value => true
+  scoped_search :relation => :primary_interface, :on => :ip6, :complete_value => true
   scoped_search :relation => :primary_interface, :on => :mac, :complete_value => true
   scoped_search :relation => :model, :on => :name, :complete_value => true, :rename => :model, :only_explicit => true
   scoped_search :relation => :fact_values, :on => :value, :in_key => :fact_names, :on_key => :name, :rename => :facts, :complete_value => true, :only_explicit => true

data/app/services/foreman_discovery/fact_to_category_resolver.rb

@@ -33,7 +33,8 @@ module ForemanDiscovery
           identifier: interface["identifier"],
           type: interface["type"],
           mac: interface["mac"],
-          ip: interface["ip"] || "N/A",
+          ip: interface["ip"],
+          ip6: interface["ip6"],
           primary: interface["primary"],
           provision: interface["provision"],
         }
@@ -50,10 +51,7 @@ module ForemanDiscovery
         assign_fact_to_category(key, value)
       end
 
-      return if host.primary_interface.subnet.nil?
-
-      discovery_subnet = "#{host.primary_interface.subnet.name} (#{host.primary_interface.subnet.network})"
-      assign_fact_to_category("discovery_subnet", discovery_subnet)
+      subnets_facts(host.primary_interface)
     end
 
     def assign_fact_to_category(key, value)
@@ -74,6 +72,14 @@ module ForemanDiscovery
       end
     end
 
+    def subnets_facts(iface)
+      subnet4 = iface.subnet
+      subnet6 = iface.subnet6
+
+      assign_fact_to_category("discovery_subnet", "#{subnet4.name} (#{subnet4.network})") if subnet4
+      assign_fact_to_category("discovery_subnet6", "#{subnet6.name} (#{subnet6.network})") if subnet6
+    end
+
     def highlights
       /^(productname|memorysize|manufacturer|architecture|macaddress$|processorcount|physicalprocessorcount|discovery_subnet|discovery_boot|ipaddress$)/
     end
@@ -103,4 +109,3 @@ module ForemanDiscovery
     end
   end
 end
-

data/app/services/foreman_discovery/lldp_neighbors.rb

@@ -52,15 +52,18 @@ module ForemanDiscovery
 
       return if neighbors.nil?
 
-      ip  = primary.ip
+      ip = primary.ip
+      ip6 = primary.ip6
       mac = primary.mac
       name = primary.name
+
       primary.update(
           :primary   => false,
           :provision => false,
           :managed   => false,
           :name      => nil,
-          :ip        => nil
+          :ip        => nil,
+          :ip6       => nil
       )
 
       bond = Nic::Bond.create(
@@ -70,6 +73,7 @@ module ForemanDiscovery
           :provision        => true,
           :name             => name,
           :ip               => ip,
+          :ip6              => ip6,
           :mac              => mac,
           :host             => host
       )

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

@@ -2,7 +2,8 @@ object @discovered_host
 
 extends "api/v2/discovered_hosts/base"
 
-attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :hardware_model_name, :memory, :disk_count, :disks_size
+attributes :ip, :ip6, :mac, :last_report, :subnet_id,
+  :subnet_name, :hardware_model_name, :memory, :disk_count, :disks_size
 attribute :cpu_count => :cpus
 
 node :subnet_name do |host|

data/app/views/discovered_hosts/_discovered_host.html.erb

@@ -1,6 +1,7 @@
 <td class="ellipsis"><%= link_to (discovery_status_icon(host) + '&nbsp;'.html_safe + trunc_with_tooltip(h(host.name))), discovered_host_path(host) %></td>
 <td class="hidden-tablet hidden-xs"><%= host.try(:hardware_model_name) || 'N/A' %></td>
 <td class="hidden-tablet hidden-xs"><%= host.ip %></td>
+<td class="hidden-tablet hidden-xs"><%= host.ip6 %></td>
 <td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :cpu_count) %></td>
 <td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :memory, 0) * 1024 * 1024) %></td>
 <td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :disk_count) %></td>

data/app/views/discovered_hosts/_discovered_hosts_list.html.erb

@@ -5,7 +5,8 @@
       <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
       <th class=''><%= sort :name, :as => _('Name') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :model, :as => _('Model') %></th>
-      <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IPv4') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :ip6, :as => _('IPv6') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :cpu_count, :as => _('CPUs') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :memory, :as => _('Memory') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :disk_count, :as => _('Disk Count') %></th>

data/app/views/discovered_hosts/show.html.erb

@@ -44,7 +44,8 @@
               <th class="hidden-xs " width="12%"><%= _('Type') %></th>
               <th class="hidden-xs "><%= _('Identifier') %></th>
               <th class="hidden-xs "><%= _("MAC address") %></th>
-              <th class="hidden-xs "><%= _("IP address") %></th>
+              <th class="hidden-xs "><%= _("IPv4") %></th>
+              <th class="hidden-xs "><%= _("IPv6") %></th>
             </tr>
             <% @interfaces.each do |interface| %>
               <tr>
@@ -52,6 +53,7 @@
                 <td class="ellipsis"><%= interface[:identifier] %></td>
                 <td class="ellipsis"><%= interface[:mac] %></td>
                 <td class="ellipsis"><%= interface[:ip] %></td>
+                <td class="ellipsis"><%= interface[:ip6] %></td>
               </tr>
             <% end %>
           </table>

data/app/views/discovered_mailer/_discovered_host.html.erb

@@ -3,7 +3,12 @@
   <%= link_to host, discovered_host_url(:id => host, :host => @url.host, :port => @url.port, :only_path => false, :protocol => @url.scheme) %>
 </td>
 <td style="<%= td_style%>"><%= host.try(:hardware_model_name) || 'N/A' %></td>
+<% if host.ip %>
 <td style="<%= td_style%>"><%= host.ip %></td>
+<% end %>
+<% if host.ip6 %>
+<td style="<%= td_style%>"><%= host.ip6 %></td>
+<% end %>
 <td style="<%= td_style%>"><%= discovery_attribute(host, :cpu_count) %></td>
 <td style="<%= td_style%>"><%= number_to_human_size(discovery_attribute(host, :memory, 0) * 1024 * 1024) %></td>
 <td style="<%= td_style%>"><%= discovery_attribute(host, :disk_count) %></td>

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "25.0.0"
+  VERSION = "25.1.0"
 end