foreman_discovery 1.4.1 → 2.0.0.rc1

data/app/models/host/discovered.rb

@@ -1,14 +1,19 @@
-require 'foreman_discovery/facts'
+require 'foreman_discovery/proxy_operations'
 
 class Host::Discovered < ::Host::Base
+  include ScopedSearchExtensions
 
   belongs_to :location
   belongs_to :organization
   belongs_to :subnet
   belongs_to :hostgroup
+  has_one    :discovery_attribute_set, :foreign_key => :host_id, :dependent => :destroy
 
-  validates :mac, :uniqueness => true, :format => {:with => Net::Validations::MAC_REGEXP}, :presence => true
+  validates :mac, :uniqueness => true, :mac_address => true, :presence => true
   validates :ip, :format => {:with => Net::Validations::IP_REGEXP}, :uniqueness => true
+  validates :discovery_attribute_set, :presence => true
+
+  delegate :memory, :cpu_count, :disk_count, :disks_size, :to => :discovery_attribute_set
 
   scoped_search :on => :name, :complete_value => true, :default_order => true
   scoped_search :on => :last_report, :complete_value => true
@@ -19,6 +24,10 @@ class Host::Discovered < ::Host::Base
   scoped_search :in => :location, :on => :name, :rename => :location, :complete_value => true         if SETTINGS[:locations_enabled]
   scoped_search :in => :organization, :on => :name, :rename => :organization, :complete_value => true if SETTINGS[:organizations_enabled]
   scoped_search :in => :subnet, :on => :network, :complete_value => true, :rename => :subnet
+  scoped_search :in => :discovery_attribute_set, :on => :cpu_count, :rename => :cpu_count, :complete_value => true, :only_explicit => true
+  scoped_search :in => :discovery_attribute_set, :on => :memory, :rename => :memory, :complete_value => true, :only_explicit => true
+  scoped_search :in => :discovery_attribute_set, :on => :disk_count, :rename => :disk_count, :complete_value => true, :only_explicit => true
+  scoped_search :in => :discovery_attribute_set, :on => :disks_size, :rename => :disks_size, :complete_value => true, :only_explicit => true
 
   default_scope lambda {
     org = Organization.current
@@ -31,8 +40,11 @@ class Host::Discovered < ::Host::Base
 
   def self.import_host_and_facts facts
     raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash)
-    fact_name = Setting[:discovery_fact] || 'macaddress'
-    hostname = facts[fact_name].try(:downcase).try(:gsub,/:/,'').try(:sub,/^/,'mac')
+    fact_name = Setting[:discovery_fact] || 'discovery_bootif'
+    prefix_from_settings = Setting[:discovery_prefix]
+    hostname_prefix = prefix_from_settings if prefix_from_settings.present? && prefix_from_settings.match(/^[a-zA-Z].*/)
+    hostname_prefix ||= 'mac'
+    hostname = facts[fact_name].try(:downcase).try(:gsub,/:/,'').try(:sub,/^/, hostname_prefix)
     raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain the required fact '%s'"), fact_name)) unless hostname
     raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain IP address"))) unless facts['ipaddress']
 
@@ -83,26 +95,71 @@ class Host::Discovered < ::Host::Base
       importer = super(facts)
     end
     self.subnet = Subnet.subnet_for(importer.ip)
+    self.discovery_attribute_set = DiscoveryAttributeSet.where(:host_id => id).first_or_create
+    self.discovery_attribute_set.update_attributes(import_from_facts)
     self.save
   end
 
+  def import_from_facts(facts = self.facts_hash)
+    cpu_count  = facts['physicalprocessorcount'].to_i rescue 0
+    memory     = facts['memorysize_mb'].to_f.ceil rescue 0
+    disks      = facts.select { |key, value| key.to_s =~ /blockdevice.*_size/ }
+    disks_size = 0
+    disk_count = 0
+
+    if disks.any?
+      disks.values.each { |size| disks_size += (size.to_f rescue 0) }
+      disk_count = disks.size
+      disks_size = disks_size.ceil
+    end
+
+    {:cpu_count => cpu_count, :memory => memory, :disk_count => disk_count, :disks_size => disks_size}
+  end
+
   # no need to store anything in the db if the password is our default
   def root_pass
     read_attribute(:root_pass).blank? ? (hostgroup.try(:root_pass) || Setting[:root_pass]) : read_attribute(:root_pass)
   end
 
