foreman_discovery 9.1.5 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e877d7c59191394b18cf5904b63054d92df3ce0d
-  data.tar.gz: e273a127b52a861f972200ddad15b98741b51a2d
+  metadata.gz: d782b90e35570098b6d74636a5a79a6a7f94026a
+  data.tar.gz: '07791a0d0a62b65eb04803473e2413748458b40a'
 SHA512:
-  metadata.gz: a06f1b0fd6e1ed5e5096083fd79e45f41b0d5d795b60c60d6bcd2c56041353bcd44f2e8884e0736f04fee9baf50a876f04104b8a88a839b5a0f5af45cae51ba4
-  data.tar.gz: 8fbab2d3cca72e08771cb6aa5e3e116322c724ce9c00d9a9e6fb854b2a1728aa7c6b19ec6e1bb646aaebdefd3824c98decf923489ab639c4e1d1158ef5d24ad0
+  metadata.gz: 3172b396efe8c2b9a7a8727bc26739bcbfb4da40cd0fc1222ad4c2cd91267de873d61ef3c4fdc2e7e6cbf44881679c79b990b9ed795f699150ecb8f806d7aa3b
+  data.tar.gz: a8daeeadb503811032caebe4f2c6dd26acad998d615b7e3deeb96dff59880494ba7ce01cd9459431adcc439e7a13ab91a24ca467b2774b54a4c4265a31c2b17f

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

@@ -4,8 +4,8 @@ module Api
       include Foreman::Controller::Parameters::DiscoveredHost
       include Foreman::Controller::DiscoveredExtensions
 
-      before_filter :find_resource, :except => %w{index create facts auto_provision_all reboot_all}
-      skip_before_filter :authorize, :only => :facts
+      before_action :find_resource, :except => %w{index create facts auto_provision_all reboot_all}
+      skip_before_action :authorize, :only => :facts
 
       resource_description do
         resource_id 'discovered_hosts'
@@ -80,7 +80,7 @@ module Api
       end
 
       def update
-        @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host, true, true, managed_host_params)
+        @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host, true, true, discovered_host_params)
         forward_request_url
         update_response = @host.save
         process_response update_response
@@ -97,7 +97,8 @@ 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']
+        # creating a host from facts is not a mass assignment - we store them individually
+        facts = params['facts'].to_unsafe_h
         state = true
         User.as_anonymous_admin do
           @discovered_host = Host::Discovered.import_host(facts)

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

@@ -3,7 +3,7 @@ module Api
     class DiscoveryRulesController < ::Api::V2::BaseController
       include Foreman::Controller::Parameters::DiscoveryRule
 
-      before_filter :find_resource, :except => %w{index create facts}
+      before_action :find_resource, :except => %w{index create facts}
 
       resource_description do
         resource_id 'discovery_rules'

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

@@ -1,6 +1,7 @@
 module Foreman::Controller::Parameters::DiscoveredHost
   extend ActiveSupport::Concern
-  include Foreman::Controller::Parameters::Host
+  include Foreman::Controller::Parameters::HostBase
+  include Foreman::Controller::Parameters::HostCommon
 
   class_methods do
     def discovered_host_params_filter
@@ -20,12 +21,4 @@ module Foreman::Controller::Parameters::DiscoveredHost
   def discovered_host_params_host
     self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
   end
-
-  def managed_host_params_host
-    self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
-  end
-
-  def managed_host_params
-    self.class.host_params_filter.filter_params(params, parameter_filter_context)
-  end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -5,17 +5,21 @@ class DiscoveredHostsController < ::ApplicationController
   include Foreman::Controller::DiscoveredExtensions
   include ActionView::Helpers::NumberHelper
 
-  before_filter :find_by_name, :only => %w[edit update destroy refresh_facts convert reboot auto_provision]
-  before_filter :find_by_name_incl_subnet, :only => [:show]
-  before_filter :find_multiple, :only => [:multiple_destroy, :submit_multiple_destroy]
-  before_filter :taxonomy_scope, :only => [:edit]
+  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]
+  before_action :taxonomy_scope, :only => [:edit]
 
-  around_filter :skip_bullet, :only => [:edit]
+  around_action :skip_bullet, :only => [:edit]
 
   helper :hosts
 
   layout 'layouts/application'
 
+  def model_of_controller
+    Host::Discovered
+  end
+
   def index
     @hosts = resource_base.search_for(params[:search], :order => params[:order]).includes([
       :location,
@@ -62,7 +66,7 @@ class DiscoveredHostsController < ::ApplicationController
   end
 
   def update
-    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, true, managed_host_params_host)
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, true, discovered_host_params_host)
     forward_url_options
 
     perform_update(@host)
