foreman_discovery 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50f5e89c539ec3eb3bee287fc9251f4e0dad65f9
-  data.tar.gz: ccad5c9dcb424f30bd2802aaec3489b55aba7e71
+  metadata.gz: eb5bd6046ce32fec83f20be39d6a013432f3b68a
+  data.tar.gz: a731fce4e700240569682ad27870e595c877cad7
 SHA512:
-  metadata.gz: 110b9578fc4bcf83d47e11254cbcd2c157268f2ba17c4aae6a9a21a47beeb68511b460f55d4427cbd88d7137d92dac1922589c2d4b20e48182799103e746f95c
-  data.tar.gz: c10cd4e42f0ac2c5d5a7eaa2b600a471a7f641e2d8a86fe3433201659813bba3f312a219f8efed4159697f0bbfd94ad39bd5c5d79f23fe95e43cdd738f796b11
+  metadata.gz: 4062bb0efcd048821962c566f1b33ac4151caaf09d9a1787116a78cbefa5f38eb48afcb135502f25d31fe0270a6c973636ec77ac56d66c4f1d9c4e616a2d9478
+  data.tar.gz: 274935dfa8429e46473404b331b346b528467872e23b4d49eecdab59f5fe4b3eb5690d61905db2bc509d4558242a7ad9645b9dd42b009a18a82ba16785559da3

data/README.md

@@ -11,7 +11,7 @@ The main documentation can be found in the [Foreman Discovery manual] (http://th
 If a source-based install of Foreman is in use, the develop
 branch of the plugin can be obtained by updating the Gemfile in this way:
 
-    gem 'foreman_discovery', :git => "https://github.com/theforeman/foreman_discovery.git"
+    gem 'foreman_discovery', :git => "https://github.com/theforeman/foreman_discovery.git", :branch => 'develop'
 
 # API
 

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

@@ -1,6 +1,7 @@
 module Api
   module V2
     class DiscoveredHostsController < ::Api::V2::BaseController
+      include Foreman::Controller::Parameters::DiscoveredHost
       include Foreman::Controller::DiscoveredExtensions
 
       before_filter :find_resource, :except => %w{index create facts auto_provision_all reboot_all}
@@ -40,7 +41,7 @@ module Api
       param_group :discovered_host, :as => :create
 
       def create
-        @discovered_host = Host::Discovered.new(params[:discovered_host])
+        @discovered_host = Host::Discovered.new(discovered_host_params)
         process_response @discovered_host.save
       end
 
@@ -78,7 +79,7 @@ module Api
       def update
         @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host)
         forward_request_url
-        update_response = @host.update_attributes(params[:discovered_host])
+        update_response = @host.update_attributes(discovered_host_params)
         process_response update_response
       end
 
@@ -93,15 +94,16 @@ module Api
       param :facts, Hash, :required => true, :desc => N_("hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)")
 
       def facts
+        facts = params['facts']
         state = true
-        @discovered_host = Host::Discovered.import_host(params[:facts])
+        @discovered_host = Host::Discovered.import_host(facts)
         Rails.logger.warn "Discovered facts import unsuccessful, skipping auto provisioning" unless @discovered_host
         if Setting['discovery_auto'] && @discovered_host && rule = find_discovery_rule(@discovered_host)
           state = perform_auto_provision(@discovered_host, rule)
         end
         process_response state
       rescue Exception => e
-        logger.warn "Host discovery failed, facts: #{params[:facts]}"
+        logger.warn "Host discovery failed, facts: #{facts}"
         logger.debug e.message + "\n" + e.backtrace.join("\n")
         render :json => {'message'=>e.to_s}, :status => :unprocessable_entity
       end

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

@@ -1,6 +1,7 @@
 module Api
   module V2
     class DiscoveryRulesController < ::Api::V2::BaseController
+      include Foreman::Controller::Parameters::DiscoveryRule
 
       before_filter :find_resource, :except => %w{index create facts}
 
@@ -43,7 +44,7 @@ module Api
       param_group :discovery_rule, :as => :create
 
       def create
-        @discovery_rule = DiscoveryRule.new(params[:discovery_rule])
+        @discovery_rule = DiscoveryRule.new(discovery_rule_params)
         process_response @discovery_rule.save
       end
 
@@ -52,7 +53,7 @@ module Api
       param_group :discovery_rule, :as => :update
 
       def update