+  def proxy_url
+    if subnet.present? && subnet.discovery.present?
+      { :url => subnet.discovery.url + "/discovery/#{self.ip}", :type => 'proxy'}
+    else
+      { :url => "http://#{self.ip}:8443", :type => 'foreman' }
+    end
+  end
+
   def refresh_facts
     # TODO: Can we rely on self.ip? The lease might expire/change....
     begin
-      logger.debug "retrieving facts from proxy on ip: #{self.ip}"
-      facts = ForemanDiscovery::Facts.new(:url => "http://#{self.ip}:8443").facts
+      logger.debug "retrieving facts from proxy from url: #{proxy_url[:url]}"
+      facts = ForemanDiscovery::ProxyOperations.new(:url => proxy_url[:url], :operation => 'facts').parse_get_operation
     rescue Exception => e
-      raise _("Could not get facts from proxy: %s") % e
+      raise _("Could not get facts from proxy %{url}: %{error}") % {:url => proxy_url[:url], :error => e}
     end
 
     return self.class.import_host_and_facts facts
   end
 
+  def reboot
+    logger.info "ForemanDiscovery: Rebooting #{name}"
+    proxy_url = self.proxy_url
+
+    if proxy_url[:type] == 'proxy'
+      status = ForemanDiscovery::ProxyOperations.new(:url => proxy_url[:url], :operation => 'reboot').parse_put_operation
+    else
+      status = ::ProxyAPI::BMC.new(:url => "http://#{self.ip}:8443").power :action => "cycle"
+    end
+
+    msg = status ? 'successful' : 'failed'
+    logger.info "ForemanDiscovery: reboot result: #{msg}"
+    status
+    rescue => e
+      logger.info "ForemanDiscovery: reboot result: failed"
+      logger.warn e.backtrace.join('\n')
+      raise e
+  end
+
   def self.model_name
     ActiveModel::Name.new(Host)
   end

data/app/models/host/managed_extensions.rb

@@ -4,6 +4,8 @@ module Host::ManagedExtensions
   included do
     # execute standard callbacks
     after_validation :queue_reboot
+
+    belongs_to :discovery_rule
   end
 
   def queue_reboot
@@ -14,14 +16,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    logger.info "ForemanDiscovery: Rebooting #{name} as its being discovered and assigned"
-    if ::ProxyAPI::BMC.new(:url => "http://#{old.try(:ip) || ip}:8443").power :action => "cycle"
-      logger.info "ForemanDiscovery: reboot result: successful"
-    else
-      logger.info "ForemanDiscovery: reboot result: failed"
-    end
-  rescue => e
-    failure _("Failed to reboot: %s") % e.message
+    old.becomes(Host::Discovered).reboot
   end
 
   def delReboot

data/app/models/hostgroup_extensions.rb

@@ -0,0 +1,7 @@
+module HostgroupExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :discovery_rules
+  end
+end

data/app/models/setting/discovered.rb

@@ -1,6 +1,7 @@
 class Setting::Discovered < ::Setting
   BLANK_ATTRS << "discovery_location"
   BLANK_ATTRS << "discovery_organization"
+  BLANK_ATTRS << "discovery_fact_column"
 
   def self.load_defaults
     # Check the table exists
