foreman_discovery 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b30c810a94650d5f72b8592168e2f2afd5d0854
-  data.tar.gz: 77645786d40659c4205c4f02ed2eb0a426f3fb62
+  metadata.gz: 4867b305c73d5a8a992739eb70afeb56d9f81208
+  data.tar.gz: 5c458bfbefdec94578c3a7d2be4247352e3e9e82
 SHA512:
-  metadata.gz: fc9544ac861a5a08b494b8a9089fbc4ce25bc2641f79877f85636927cb4d702ffd9b01d6bf266b0574068ae69d66884e7c71223159984e6e61fe8d445d7b4e49
-  data.tar.gz: bee1405da6e16b59b45fad2d4eb88da763b3af79e12de6fd1b1e24e95931ee69054d49796d83a58dac87ed1107a0d055b2434ad78853248a4174bc60792b9f94
+  metadata.gz: bd114518a9ae24804c244261ae205a10d913493d72128233d7d68927d1f0ffe98926569c799ce904e6fbbbececed87a100e8daf19724e10fa3bcb80cce9dea3d
+  data.tar.gz: 37e81bd18f86d2e3ab0a3460f55a2e88ae44dc768a804bac5347e269b7350d450aa62b11a1df6ff50c2371ee76ba7b2429d2c37c2a795203aba9c7884d2e1a3d

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

@@ -105,11 +105,13 @@ module Api
         Host.transaction do
           @discovered_host, state = Host::Discovered.import_host_and_facts(params[:facts])
         end
-        @discovered_host.transaction do
-          if state && rule = find_discovery_rule(@discovered_host)
-            state = perform_auto_provision(@discovered_host, rule) if Setting['discovery_auto']
-          else
-            Rails.logger.warn "Discovered facts import unsuccessful, skipping auto provisioning" if Setting['discovery_auto']
+        if Setting['discovery_auto']
+          @discovered_host.transaction do
+            if state && rule = find_discovery_rule(@discovered_host)
+              state = perform_auto_provision(@discovered_host, rule)
+            else
+              Rails.logger.warn "Discovered facts import unsuccessful, skipping auto provisioning"
+            end
           end
         end
         process_response state

data/app/controllers/concerns/foreman/controller/discovered_extensions.rb

@@ -33,10 +33,14 @@ module Foreman::Controller::DiscoveredExtensions
     host.type = 'Host::Managed'
     host.managed = true
     host.build = true
-    host.name = host.render_template(rule.hostname) unless rule.hostname.empty?
     host.hostgroup_id = rule.hostgroup_id
     host.comment = "Auto-discovered and provisioned via rule '#{rule.name}'"
     host.discovery_rule = rule
+    # render hostname only when all other fields are set
+    original_name = host.name
+    host.name = host.render_template(rule.hostname) unless rule.hostname.empty?
+    # fallback to the original if template did not expand
+    host.name = original_name if host.name.empty?
     Host.transaction do
       if host.save #save! does not work here
         delete_discovery_attribute_set(host.id)

data/app/controllers/discovered_hosts_controller.rb

@@ -240,7 +240,7 @@ class DiscoveredHostsController < ::ApplicationController
   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.where("id IN (?) or name IN (?)", params[:host_ids], params[:host_names] )
+      @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

data/app/models/discovery_rule.rb

@@ -12,8 +12,8 @@ class DiscoveryRule < ActiveRecord::Base
   validates :hostname, :format => { :with => /\A[a-zA-Z<]/, :message => N_("must start with a letter or ERB.") },
     :allow_blank => true
   validates :hostgroup_id, :presence => true
-  validates :max_count, :numericality => { only_integer: true }
-  validates :priority, :presence => true, numericality: true
+  validates :max_count, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0 }
+  validates :priority, :presence => true, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0 }
   validates_lengths_from_database
 
   belongs_to :hostgroup