@@ -142,21 +146,6 @@ class DiscoveredHostsController < ::ApplicationController
     redirect_to(discovered_hosts_path)
   end
 
-  def auto_complete_search
-    begin
-      @items = Host::Discovered.complete_for(params[:search])
-      @items = @items.map do |item|
-        category = (['and','or','not','has'].include?(item.to_s.sub(/^.*\s+/,''))) ? 'Operators' : ''
-        part = item.to_s.sub(/^.*\b(and|or)\b/i) {|match| match.sub(/^.*\s+/,'')}
-        completed = item.to_s.chomp(part)
-        {:completed => completed, :part => part, :label => item, :category => category}
-      end
-    rescue ScopedSearch::QueryNotSupported => e
-      @items = [{:error =>e.to_s}]
-    end
-    render :json => @items
-  end
-
   def auto_provision
     if rule = find_discovery_rule(@host)
       if perform_auto_provision(@host, rule)

data/app/controllers/discovery_rules_controller.rb

@@ -4,7 +4,7 @@ class DiscoveryRulesController < ApplicationController
 
   include Foreman::Controller::Parameters::DiscoveryRule
 
-  before_filter :find_resource, :only => [:edit, :update, :destroy, :enable, :disable, :auto_provision]
+  before_action :find_resource, :only => [:edit, :update, :destroy, :enable, :disable, :auto_provision]
 
   def index
     base = resource_base.search_for(params[:search], :order => (params[:order]))

data/app/controllers/foreman_discovery/concerns/hosts_controller_extensions.rb

@@ -10,7 +10,7 @@ module ForemanDiscovery
       # in the hosts controller like all the _selected methods, taxonomy_scope,
       # etc.. expect a params[:host] to work.
       def set_discovered_params
-        return unless request.path.match(/discovered_hosts/).present?
+        return if params[:discovered_host].nil?
         params[:host] ||= params[:discovered_host]
       end
     end

data/app/helpers/discovered_hosts_helper.rb

@@ -20,12 +20,11 @@ module DiscoveredHostsHelper
         ),
         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');"
+        link_to(_("Expand All"),"#", :id => "expand_all", :class => "btn btn-default"
         )
       ),
       button_group(
-        display_delete_if_authorized(hash_for_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :destroy_discovered_hosts), :class => "btn btn-danger", :data => { :confirm => _('Delete %s?') % host.name })
+        display_delete_if_authorized(hash_for_discovered_host_path(:id => host).merge(:auth_object => host, :permission => :destroy_discovered_hosts), :class => "btn btn-default", :data => { :confirm => _('Delete %s?') % host.name })
       )
     )
   end

data/app/models/discovery_attribute_set.rb

@@ -1,4 +1,4 @@
-class DiscoveryAttributeSet < ActiveRecord::Base
+class DiscoveryAttributeSet < ApplicationRecord
   belongs_to :host, :class_name => "Host::Discovered", :foreign_key => :host_id
 
   validates :cpu_count, :presence => true, :numericality => {:greater_than_or_equal_to => 0}

data/app/models/discovery_rule.rb

@@ -1,4 +1,4 @@
-class DiscoveryRule < ActiveRecord::Base
+class DiscoveryRule < ApplicationRecord
   include Authorizable
   extend FriendlyId
   friendly_id :name

data/app/models/host/discovered.rb

@@ -34,7 +34,7 @@ class Host::Discovered < ::Host::Base
   }
 
   def self.import_host facts
-    raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash)
+    raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash) || facts.is_a?(ActionController::Parameters)
 
     # filter facts
     facts.reject!{|k,v| k =~ /kernel|operatingsystem|osfamily|ruby|path|time|swap|free|filesystem/i }
@@ -67,11 +67,13 @@ class Host::Discovered < ::Host::Base
     host
   end
 
-  def import_facts facts
+  def import_facts(facts)
     # Discovered Hosts won't report in via puppet, so we can use that field to
     # record the last time it sent facts...
     self.last_report = Time.now
-    super
+    # Set the correct facts type for new foreman facts importing code.
+    facts[:_type] = :foreman_discovery if SETTINGS[:version].short > '1.16'
+    super(facts)
   end
 
   def setup_clone
@@ -84,10 +86,23 @@ class Host::Discovered < ::Host::Base
     super
   end
 
-  def populate_fields_from_facts(facts = self.facts_hash, ignored_type = nil)
-    # detect interfaces and primary interface using extensions
-    parser = super(facts, :foreman_discovery)
+  def populate_fields_from_facts(*params)
+    if SETTINGS[:version].short > '1.16'
+      parser, type, source_proxy = params
+      facts = parser.facts
+      # detect interfaces and primary interface using extensions
+      super(parser, type, source_proxy)
+    else
+      # backwards compatibility
+      facts = params[0] || self.facts_hash
+      parser = super(facts, :foreman_discovery)
+    end
+
+    populate_discovery_fields_from_facts(facts)
+    parser
+  end
 