@@ -9,6 +10,19 @@ class Setting::Discovered < ::Setting
     Setting.transaction do
       [
         self.set('discovery_fact', _("The default fact name to use for the MAC of the system"), "discovery_bootif"),
+        self.set('discovery_auto', _("Automatically provision newly discovered hosts, according to the provisioning rules"), false),
+      ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
+    end
+
+    Setting.transaction do
+      [
+        self.set('discovery_prefix', _("The default prefix to use for the host name, must start with a letter"), "mac"),
+      ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
+    end
+
+    Setting.transaction do
+      [
+        self.set('discovery_fact_column', _("Show fact as an extra column in the discovered hosts list"), ""),
       ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
     end
 

data/app/overrides/subnet_form_with_discovery_proxy.rb

@@ -0,0 +1,9 @@
+selector_text = " <%= select_f f, :discovery_id, SmartProxy.with_features('Discovery'), :id, :name,
+                    {:include_blank => _('None')},
+                    :label => _('Discovery Proxy'),
+                    :help_inline => _('Discovery Proxy to use within this subnet for managing connection to discovered hosts') %>"
+
+Deface::Override.new(:virtual_path  => "subnets/_form",
+                     :name          => "add_discovery_proxy_to_subnet",
+                     :insert_bottom => 'div#proxies',
+                     :text          =>  selector_text)

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

@@ -0,0 +1,3 @@
+object @discovered_host
+
+extends "api/v2/hosts/main"

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

@@ -0,0 +1,3 @@
+object @discovered_host
+
+extends "api/v2/hosts/main"

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

@@ -2,7 +2,7 @@ object @discovered_host
 
 extends "api/v2/discovered_hosts/base"
 
-attributes :ip, :mac, :last_report, :subnet_id, :subnet_name
+attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :cpu, :memory, :disk_count, :disks_size
 
 if SETTINGS[:organizations_enabled]
   attributes :organization_id, :organization_name

data/app/views/api/v2/discovery_rules/base.json.rabl

@@ -0,0 +1,3 @@
+object @discovery_rule
+
+attributes :id, :name

data/app/views/api/v2/discovery_rules/index.json.rabl

@@ -0,0 +1,3 @@
+collection @discovery_rules
+
+extends "api/v2/discovery_rules/main"

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

@@ -0,0 +1,5 @@
+object @discovery_rule
+
+extends "api/v2/discovery_rules/base"
+
+attributes :name, :enabled, :hostgroup_id, :hostname, :max_count, :priority, :search

data/app/views/api/v2/discovery_rules/show.json.rabl

@@ -0,0 +1,3 @@
+object @discovery_rule
+
+extends "api/v2/discovery_rules/main"

data/app/views/dashboard/_discovery_widget.html.erb

@@ -1,16 +1,10 @@
 <h4 class="ca"><%= _('Discovered Host Pool') %> - <%= @current_permission %></h4>
-<% all_hosts = Host::Discovered.search_for '' %>
+<% all_hosts = Host::Discovered.includes(:model).includes(:discovery_attribute_set).scoped %>
 <% hosts = all_hosts.limit(5) %>
 <% if hosts.empty? %>
-  <p class="ca"><%= _("No discovered hosts available") %></p>
+   <p class="ca"><%= _("No discovered hosts available") %></p>
 <% else %>
-  <table class="table table-striped ellipsis">
-    <% hosts.each do |host| %>
-      <tr>
-        <td><%= link_to h(host.name), discovered_host_path(host) %></td>
-        <td><%= host.ip  %></td>
-      </tr>
-    <% end %>
-  </table>
-  <p class="ca"><%= link_to n_("Total pool size","Total pool size", all_hosts.size), discovered_hosts_path %> - <%= all_hosts.size %> </p>
+    <%= render :partial => 'discovery_widget_host_list', :locals => { :hosts => hosts } %>
+    <p class="ca"><%= link_to n_("Total pool size", "Total pool size", all_hosts.size), discovered_hosts_path %>
+      - <%= all_hosts.size %> </p>
 <% end %>

data/app/views/dashboard/_discovery_widget_host_list.html.erb

@@ -0,0 +1,17 @@
+<table class="table table-striped ellipsis">
+  <thead>
+  <th><%= _('Host') %></th>
+  <th><%= _('Model') %></th>
+  <th><%= _('IP Address') %></th>
+  <th><%= _('CPU') %></th>
+  <th><%= _('Memory') %></th>
+  </thead>
+  <tbody>
+  <% hosts.each do |host| %>
+    <tr>
+      <%= render :partial => "discovered_hosts/discovered_host", :locals => {
+        :host => host, :hide_disk => true } %>
+  </tr>
+  <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,12 @@
+<td><%= link_to h(host.name), discovered_host_path(host) %></td>
+<td class="hidden-tablet hidden-xs"><%= model_name host %></td>
+<td class="hidden-tablet hidden-xs"><%= host.ip %></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>
+<% unless defined? hide_disk %>
+<td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :disk_count) %></td>
+<td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :disks_size, 0)) %></td>
+<% if Setting['discovery_fact_column'].present? %>
+  <td class="hidden-tablet hidden-xs"><%= host.facts_hash[Setting['discovery_fact_column']] || 'N/A' %></td>
+<% end %>
+<% end %>

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