@@ -21,4 +21,6 @@ class DiscoveryRule < ActiveRecord::Base
 
   scoped_search :on => :name, :complete_value => :true
   scoped_search :on => :priority
+  scoped_search :on => :search
+  scoped_search :on => :enabled
 end

data/app/models/host/discovered.rb

@@ -54,7 +54,16 @@ class Host::Discovered < ::Host::Base
     h = ::Host::Discovered.find_by_name hostname
     h ||= Host.new :name => hostname, :type => "Host::Discovered"
     h.type = "Host::Discovered"
-    h.mac = facts[fact_name].try(:downcase)
+
+    macfact = facts[fact_name].try(:downcase)
+    begin
+      macfact = Net::Validations.normalize_mac(macfact)
+    rescue ArgumentError => e
+      macfact = facts['discovery_bootif'].try(:downcase)
+      h.name = facts['discovery_bootif'].try(:downcase).try(:gsub,/:/,'').try(:sub,/^/, hostname_prefix)
+    end
+    h.mac = macfact
+
 
     if SETTINGS[:locations_enabled]
       begin
@@ -110,7 +119,8 @@ class Host::Discovered < ::Host::Base
     if disks.any?
       disks.values.each { |size| disks_size += (size.to_f rescue 0) }
       disk_count = disks.size
-      disks_size = disks_size.ceil
+      # Turning disks_size to closest Mega for easier to read UI
+      disks_size = (disks_size / 1024 / 1024).ceil if disks_size > 0
     end
 
     {:cpu_count => cpu_count, :memory => memory, :disk_count => disk_count, :disks_size => disks_size}

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, :cpu, :memory, :disk_count, :disks_size
+attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :memory, :disk_count, :disks_size
+attribute :cpu_count => :cpus
 
 if SETTINGS[:organizations_enabled]
   attributes :organization_id, :organization_name

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

@@ -3,7 +3,7 @@
   <th><%= _('Host') %></th>
   <th><%= _('Model') %></th>
   <th><%= _('IP Address') %></th>
-  <th><%= _('CPU') %></th>
+  <th><%= _('CPUs') %></th>
   <th><%= _('Memory') %></th>
   </thead>
   <tbody>

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

@@ -5,7 +5,7 @@
 <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>
+<td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :disks_size, 0) * 1024 * 1024) %></td>
 <% if Setting['discovery_fact_column'].present? %>
   <td class="hidden-tablet hidden-xs"><%= host.facts_hash[Setting['discovery_fact_column']] || 'N/A' %></td>
 <% end %>

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

@@ -6,7 +6,7 @@
     <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 :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>
     <th class="hidden-tablet hidden-xs"><%= sort :disks_size, :as => _('Disks size') %></th>

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

@@ -6,7 +6,27 @@
                      :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, :hostname, :help_inline => popover(
+    _("Template"),
+    "<div>" +
+    _("Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB).") +
+    "</div>"+
+    "<div>" +
+    _("Domain will be appended automatically. A hostname based on MAC address will be used when left blank. In addition to @host attribute function rand for random integers is available. Examples:") +
+    "</div>"+
+    "<pre>"+
+    "myhost-&lt;%= rand(99999) %&gt;" + "\n\n" +
+    "abc-&lt;%= @host.facts['bios_vendor'] + " + "\n" +
+    " '-' + rand(99999) %&gt;" + "\n\n" +
+    "xyz-&lt;%= @host.hostgroup.name %&gt;" + "\n\n" +
+    "srv-&lt;%= @host.discovery_rule.name %&gt;" + "\n\n" +
+    "server-&lt;%= @host.ip.gsub('.','-') + " + "\n" +
+    " '-' + @host.hostgroup.subnet.name %&gt;" + "\n" +
+    "</pre>"+
+    "</div>"+
+    "<div>"+
+    _("When creating hostname patterns, make sure the resulting host names are unique. Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID).") +
+    "</div>", :title => _("Hostname for provisioned hosts")).html_safe %>
   <%= 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 %>

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