-        process_response @discovery_rule.update_attributes(params[:discovery_rule])
+        process_response @discovery_rule.update_attributes(discovery_rule_params)
       end
 
       api :DELETE, "/discovery_rules/:id/", N_("Delete a rule")

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

@@ -0,0 +1,24 @@
+module Foreman::Controller::Parameters::DiscoveredHost
+  extend ActiveSupport::Concern
+  include Foreman::Controller::Parameters::HostBase
+  include Foreman::Controller::Parameters::HostCommon
+
+  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)
+      end
+    end
+  end
+
+  def discovered_host_params
+    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+  end
+
+  def discovered_host_params_host
+    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+  end
+end

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

@@ -0,0 +1,17 @@
+module Foreman::Controller::Parameters::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)
+      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

@@ -1,4 +1,5 @@
 class DiscoveredHostsController < ::ApplicationController
+  include Foreman::Controller::Parameters::DiscoveredHost
   include Foreman::Controller::AutoCompleteSearch
   include Foreman::Controller::TaxonomyMultiple
   include Foreman::Controller::DiscoveredExtensions
@@ -50,7 +51,7 @@ class DiscoveredHostsController < ::ApplicationController
 
   def edit
     @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false) unless @host.nil?
-    @host.attributes = @host.apply_inherited_attributes(params[:host]) unless params[:host].empty?
+    @host.attributes = @host.apply_inherited_attributes(discovered_host_params_host) unless discovered_host_params_host.empty?
     @host.set_hostgroup_defaults
     setup_host_class_variables(@host)
     @override_taxonomy = true
@@ -64,7 +65,7 @@ class DiscoveredHostsController < ::ApplicationController
   def update
     @host = ::ForemanDiscovery::HostConverter.to_managed(@host)
     forward_url_options
-    @host.attributes = params[:host]
+    @host.attributes = discovered_host_params_host
 
     perform_update(@host)
   end

data/app/controllers/discovery_rules_controller.rb

@@ -2,6 +2,8 @@ class DiscoveryRulesController < ApplicationController
   # Two-pane searching must be disabled for rules otherwise query completion will not work
   #include Foreman::Controller::AutoCompleteSearch
 
+  include Foreman::Controller::Parameters::DiscoveryRule
+
   before_filter :find_resource, :only => [:edit, :update, :destroy, :enable, :disable, :auto_provision]
 
   def index
@@ -14,7 +16,7 @@ class DiscoveryRulesController < ApplicationController
   end
 
   def create
-    @discovery_rule = DiscoveryRule.new(params[:discovery_rule])
+    @discovery_rule = DiscoveryRule.new(discovery_rule_params)
     if @discovery_rule.save
       process_success
     else
@@ -26,7 +28,7 @@ class DiscoveryRulesController < ApplicationController
   end
 
   def update
-    if @discovery_rule.update_attributes(params[:discovery_rule])
+    if @discovery_rule.update_attributes(discovery_rule_params)
       process_success
     else
       process_error

data/app/helpers/discovered_hosts_helper.rb

@@ -11,15 +11,14 @@ module DiscoveredHostsHelper
   end
 
   def discovered_hosts_title_actions(host)