+  def populate_discovery_fields_from_facts(facts)
     # set additional discovery attributes
     primary_ip = self.primary_interface.ip
     unless primary_ip.nil?
@@ -122,7 +137,6 @@ class Host::Discovered < ::Host::Base
     # lock the host into discovery via PXE, if feature is enabled in settings
     lock_templates if Setting::Discovered.discovery_lock? && self.subnet.tftp?
     self.save!
-    parser
   end
 
   def lock_templates
@@ -176,16 +190,8 @@ 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 legacy_api = ForemanDiscovery::HostConverter.legacy_host(self)
-    if legacy_api
-      if proxied?
-        resource = ::ForemanDiscovery::NodeAPI::Power.legacy_proxied_service(:url => proxy_url)
-      else
-        resource = ::ForemanDiscovery::NodeAPI::Power.legacy_direct_service(:url => proxy_url)
-      end
-    else
-      resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => proxy_url)
-    end
+  def reboot 
+    resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => proxy_url)
     resource.reboot
   rescue => e
     ::Foreman::Logging.exception("Unable to reboot #{name}", e)

data/app/models/host/managed_extensions.rb

@@ -9,9 +9,6 @@ module Host::ManagedExtensions
     belongs_to :discovery_rule
 
     scoped_search :relation => :discovery_rule, :on => :name, :rename => :discovery_rule, :complete_value => true
-
-    # extra flag for post_queue callbacks which has no access to facts
-    attr_accessor :legacy_api
   end
 
   def queue_reboot
@@ -27,7 +24,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    old.becomes(Host::Discovered).reboot legacy_api
+    old.becomes(Host::Discovered).reboot
     # 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.
@@ -63,7 +60,7 @@ module Host::ManagedExtensions
 
   def delete_discovery_attribute_set
     return if new_record?
-    DiscoveryAttributeSet.destroy_all(:host_id => self.id) if type_changed?
+    DiscoveryAttributeSet.where(:host_id => self.id).destroy_all if type_changed?
   end
 
   def update_notifications

data/app/services/foreman_discovery/host_converter.rb

@@ -20,8 +20,6 @@ class ForemanDiscovery::HostConverter
   end
 
   def self.set_build_clean_facts(host)
-    # set legacy_api flag for post_queue actions
-    host.legacy_api = self.legacy_host(host)
     # fact cleaning
     if Setting['discovery_clean_facts']
       # clean all facts except those starting with "discovery_"
@@ -37,8 +35,4 @@ class ForemanDiscovery::HostConverter
     host.build = true
   end
 
-  def self.legacy_host(host)
-    Gem::Version.new(host.facts['discovery_version'] || '1.0.0') < Gem::Version.new('3.0.0')
-  end
-
 end

data/app/services/foreman_discovery/node_api/power.rb

@@ -4,14 +4,6 @@ module ForemanDiscovery::NodeAPI
       def service(data)
         ForemanDiscovery::NodeAPI::PowerService.new(data)
       end
-
-      def legacy_direct_service(data)
-        ForemanDiscovery::NodeAPI::PowerLegacyDirectService.new(data)
-      end
-
-      def legacy_proxied_service(data)
-        ForemanDiscovery::NodeAPI::PowerLegacyProxiedService.new(data)
-      end
     end
   end
 end

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

@@ -1,12 +1,11 @@
-<div class="modal" id="<%= "fixedPropertiesSelector-#{host.id}" %>" tabindex="-1" role="dialog" aria-labelledby="fixedPropertiesSelectorLabel">
+<div class="modal fade" 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">
+      <div class="modal-header">
+        <h4 class="modal-title" id="fixedPropertiesSelectorLabel">Select initial host properties</h4>
+      </div>
+      <div class="modal-body">
+        <%= form_for host, :url => edit_discovered_host_path(host), :method => :get do |f| %>
             <%= 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' } %>
@@ -18,12 +17,12 @@
             <% 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>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+        <input type="submit" class="btn btn-default" value="<%= _('Customize Host') %>" />
+        <input type="submit" class="btn btn-primary" value="<%= _('Create Host') %>" name="quick_submit" />
+      </div>
       <% end %>
     </div>
   </div>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-md-8">
+  <div class="col-md-12">
 
     <table class="table table-bordered table-striped">
       <thead>

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