@@ -13,7 +13,7 @@
   </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 class='col-md-3 display-two-pane'><%= link_to_if_authorized(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>

data/lib/foreman_discovery/engine.rb

@@ -36,7 +36,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.6'
+        requires_foreman '~> 1.7.0'
 
         # discovered hosts permissions
         security_block :discovery do
@@ -104,13 +104,7 @@ module ForemanDiscovery
         widget 'discovery_widget', :name=>N_('Discovery widget'), :sizex => 7, :sizey =>1
 
         # add template helpers
-        allowed_template_helpers :rand, :facts_hash
-
-        # apipie API documentation
-        # Only available in 1.8, otherwise it has to be in the initializer below
-        if (SETTINGS[:version].to_s.include?('develop') or Gem::Version.new(SETTINGS[:version]) >= Gem::Version.new('1.8'))
-          apipie_documented_controllers ["#{ForemanDiscovery::Engine.root}/app/controllers/api/v2/*.rb"]
-        end
+        allowed_template_helpers :rand
       end
     end
 

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/locale/foreman_discovery.pot

@@ -1,21 +1,22 @@
-# Template file for strings which can be localized in the Foreman Application.
-#
-# This file is distributed under the same license as the Foreman.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: version 0.0.1\n"
+"Project-Id-Version: foreman 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-20 08:33+0100\n"
-"PO-Revision-Date: 2013-03-01 15:45-0500\n"
-"Last-Translator: \n"
-"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
+"POT-Creation-Date: 2015-01-28 17:53+0100\n"
+"PO-Revision-Date: 2015-01-28 17:53+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 msgid "%s - The following hosts are about to be changed"
 msgstr ""
@@ -32,15 +33,30 @@ msgstr ""
 msgid "Assign Organization"
 msgstr ""
 
+msgid "Auto Provision"
+msgstr ""
+
+msgid "Auto Provision All"
+msgstr ""
+
+msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
+msgstr ""
+
+msgid "CPUs"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
-msgid "Could not get facts from proxy: %s"
+msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
 msgid "Create a discovered host"
 msgstr ""
 
+msgid "Create a discovery rule"
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
@@ -50,12 +66,21 @@ msgstr ""
 msgid "Delete a discovered host"
 msgstr ""
 
+msgid "Delete a rule"
+msgstr ""
+
 msgid "Delete hosts"
 msgstr ""
 
 msgid "Destroyed selected hosts"
 msgstr ""
 
+msgid "Disable"
+msgstr ""
+
+msgid "Disable rule?"
+msgstr ""
+
 msgid "Discovered Host Pool"
 msgstr ""
 
@@ -65,9 +90,57 @@ msgstr ""
 msgid "Discovered hosts"
 msgstr ""
 
+msgid "Discovered hosts are provisioning now"
+msgstr ""
+
+msgid "Discovery Rules"
+msgstr ""
+
+msgid "Discovery rules"
+msgstr ""
+
 msgid "Discovery widget"
 msgstr ""
 
+msgid "DiscoveryRule|Enabled"
+msgstr ""
+
+msgid "DiscoveryRule|Name"
+msgstr ""
+
+msgid "DiscoveryRule|Priority"
+msgstr ""
+
+msgid "DiscoveryRule|Query"
+msgstr ""
+
+msgid "Disk count"
+msgstr ""
+
+msgid "Disks size"
+msgstr ""
+
+msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank. In addition to @host attribute function rand for random integers is available. Examples:"
+msgstr ""
+
+msgid "Edit Discovery Rule"
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Enable rule?"
+msgstr ""
+
+msgid "Errors during auto provisioning: %s"
+msgstr ""
+
+msgid "Execute rules against a discovered host"
+msgstr ""
+
+msgid "Execute rules against all currently discovered hosts"
+msgstr ""
+
 msgid "Fact"
 msgstr ""
 
@@ -77,19 +150,49 @@ msgstr ""
 msgid "Facts refreshed for %s"
 msgstr ""
 
-msgid "Failed to import facts for Host::Discovered"
+msgid "Failed to auto provision host %s: %s"
+msgstr ""
+
+msgid "Failed to import facts for discovered host"
+msgstr ""
+
+msgid "Failed to import facts for discovered host: %s"
 msgstr ""
 
-msgid "Failed to import facts for Host::Discovered: %s"
+msgid "Failed to reboot host %s"
 msgstr ""
 
-msgid "Failed to reboot: %s"
+msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
 msgid "Failed to refresh facts for %s"
 msgstr ""
 
-msgid "Imported Host::Discovered"
+msgid "Host"
+msgstr ""
+
+msgid "Host %{host} was provisioned with rule %{rule}"
+msgstr ""
+
+msgid "Host group"
+msgstr ""
+
+msgid "Host of type %s can not be rebooted"
+msgstr ""
+
+msgid "Hostname for provisioned hosts"
+msgstr ""
+
+msgid "Hosts limit"
+msgstr ""
+
+msgid "Hosts/limit"
+msgstr ""
+
+msgid "IP Address"
+msgstr ""
+
+msgid "Imported discovered host"
 msgstr ""
 
 msgid "Invalid facts, must be a Hash"
@@ -107,24 +210,48 @@ msgstr ""
 msgid "List all discovered hosts"
 msgstr ""
 
+msgid "List all discovery rules"
+msgstr ""
+
 msgid "Location"
 msgstr ""
 
+msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
+msgstr ""
+
+msgid "Memory"
+msgstr ""
+
 msgid "Model"
 msgstr ""
 
+msgid "N/A"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
+msgid "New Discovery Rule"
+msgstr ""
+
+msgid "New Rule"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
+msgid "No discovered hosts to provision"
+msgstr ""
+
 msgid "No hosts selected"
 msgstr ""
 
 msgid "No hosts were found with that id or name"
 msgstr ""
 
+msgid "No rule found for host %s"
+msgstr ""
+
 msgid "Organization"
 msgstr ""
 
@@ -137,12 +264,33 @@ msgstr ""
 msgid "Provision a discovered host"
 msgstr ""
 
+msgid "Reboot"
+msgstr ""
+
 msgid "Rebooting %s"
 msgstr ""
 
+msgid "Rebooting a discovered host"
+msgstr ""
+
+msgid "Rebooting host %s"
+msgstr ""
+
 msgid "Refresh facts"
 msgstr ""
 
+msgid "Refreshing the facts of a discovered host"
+msgstr ""
+
+msgid "Rule disabled"
+msgstr ""
+
+msgid "Rule enabled"
+msgstr ""
+
+msgid "Rule priority (lower integer means higher priority)"
+msgstr ""
+
 msgid "Select Action"
 msgstr ""
 
@@ -158,15 +306,30 @@ msgstr ""
 msgid "Show a discovered host"
 msgstr ""
 
+msgid "Show a discovery rule"
+msgstr ""
+
+msgid "Show fact as an extra column in the discovered hosts list"
+msgstr ""
+
 msgid "Something went wrong while selecting hosts - %s"
 msgstr ""
 
+msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
+msgstr ""
+
 msgid "Submit"
 msgstr ""
 
 msgid "Subnet"
 msgstr ""
 
+msgid "Target host group for this rule with all properties set"
+msgstr ""
+
+msgid "Template"
+msgstr ""
+
 msgid "The default fact name to use for the MAC of the system"
 msgstr ""
 
@@ -176,6 +339,9 @@ msgstr ""
 msgid "The default organization to place discovered hosts in"
 msgstr ""
 
+msgid "The default prefix to use for the host name, must start with a letter"
+msgstr ""
+
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
@@ -190,6 +356,9 @@ msgstr[1] ""
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
+msgid "Update a rule"
+msgstr ""
+
 msgid "Upload facts for a host, creating the host if required"
 msgstr ""
 
@@ -199,6 +368,12 @@ msgstr ""
 msgid "Warning"
 msgstr ""
 
+msgid "When creating hostname patterns, make sure the resulting host names are unique. Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
+msgstr ""
+
+msgid "can't contain white spaces."
+msgstr ""
+
 msgid "filter results"
 msgstr ""
 
@@ -208,6 +383,9 @@ msgstr ""
 msgid "items selected. Uncheck to Clear"
 msgstr ""
 
+msgid "must start with a letter or ERB."
+msgstr ""
+
 msgid "not required if it's a virtual machine"
 msgstr ""
 
@@ -220,5 +398,8 @@ msgstr ""
 msgid "paginate results"
 msgstr ""
 
+msgid "required if value is not inherited from host group or default password in settings"
+msgstr ""
+
 msgid "sort results"
 msgstr ""

data/test/unit/discovered_extensions_test.rb

@@ -95,12 +95,81 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
     assert_equal host.name, "macaabbccddeeff"
   end
 
-  test "hostname is rendered after auto provisioning" do
-    facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host_and_facts(facts).first
-    r1 = FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostname => 'x<%= 1+1 %>')
-    perform_auto_provision host, r1
-    assert_equal host.name, "x2"
+  def setup_normal_renderer
+    Setting[:safemode_render] = false
+    @facts.merge!({"somefact" => "abc"})
+  end
+
+  def setup_safemode_renderer
+    Setting[:safemode_render] = true
+    @facts.merge!({"somefact" => "abc"})
+  end
+
+  [:normal_renderer, :safemode_renderer].each do |renderer_name|
+    test "#{renderer_name} is properly configured" do
+      send "setup_#{renderer_name}"
+      if renderer_name == :normal_renderer
+        assert Setting[:safemode_render] == false
+      else
+        assert Setting[:safemode_render] == true
+      end
+    end
+
+    test "hostname falls back to original name on empty response via #{renderer_name}" do
+      host = Host::Discovered.import_host_and_facts(@facts).first
+      r1 = FactoryGirl.create(:discovery_rule,
+                              :search => "facts.somefact = abc",
+                              :hostname => '<%= "" %>')
+      perform_auto_provision host, r1
+      assert_equal "macaabbccddeeff", host.name
+    end
+
+    test "hostname is rendered after auto provisioning using #{renderer_name}" do
+      host = Host::Discovered.import_host_and_facts(@facts).first
+      r1 = FactoryGirl.create(:discovery_rule,
+                              :search => "facts.somefact = abc",
+                              :hostname => 'x<%= 1+1 %>')
+      perform_auto_provision host, r1
+      assert_equal "x2", host.name
+    end
+
+    test "function rand is renderer properly using #{renderer_name}" do
+      host = Host::Discovered.import_host_and_facts(@facts).first
+      r1 = FactoryGirl.create(:discovery_rule,
+                              :search => "facts.somefact = abc",
+                              :hostname => 'x<%= rand(4) %>')
+      perform_auto_provision host, r1
+      assert_match(/x[0123]/, host.name)
+    end
+
+    test "hostname attribute name is renderer properly using #{renderer_name}" do
+      host = Host::Discovered.import_host_and_facts(@facts).first
+      r1 = FactoryGirl.create(:discovery_rule,
+                              :search => "facts.somefact = abc",
+                              :hostname => 'x<%= @host.name %>')
+      perform_auto_provision host, r1
+      assert_equal "xmacaabbccddeeff", host.name
+    end
+
+    test "hostname attribute ip is renderer properly using #{renderer_name}" do
+      host = Host::Discovered.import_host_and_facts(@facts).first
+      r1 = FactoryGirl.create(:discovery_rule,
+                              :search => "facts.somefact = abc",
+                              :hostname => 'x<%= @host.ip.gsub(".","-") %>')
+      perform_auto_provision host, r1
+      assert_equal "x192-168-100-42", host.name
+    end
+
+    test "hostname attribute facts_hash is renderer properly using #{renderer_name}" do
+      skip "until http://projects.theforeman.org/issues/2948 is fixed"
+      host = Host::Discovered.import_host_and_facts(@facts).first
+      r1 = FactoryGirl.create(:discovery_rule,
+                              :search => "facts.somefact = abc",
+                              :hostname => 'x<%= @host.facts["somefact"] %>')
+      perform_auto_provision host, r1
+      assert_equal "xabc", host.name
+    end
+
   end
 
 end