@@ -5,6 +5,14 @@
     <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "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 :cpu_count, :as => _('CPU') %></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>
+    <th class="hidden-tablet hidden-xs"><%= sort :disks_size, :as => _('Disks size') %></th>
+    <% if Setting['discovery_fact_column'].present? %>
+      <th class="hidden-tablet hidden-xs"><%= Setting['discovery_fact_column'].capitalize %></th>
+    <% end %>
     <% if SETTINGS[:locations_enabled] -%>
       <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>
     <% end -%>
@@ -20,8 +28,7 @@
       <td class="ca">
         <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized?, :class => 'host_select_boxes', :onclick => 'hostChecked(this)' -%>
       </td>
-      <td><%= link_to("#{host}", discovered_host_path(host) ) %> </td>
-      <td class="hidden-tablet hidden-xs"><%= model_name host %></td>
+      <%= render :partial => "discovered_host", :locals => {:host => host} %>
       <% if SETTINGS[:locations_enabled] -%>
         <td class="hidden-tablet hidden-xs"><%= host.location.try(:name) %></td>
       <% end -%>
@@ -33,7 +40,9 @@
       <td>
         <%= action_buttons(
           link_to(_("Provision"), hash_for_edit_discovered_host_path(:id => host)),
+          link_to(_("Auto Provision"), hash_for_auto_provision_discovered_host_path(:id => host), :method => :post),
           link_to(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host)),
+          link_to(_("Reboot"), hash_for_reboot_discovered_host_path(:id => host), :method => :put),
           display_delete_if_authorized(hash_for_discovered_host_path(:id => host), :confirm => _("Delete %s?") % host.name, :action => :destroy))%>
         </td>
       </tr>

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

@@ -1,2 +1,3 @@
 <% title_actions multiple_discovered_hosts_actions_select -%>
+<% title_actions display_link_if_authorized(_("Auto Provision All"), hash_for_auto_provision_all_discovered_hosts_path, {:method => :post, :disabled => @hosts.empty?}) %>
 <%= render 'discovered_hosts_list' %>

data/app/views/discovery_rules/_form.html.erb

@@ -0,0 +1,14 @@
+<%= form_for @discovery_rule, :url => (@discovery_rule.new_record? ? discovery_rules_path : discovery_rule_path(:id => @discovery_rule.id)) do |f| %>
+  <%= base_errors_for @discovery_rule %>
+  <%= text_f f, :name %>
+  <%= autocomplete_f f, :search,
+                     :path => "discovered_hosts",
+                     :control_group_id => 'search_group', :size => 'col-md-9' %>
+  <%= select_f f, :hostgroup_id, accessible_hostgroups, :id, :to_label, { :include_blank => false },
+    { :help_inline => _('Target host group for this rule with all properties set')} %>
+  <%= text_f f, :hostname, :help_inline => _('Target hostname template pattern (empty for MAC)')  %>
+  <%= text_f f, :max_count, :label => _('Hosts limit'), :help_inline => _('Maximum hosts provisioned with this rule (0 = unlimited)') %>
+  <%= text_f f, :priority, :help_inline => _('Rule priority (lower integer means higher priority)')  %>
+  <%= checkbox_f f, :enabled %>
+  <%= submit_or_cancel f %>
+<% end %>