-    actions = [[_('Provision'), hash_for_edit_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :provision_discovered_hosts)]]
-    actions <<  [_('Auto Provision'), hash_for_auto_provision_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :auto_provision_discovered_hosts), :method => :post]
+    actions =  [[_('Auto Provision'), hash_for_auto_provision_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :auto_provision_discovered_hosts), :method => :post]]
     actions <<  [_('Refresh facts') ,hash_for_refresh_facts_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :edit_discovered_hosts)]
     actions <<  [_('Reboot') ,hash_for_reboot_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :edit_discovered_hosts), :method => :put]
     title_actions(
         button_group(
             link_to(_("Back"), :back, :class => "btn btn-default")
         ),
-        select_action_button( _("Select Action"), {}, actions.map { |action| display_link_if_authorized(action[0] , action[1], action[2] || {}) }.flatten ),
+        select_action_button( _("Select Action"), {}, provision_button(host, hash_for_edit_discovered_host_path(:id => host)), actions.map { |action| display_link_if_authorized(action[0] , action[1], action[2] || {}) }.flatten ),
       button_group(
         link_to(_("Expand All"),"#",:class => "btn btn-default",:onclick => "$('.glyphicon-plus-sign').toggleClass('glyphicon glyphicon-minus-sign glyphicon glyphicon-plus-sign');
                 $('.facts-panel').addClass('collapse in').height('auto');"
@@ -90,12 +89,10 @@ module DiscoveredHostsHelper
   def provision_button(host, authorization_options)
     return '' unless authorized_for(authorization_options)
 
-    button_tag(
-      _('Provision'),
-      :type => :button,
-      :class => 'btn btn-sm btn-default',
-      :data => {
-        :toggle => 'modal',
-        :target => "#fixedPropertiesSelector-#{host.id}"})
+    link_to(
+        _('Provision'), "#",
+        :data => {
+            :toggle => 'modal',
+            :target => "#fixedPropertiesSelector-#{host.id}"})
   end
 end

data/app/models/concerns/discovery_subnet.rb

@@ -2,8 +2,6 @@ module DiscoverySubnet
   extend ActiveSupport::Concern
   included do
     belongs_to :discovery, :class_name => "SmartProxy"
-
-    attr_accessible :discovery_id
   end
 end
 

data/app/models/concerns/fact_value_extensions.rb

@@ -4,5 +4,10 @@ module FactValueExtensions
   included do
     belongs_to :discovered_host, :class_name => "Host::Discovered", :foreign_key => :host_id
     scoped_search :in => :discovered_host, :on => :id, :complete_enabled => false, :only_explicit => true, :rename => :discovered_host
+
+    def host
+      return discovered_host if discovered_host.present?
+      super
+    end
   end
 end

data/app/models/discovery_attribute_set.rb

@@ -1,6 +1,5 @@
 class DiscoveryAttributeSet < ActiveRecord::Base
   belongs_to :host, :class_name => "Host::Discovered", :foreign_key => :host_id
-  attr_accessible :cpu_count, :disk_count, :disks_size, :memory
 
   validates :cpu_count, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :memory, :presence => true,    :numericality => {:greater_than_or_equal_to => 0}

data/app/models/discovery_rule.rb

@@ -5,8 +5,6 @@ class DiscoveryRule < ActiveRecord::Base
   include Parameterizable::ByIdName
   include Taxonomix
 
-  attr_accessible :name, :priority, :search, :enabled, :hostgroup, :hostgroup_id, :max_count, :hostname
-
   validates :name, :presence => true, :uniqueness => true,
     :format => { :with => /\A(\S+)\Z/, :message => N_("can't contain white spaces.") }
   validates :search, :presence => true

data/app/models/host/discovered.rb

@@ -2,8 +2,6 @@ class Host::Discovered < ::Host::Base
   include ScopedSearchExtensions
   include Foreman::Renderer
 
-  attr_accessible :discovery_rule_id
-
   belongs_to :hostgroup
   has_one    :discovery_attribute_set, :foreign_key => :host_id, :dependent => :destroy
 

data/app/models/host/managed_extensions.rb

@@ -12,7 +12,6 @@ module Host::ManagedExtensions
 
     # extra flag for post_queue callbacks which has no access to facts
     attr_accessor :legacy_api
-    attr_accessible :discovery_rule_id
   end
 
   def queue_reboot
@@ -45,8 +44,7 @@ module Host::ManagedExtensions
     template = provisioning_template(:kind => 'kexec')
     raise ::Foreman::Exception.new(N_("Kexec template not associated with operating system")) unless template
     @host = self
-    # the following two attributes are overwritten by TFTP in preview mode (kept for compatibility)
-    @kernel, @initrd = operatingsystem.boot_files_uri(@host.medium, @host.architecture)
+    @kexec_kernel, @kexec_initrd = operatingsystem.boot_files_uri(@host.medium, @host.architecture)
     json = unattended_render(template)
     old.becomes(Host::Discovered).kexec json
     true

data/app/models/hostgroup_extensions.rb

@@ -3,6 +3,5 @@ module HostgroupExtensions
 
   included do
     has_many :discovery_rules, :dependent => :restrict_with_error
-    attr_accessible :discovery_rules, :discovery_rule_ids, :discovery_rule_names, :type
   end
 end

data/app/models/nic/managed_extensions.rb

@@ -0,0 +1,26 @@
+module Nic::ManagedExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    after_validation :discovery_queue_rebuild_dns
+  end
+
+  def discovery_queue_rebuild_dns
+    return unless (dns? || dns6? || reverse_dns? || reverse_dns6?) && errors.empty? && Setting[:discovery_always_rebuild_dns]
+    return if self.host.new_record? # Discovered Hosts already exist, and new_records will break `find`
+    return unless self.host.type_changed? and ::Host::Base.find(self.host.id).type == "Host::Discovered"
+    return if self.pending_dns_record_changes?
+    logger.debug "Queuing DNS rebuild for #{self}"
+    queue.create(:name => _("Rebuild DNS for %s") % self, :priority => 10, :action => [self, :set_discovery_rebuild_dns])
+  end
+
+  def set_discovery_rebuild_dns
+    logger.debug "Executing DNS rebuild for #{self}"
+    rebuild_dns
+  end
+
+  def del_discovery_rebuild_dns
+    # Just a place holder, so if rollback is needed, we won't get an exception about not knowing how to rollback.
+    # This is a no-op, since we cannot really rollback rebuild_dns
+  end
+end

data/app/models/setting/discovered.rb

@@ -31,6 +31,7 @@ class Setting::Discovered < ::Setting
         self.set('discovery_facts_ipmi', N_("Regex to organize facts for ipmi section"), "", N_("IPMI facts")),
         self.set('discovery_lock', N_("Automatically generate PXE configuration to pin a newly discovered host to discovery"), false, N_("Lock PXE")),
         self.set('discovery_lock_template', N_("PXE template to be used when pinning a host to discovery"), 'pxelinux_discovery', N_("Locked template name"),nil,{ :collection => Proc.new {Hash[ProvisioningTemplate.all.map{|template| [template[:name], template[:name]]}]} }),
+        self.set('discovery_always_rebuild_dns', N_("Force DNS entries creation when provisioning discovered host"), true, N_("Force DNS")),
       ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
     end
 

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

@@ -0,0 +1,30 @@
+<div class="modal" id="<%= "fixedPropertiesSelector-#{host.id}" %>" tabindex="-1" role="dialog" aria-labelledby="fixedPropertiesSelectorLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <%= form_for host, :url => edit_discovered_host_path(host), :method => :get do |f| %>
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title" id="fixedPropertiesSelectorLabel"><%= _('Select initial host properties') %></h4>
+          </div>
+          <div class="modal-body">
+            <%= select_f f, :hostgroup_id, accessible_resource_records(:hostgroup, :title).to_a, :id, :to_label,
+                         { :include_blank => true },
+                         { :help_inline => :indicator, :size => 'col-md-10' } %>
+
+            <% if show_organization_tab?  %>
+                <%= select_f f, :organization_id, Organization.my_organizations, :id, :to_label, {}, {:size => 'col-md-10'} %>
+            <% end %>
+
+            <% if show_location_tab? %>
+                <%= select_f f, :location_id, Location.my_locations, :id, :to_label, {}, {:size => 'col-md-10'} %>
+            <% end %>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            <input type="submit" class="btn btn-default" value="<%= _('Quick create') %>" name="quick_submit" />
+            <input type="submit" class="btn btn-primary" value="<%= _('Create host') %>" />
+          </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -39,36 +39,8 @@
       <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
       <td>
         <!-- Modal -->
-      <div class="modal" id="<%= "fixedPropertiesSelector-#{host.id}" %>" tabindex="-1" role="dialog" aria-labelledby="fixedPropertiesSelectorLabel">
-        <div class="modal-dialog" role="document">
-          <div class="modal-content">
-            <%= form_for host, :url => edit_discovered_host_path(host), :method => :get do |f| %>
-              <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="fixedPropertiesSelectorLabel"><%= _('Select initial host properties') %></h4>
-              </div>
-              <div class="modal-body">
-                  <%= select_f f, :hostgroup_id, accessible_hostgroups, :id, :to_label,
-                    { :include_blank => true },
-                    { :help_inline => :indicator, :size => 'col-md-10' } %>
-
-                  <% if show_organization_tab?  %>
-                    <%= select_f f, :organization_id, Organization.my_organizations, :id, :to_label, {}, {:size => 'col-md-10'} %>
-                  <% end %>
-
-                  <% if show_location_tab? %>
-                    <%= select_f f, :location_id, Location.my_locations, :id, :to_label, {}, {:size => 'col-md-10'} %>
-                  <% end %>
-              </div>
-              <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <input type="submit" class="btn btn-default" value="<%= _('Quick create') %>" name="quick_submit"></input>
-                <input type="submit" class="btn btn-primary" value="<%= _('Create host') %>"></input>
-              </div>
-            <% end %>
-          </div>
+        <%= render :partial => "discovered_host_modal", :locals => {:host => host} %>
         </div>
-      </div>
         <%= action_buttons(
           provision_button(host, hash_for_edit_discovered_host_path(:id => host)),
           display_link_if_authorized(_("Auto Provision"), hash_for_auto_provision_discovered_host_path(:id => host), :method => :post),

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

@@ -2,25 +2,35 @@
 
 <%= discovered_hosts_title_actions(@host) %>
 
+<!-- Modal -->
+<%= render :partial => "discovered_host_modal", :locals => {:host => @host} %>
+
 <div class="row">
   <div class="col-md-6">
     <div id="category-highlights" class="panel panel-default">
-      <div class="panel-heading" ><strong> <%= _(@categories_names[0]) %></strong> </div>
+      <div class="panel-heading" role="tab">
+        <h4 class="panel-title">
+          <a role="button" class="expendable-link" data-toggle="collapse" href="#highlights-panel" aria-expanded="true">
+            <%= _(@categories_names[0]) %>
+          </a>
+        </h4>
+      </div>
+      <div id="highlights-panel" class="panel-collapse collapse facts-panel in" >
         <table class="table table-bordered table-condensed table-fixed">
-        <% @categories[0].sort.each do |key, val| %>
-            <tr id="fact-<%= key.try(:downcase) %>" class="">
-              <th class="ellipsis" width="40%"> <strong> <%= key %> </strong></th>
-              <td><%= val %></td>
-            </tr>
+          <% @categories[0].sort.each do |key, val| %>
+          <tr id="fact-<%= key.try(:downcase) %>" class="">
+            <th class="ellipsis" width="40%"> <strong> <%= key %> </strong></th>
+            <td><%= val %></td>
+          </tr>
         <% end -%>
         </table>
+      </div>
     </div>
     <% unless @interfaces.empty? %>
       <div class="panel panel-default">
         <div class="panel-heading" role="tab">
           <h4 class="panel-title">
-            <a role="button" class="expendable-link" data-toggle="collapse" data-parent="#accordion" href="#interfaces-panel" aria-expanded="true" onclick="$(this).find(':first-child').toggleClass('glyphicon glyphicon-minus-sign glyphicon glyphicon-plus-sign')">
-              <span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span>
+            <a role="button" class="expendable-link" data-toggle="collapse" href="#interfaces-panel" aria-expanded="true">
               <%= _("Interfaces") %>
             </a>
           </h4>
@@ -28,7 +38,7 @@
         <div id="interfaces-panel" class="panel-collapse collapse facts-panel in" >
           <table class="table table-bordered table-condensed table-fixed" id="interfaceList">
             <tr>
-              <th class="hidden-xs " width="12%"></th>
+              <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>
@@ -54,8 +64,7 @@
         <div id="category-<%= @categories_names[index].downcase %>" class="panel panel-default">
           <div class="panel-heading" role="tab">
             <h4 class="panel-title">
-              <a role="button" class="expendable-link" data-toggle="collapse" data-parent="#accordion" href="#<%= @categories_names[index].to_s + "panel" %>" aria-expanded="true" onclick="$(this).find(':first-child').toggleClass('glyphicon glyphicon-minus-sign glyphicon glyphicon-plus-sign')">
-                <span class="glyphicon glyphicon<%= (@categories_names[index].to_s.include?("Storage")? "-minus-sign":"-plus-sign")%>" aria-hidden="true"></span>
+              <a role="button" class="expendable-link" data-toggle="collapse" data-parent="#accordion" href="#<%= @categories_names[index].to_s + "panel" %>" aria-expanded="true">
                 <%= _(@categories_names[index]) %>
               </a>
             </h4>
@@ -80,7 +89,6 @@
   $(document).ready(function(){
     $("table").css('padding', '0');
     $("table").css("cssText", 'margin-bottom: 0 !important;');
-    $(".panel-default").css('margin-bottom', "10px")
 
     provision_class = 'active'
     primary_class = 'active'