data/test/unit/discovery_attribute_set_test.rb

@@ -31,9 +31,10 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   test "can search discovered hosts by disks_size" do
     raw = parse_json_fixture('/facts.json')
     host = Host::Discovered.import_host_and_facts(raw['facts']).first
-    results = Host::Discovered.search_for("disks_size = #{host.facts_hash['blockdevice_sda_size'].to_f.ceil}")
+    disks_size = (host.facts_hash['blockdevice_sda_size'].to_f / 1024 / 1024).ceil
+    results = Host::Discovered.search_for("disks_size = #{disks_size}")
     assert_equal 1, results.count
-    results = Host::Discovered.search_for("disks_size > #{host.facts_hash['blockdevice_sda_size'].to_f.ceil}")
+    results = Host::Discovered.search_for("disks_size > #{disks_size}")
     assert_equal 0, results.count
   end
 

data/test/unit/facts.json

@@ -88,7 +88,7 @@
     "lsbmajdistrelease": "6",
     "swapfree": "16.72 GB",
     "netmask": "255.255.255.192",
-    "discovery_bootif": "AA:BB:CC:DD:EE:FF",
+    "discovery_bootif": "AA:BB:CC:DD:EE:F5",
     "memorysize_mb": "742.13",
     "blockdevice_sda_size": "214749184"
   }