data/app/views/discovery_rules/edit.html.erb

@@ -0,0 +1,3 @@
+<% title _("Edit Discovery Rule") %>
+
+<%= render :partial => 'form' %>

data/app/views/discovery_rules/index.html.erb

@@ -0,0 +1,26 @@
+<% title _("Discovery Rules") %>
+<% title_actions display_link_if_authorized(_("New Rule"), hash_for_new_discovery_rule_path), help_path %>
+
+<table class="table table-bordered table-striped table-two-pane">
+  <tr>
+    <th><%= sort :name, :as => s_("DiscoveryRule|Name") %></th>
+    <th><%= sort :priority, :as => s_("DiscoveryRule|Priority") %></th>
+    <th><%= sort :search, :as => s_("DiscoveryRule|Query") %></th>
+    <th><%= _("Host group") %></th>
+    <th><%= _("Hosts/limit") %></th>
+    <th><%= sort :enabled, :as => s_("DiscoveryRule|Enabled") %></th>
+    <th></th>
+  </tr>
+  <% for rule in @discovery_rules %>
+    <tr>
+      <td class='col-md-3'><%= link_to_if_authorized(trunc(rule.name), hash_for_edit_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer)) %></td>
+      <td><%= rule.priority %></td>
+      <td><%= rule.search %></td>
+      <td><%= rule.hostgroup.name %></td>
+      <td><%= rule.hosts.count %> / <%= rule.max_count %></td>
+      <td><%= rule.enabled %></td>
+      <td><%= action_buttons(*permitted_discovery_actions(rule)) %></td>
+    </tr>
+  <% end %>
+</table>
+<%= will_paginate_with_info @discovery_rules %>

data/app/views/discovery_rules/new.html.erb

@@ -0,0 +1,3 @@
+<% title _("New Discovery Rule") %>
+
+<%= render :partial => 'form' %>

data/config/routes.rb

@@ -10,6 +10,8 @@ Rails.application.routes.draw do
     resources :discovered_hosts do
       member do
         get 'refresh_facts'
+        put 'reboot'
+        post 'auto_provision'
       end
       collection do
         get 'multiple_destroy'
@@ -19,18 +21,35 @@ Rails.application.routes.draw do
         get  'select_multiple_location'
         post 'update_multiple_location'
         get  'auto_complete_search'
+        post 'auto_provision_all'
       end
     end
   end
 
+  resources :discovery_rules, :except => [:show] do
+    member do
+      get :enable
+      get :disable
+    end
+  end
+
   ## API
   namespace :api, :defaults => {:format => 'json'} do
     scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
       resources :discovered_hosts, :except => [:new, :edit] do
+        member do
+          post 'auto_provision'
+          put 'reboot'
+        end
         collection do
           post 'facts'
+          post 'auto_provision_all'
+        end
+        member do
+          put 'refresh_facts'
         end
       end
+      resources :discovery_rules, :except => [:new, :edit]
     end
   end
 

data/db/migrate/20141107091416_create_discovery_rules.rb

@@ -0,0 +1,15 @@
+class CreateDiscoveryRules < ActiveRecord::Migration
+  def change
+    create_table :discovery_rules do |t|
+      t.string :name, :length => 254
+      t.string :search, :length => 254
+      t.integer :hostgroup_id, :null => false
+      t.string :hostname, :length => 254, :default => ''
+      t.integer :max_count, :default => 0
+      t.integer :priority, :default => 0
+      t.boolean :enabled, :default => true, :null => false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20141107091417_add_discovery_rule_to_host.rb

@@ -0,0 +1,9 @@
+class AddDiscoveryRuleToHost < ActiveRecord::Migration
+  def self.up
+    add_column :hosts, :discovery_rule_id, :integer
+  end
+
+  def self.down
+    remove_column :hosts, :discovery_rule_id, :integer
+  end
+end