@@ -1,6 +1,7 @@
-<%= render 'selected_hosts', :hosts => @hosts %>
-
 <%= form_tag submit_multiple_destroy_discovered_hosts_path(:host_ids => params[:host_ids]), :onsubmit => "resetSelection()" do -%>
-  <span class="label label-warning"><%= _('Warning') -%></span>
-  <%= _('This might take a while, as all hosts, facts and reports will be destroyed as well') %>
+  <%= alert :class => 'alert-warning',
+  :text => _("This might take a while, as all hosts, facts and reports will be destroyed as well"),
+  :header => '' %>
 <% end %>
+
+<%= render 'selected_hosts', :hosts => @hosts %>

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

@@ -69,7 +69,7 @@
               </a>
             </h4>
           </div>
-          <div id="<%= @categories_names[index].to_s + "panel" %>" class="panel-collapse collapse facts-panel <%= "in" if @categories_names[index].to_s.include?"Storage"%>" role="tabpanel">
+          <div id="<%= @categories_names[index].to_s + "panel" %>" class="panel-collapse collapse facts-panel" role="tabpanel">
             <table class="table table-bordered  table-condensed table-fixed">
             <% val.sort.each do |key, value|  %>
                 <tr class="">
@@ -99,5 +99,13 @@
     $('.flag-provision').append(flags_provision);
     $('.primary-flag').tooltip();
     $('.provision-flag').tooltip();
+
+    $('#expand_all').on('click', function () {
+      $('#accordion .panel-collapse').collapse('toggle');
+      $(this).text(function(i, text){
+          return text === "Expand All" ? "Collapse All" : "Expand All";
+      })
+    });
+
   });
 </script>

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

@@ -0,0 +1,10 @@
+<% content_for(:title, _("Discovered Hosts")) %>
+<div class="blank-slate-pf">
+  <div class="blank-slate-pf-icon">
+    <%= icon_text("gears", "", :kind => "fa") %>
+  </div>
+  <h1><%= _('Discovered Hosts') %></h1>
+  <p><%= _("No discovered hosts found in this context.") %>
+  <%= _("This page shows discovered bare-metal or virtual nodes waiting to be provisioned.") %></p>
+  <p><%= link_to _('Learn more about this in the documentation.'), documentation_url("#{ForemanDiscovery::VERSION.scan(/\d+\.\d+/).first}/index.html", {:root_url => 'https://theforeman.org/plugins/foreman_discovery/'})%></p>
+</div>

data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb

@@ -1,4 +1,4 @@
-class FakeDiscoveredHost < ActiveRecord::Base
+class FakeDiscoveredHost < ApplicationRecord
   self.table_name = 'hosts'
 end
 

data/db/migrate/20150714144500_review_discovery_permissions.rb

@@ -1,12 +1,14 @@
 class ReviewDiscoveryPermissions < ActiveRecord::Migration
   def up
-    if (mgr = Role.find_by_name("Discovery Manager"))
-      perms = []
-      perms << "submit_discovered_hosts" if Permission.find_by_name("edit_discovered_hosts")
-      perms << "auto_provision_discovered_hosts" if Permission.find_by_name("provision_discovered_hosts")
-      perms << "create_discovery_rules" if Permission.find_by_name("new_discovery_rules")
-      perms << "destroy_discovery_rules" if Permission.find_by_name("delete_discovery_rules")
-      mgr.add_permissions!(perms)
+    Role.ignore_locking do
+      if (mgr = Role.find_by_name("Discovery Manager"))
+        perms = []
+        perms << "submit_discovered_hosts" if Permission.find_by_name("edit_discovered_hosts")
+        perms << "auto_provision_discovered_hosts" if Permission.find_by_name("provision_discovered_hosts")
+        perms << "create_discovery_rules" if Permission.find_by_name("new_discovery_rules")
+        perms << "destroy_discovery_rules" if Permission.find_by_name("delete_discovery_rules")
+        mgr.add_permissions!(perms)
+      end
     end
     Permission.find_by_name("new_discovery_rules").try(:destroy)
   end

data/db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb

@@ -7,9 +7,6 @@ class AddConstraintsOnSubnetsSmartProxies < ActiveRecord::Migration
       ActiveRecord::Migration.execute "SET FOREIGN_KEY_CHECKS=0;"
     end
 
-    # if there's some wrong key already, clean the foreign key first
-    Subnet.unscoped.where(["discovery_id IS NOT NULL AND discovery_id NOT IN (?)", SmartProxy.unscoped.pluck(:id)]).update_all(:discovery_id => nil)
-
     add_foreign_key "subnets", "smart_proxies", :name => "subnets_discovery_id_fk", :column => "discovery_id"
     
     # turn on Foreign Key checks in MySQL only