data/test/unit/host_discovered_test.rb

@@ -21,7 +21,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should import facts from yaml as Host::Discovered" do
     raw = parse_json_fixture('/facts.json')
     assert Host::Discovered.import_host_and_facts(raw['facts'])
-    assert Host::Discovered.find_by_name('macaabbccddeeff')
+    assert Host::Discovered.find_by_name('macaabbccddeef5')
   end
 
   test "should raise when fact_name setting isn't present" do
@@ -39,19 +39,29 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert host.refresh_facts
   end
 
-  test "should create discovered host with fact_name as a name" do
+  test "should create discovered host with fact_name as a name if it is a valid mac" do
+    raw = parse_json_fixture('/facts.json')
+    Setting[:discovery_fact] = 'somefact'
+    facts = raw['facts'].merge({"somefact" => "bb:aa:cc:dd:ee:ff"})
+    host = Host::Discovered.import_host_and_facts(facts).first
+    assert_equal 'macbbaaccddeeff', host.name
+    assert_equal 'bb:aa:cc:dd:ee:ff', host.mac
+  end
+
+  test "should create discovered host with default name if fact_name isn't a valid mac" do
+    skip "until http://projects.theforeman.org/issues/9044 is fixed in 1.7.3"
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_fact] = 'lsbdistcodename'
     host = Host::Discovered.import_host_and_facts(raw['facts']).first
-    assert_equal 'macsantiago', host.name
+    assert_equal 'macaabbccddeef5', host.name
+    assert_equal 'aa:bb:cc:dd:ee:f5', host.mac
   end
 
   test "should create discovered host with prefix" do
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_prefix] = 'test'
-    Setting[:discovery_fact] = 'lsbdistcodename'
     host = Host::Discovered.import_host_and_facts(raw['facts']).first
-    assert_equal 'testsantiago', host.name
+    assert_equal 'testaabbccddeef5', host.name
   end
 
   test "should not name discovered host with prefix that starts with a number, fallback to 'mac'" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface