foreman_discovery 1.3.0.rc2 → 1.3.0.rc3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6952b2ff6d66e4260db8ac41e046e529d5c7df4a
-  data.tar.gz: 285b3d9adc29ff2825e41a8a8c92c056dc253515
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzViYmEyMTdiZmM5Y2IzNDE1MDM0YWI2YmVjYmYwYTc1OWYwOGJhZg==
+  data.tar.gz: !binary |-
+    NGE0ZDQ5YjNkZWU2OWQ5ZjU0MWMwODhlMjJlM2UzNTZkNGZlNWMxYw==
 SHA512:
-  metadata.gz: 8640a6d2c569e1912d5a38c7f3d857a1e72c5cd7d02a129391947d31fb75cfbd028d846ac559dac5285c54aa13d28281bfde6073ded7514bc1b91b9ff0b16619
-  data.tar.gz: 3374b3b275d4492dd15c6e3513658d8f18a131cbefda49d3f7c8a9cf082dad781c4b4d6a789e08be3340171ff2e94c7af0c7e8f3cd4db87784c0da23d8bf9094
+  metadata.gz: !binary |-
+    OWJhZGY4NGM0NThjN2U2MGE5Y2IxN2Q5MGNjMzUwMDc2ZDU1OWE2YzYyYjQ1
+    NmFhYTJhZTViMTUxNDBhYzNhMjA4ZDQ0NTg5MjAwNDQ4ZDZiNTZjZDM3NmZm
+    OTFlYzM4ZjY3NjkxM2ZlOGIyODU0M2ViMDMxMDkwMDU2NDZiMmU=
+  data.tar.gz: !binary |-
+    MDcwMGU3NGUzNzQyNTZmYzc1MjAyNWMwMTUyYTc1YWFiZjlkYTk5MTVjYmRh
+    Zjk2NjNjMTg4ZmE2MTlkNzU1ZDhhZGIzYzRkMDFiYWY4YzVkMmRlYjBkZWI3
+    MTgyNTcwZThjZDEzMjlmMzNmZTI4YzM3OThhZjczZGVkZDQ4ZWE=

data/README.md

@@ -80,11 +80,14 @@ The plugin will create a Role called `Discovery` when first started. You can ass
 this role to non-admins to allow them to use the discovery plugin. Alternatively
 assign the `:perform_discovery` permission to an existing Role.
 
+# API
+
+see the [API README](README.api.md)
+
 # TODO
 
 * Support for downloading shell script for oVirt Node image
 * Add more Tests
-* Add API
 * Add proper Location/Organization handling (via a Wizard maybe?)
 * Add per-subnet discovery
 * Rake Task for ISO build

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

@@ -0,0 +1,108 @@
+module Api
+  module V2
+    class DiscoveredHostsController < ::Api::V2::BaseController
+
+      before_filter :find_resource, :except => %w{index create facts}
+      skip_before_filter :authorize, :only => :facts
+
+      api :GET, "/discovered_hosts/", "List all discovered hosts"
+      param :search, String, :desc => "Filter results"
+      param :order, String, :desc => "Sort results"
+      param :page, String, :desc => "paginate results"
+      param :per_page, String, :desc => "number of entries per request"
+
+      def index
+        @discovered_hosts = resource_scope.search_for(*search_options).paginate(paginate_options)
+      end
+
+      api :GET, "/discovered_hosts/:id/", "Show a discovered host"
+      param :id, :identifier_dottable, :required => true
+
+      def show
+      end
+
+      def_param_group :discovered_host do
+        param :discovered_host, Hash, :action_aware => true do
+          param :name, String, :required => true
+          param :ip, String, :required => true
+          param :mac, String, :required => true
+        end
+      end
+
+      api :POST, "/discovered_hosts/", "Create a discovered host"
+      param_group :discovered_host, :as => :create
+
+      def create
+        @discovered_host = Host::Discovered.new(params[:discovered_host])
+        process_response @discovered_host.save
+      end
+
+      api :PUT, "/discovered_hosts/:id/", "Provision a discovered host"
+      param :id, :identifier, :required => true
+      param :discovered_host, Hash, :action_aware => true do
+        param :name, String
+        param :environment_id, String
+        param :ip, String, :desc => "not required if using a subnet with dhcp proxy"
+        param :mac, String, :desc => "not required if its a virtual machine"
+        param :architecture_id, :number
+        param :domain_id, :number
+        param :puppet_proxy_id, :number
+        param :puppet_class_ids, Array
+        param :operatingsystem_id, String
+        param :medium_id, :number
+        param :ptable_id, :number
+        param :subnet_id, :number
+        param :sp_subnet_id, :number
+        param :model_id, :number
+        param :hostgroup_id, :number
+        param :owner_id, :number
+        param :puppet_ca_proxy_id, :number
+        param :image_id, :number
+        param :host_parameters_attributes, Array
+        param :build, :bool
+        param :enabled, :bool
+        param :provision_method, String
+        param :managed, :bool
+        param :progress_report_id, String, :desc => 'UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks'
+        param :capabilities, String
+      end
+
+      def update
+        @host         = @discovered_host.becomes(::Host::Managed)
+        @host.type    = 'Host::Managed'
+        @host.managed = true
+        @host.build   = true
+        forward_request_url
+        process_response @host.update_attributes(params[:discovered_host])
+      end
+
+      api :DELETE, "/discovered_hosts/:id/", "Delete a discovered host"
+      param :id, :identifier, :required => true
+
+      def destroy
+        process_response @discovered_host.destroy
+      end
+
+      api :POST, "/discovered_hosts/facts", "Upload facts for a host, creating the host if required."
+      param :facts, Hash, :required => true, :desc => "hash containing the facts for the host"
+
+      def facts
+        @discovered_host, state = Host::Discovered.import_host_and_facts(params[:facts])
+        process_response state
+      rescue ::Foreman::Exception => e
+        render :json => {'message'=>e.to_s}, :status => :unprocessable_entity
+      end
+
+      private
+
+      def resource_class
+        Host::Discovered
+      end
+
+      def forward_request_url
+        @discovered_host.request_url = request.host_with_port if @discovered_host.respond_to?(:request_url)
+      end
+
+    end
+  end
+end

data/app/controllers/{discovers_controller.rb → discovered_hosts_controller.rb}

@@ -1,4 +1,4 @@
-class DiscoversController < ::ApplicationController
+class DiscoveredHostsController < ::ApplicationController
   include Foreman::Controller::AutoCompleteSearch
   include Foreman::Controller::TaxonomyMultiple
   unloadable
@@ -101,7 +101,7 @@ class DiscoversController < ::ApplicationController
     else
       error _("The following hosts were not deleted: %s") % missed_hosts
     end
-    redirect_to(discovers_path)
+    redirect_to(discovered_hosts_path)
   end
 
   def auto_complete_search
@@ -178,17 +178,17 @@ class DiscoversController < ::ApplicationController
       @hosts = Host::Discovered.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(discovers_path) and return false
+        redirect_to(discovered_hosts_path) and return false
       end
     else
       error _('No hosts selected')
-      redirect_to(discovers_path) and return false
+      redirect_to(discovered_hosts_path) and return false
     end
 
     return @hosts
   rescue => e
     error _("Something went wrong while selecting hosts - %s") % e
-    redirect_to discovers_path
+    redirect_to discovered_hosts_path
   end
 
   def get_ip_from_env

data/app/helpers/{discovers_helper.rb → discovered_hosts_helper.rb}

@@ -1,28 +1,28 @@
-module DiscoversHelper
+module DiscoveredHostsHelper
 
   def disc_report_column(record)
     record.last_report? ? (_("%s ago") % time_ago_in_words(record.last_report.getlocal)) : ""
   end
 
-  def discovers_title_actions(host)
+  def discovered_hosts_title_actions(host)
     title_actions(
       button_group(
-        link_to(_("Provision"), hash_for_edit_discover_path(:id => host), :class => 'btn-primary')
+        link_to(_("Provision"), hash_for_edit_discovered_host_path(:id => host), :class => 'btn-primary')
       ),
       button_group(
-        link_to(_("Refresh facts"), hash_for_refresh_facts_discover_path(:id => host))
+        link_to(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host))
       ),
       button_group(
-        link_to(_("Delete"), hash_for_discover_path(:id => host),
+        link_to(_("Delete"), hash_for_discovered_host_path(:id => host),
                 :class => "btn btn-danger", :confirm => _('Are you sure?'), :method => :delete)
       )
     )
   end
 
-  def multiple_discovers_actions_select
-    actions = [[_('Delete hosts'), multiple_destroy_discovers_path]]
-    actions <<  [_('Assign Organization'), select_multiple_organization_discovers_path] if SETTINGS[:organizations_enabled]
-    actions <<  [_('Assign Location'), select_multiple_location_discovers_path] if SETTINGS[:locations_enabled]
+  def multiple_discovered_hosts_actions_select
+    actions = [[_('Delete hosts'), multiple_destroy_discovered_hosts_path]]
+    actions <<  [_('Assign Organization'), select_multiple_organization_discovered_hosts_path] if SETTINGS[:organizations_enabled]
+    actions <<  [_('Assign Location'), select_multiple_location_discovered_hosts_path] if SETTINGS[:locations_enabled]
 
     select_action_button( _("Select Action"), {:id => 'submit_multiple'},
       actions.map do |action|

data/app/models/host/discovered.rb

@@ -6,6 +6,9 @@ class Host::Discovered < ::Host::Base
   belongs_to :organization
   belongs_to :subnet
 
+  validates :mac, :uniqueness => true, :format => {:with => Net::Validations::MAC_REGEXP}, :presence => true
+  validates :ip, :format => {:with => Net::Validations::IP_REGEXP}, :uniqueness => true
+
   scoped_search :on => :name, :complete_value => true, :default_order => true
   scoped_search :on => :last_report, :complete_value => true
   scoped_search :on => :ip, :complete_value => true
@@ -24,7 +27,7 @@ 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,/:/,'')
+    hostname   = facts[fact_name].try(:downcase).try(:gsub,/:/,'').try(:sub,/^/,'mac')
     raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain the required fact '%s'"), fact_name)) unless hostname
 
     # filter facts

data/app/overrides/add_dashboard_table.rb

@@ -5,7 +5,7 @@ Deface::Override.new(:virtual_path => "dashboard/_status_table",
 <h4 class='header'><%= _('Host Pool') %></h4>
 <ul>
   <li>
-    <%= link_to(_('Unassigned hosts'), discovers_path, :class=>'dashboard-links' ) %>
+    <%= link_to(_('Unassigned hosts'), discovered_hosts_path, :class=>'dashboard-links' ) %>
     <h4><%= Host::Discovered.count %></h4>
   </li>
 </ul>"))

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

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

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

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

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

@@ -0,0 +1,13 @@
+object @discovered_host
+
+extends "api/v2/discovered_hosts/base"
+
+attributes :ip, :mac, :last_report, :subnet_id, :subnet_name
+
+if SETTINGS[:organizations_enabled]
+  attributes :organization_id, :organization_name
+end
+
+if SETTINGS[:locations_enabled]
+  attributes :location_id, :location_name
+end

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

@@ -0,0 +1,5 @@
+object @discovered_host
+
+extends "api/v2/discovered_hosts/main"
+
+attributes :facts_hash

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

@@ -0,0 +1,11 @@
+object @discovered_host
+
+extends "api/v2/discovered_hosts/main"
+
+attributes :environment_id, :environment_name, :sp_mac, :sp_ip, :sp_name, :domain_id, :domain_name,
+           :architecture_id, :architecture_name, :operatingsystem_id, :operatingsystem_name,
+           :sp_subnet_id, :ptable_id, :ptable_name, :medium_id, :medium_name, :build, :comment, :disk,
+           :installed_at, :model_id, :model_name, :hostgroup_id, :hostgroup_name, :owner_id, :owner_type,
+           :enabled, :puppet_ca_proxy_id, :managed, :uuid, :capabilities, :provision_method,
+           :puppet_proxy_id, :certname, :image_id, :image_name, :created_at, :updated_at,
+           :last_compile, :last_freshcheck, :serial, :source_file_id

data/app/views/{discovers/_discovers_list.html.erb → discovered_hosts/_discovered_hosts_list.html.erb}

@@ -20,7 +20,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}", discover_path(host) ) %> </td>
+      <td><%= link_to("#{host}", discovered_host_path(host) ) %> </td>
       <td class="hidden-tablet hidden-xs"><%= model_name host %></td>
       <% if SETTINGS[:locations_enabled] -%>
         <td class="hidden-tablet hidden-xs"><%= host.location.try(:name) %></td>
@@ -32,9 +32,9 @@
       <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
       <td>
         <%= action_buttons(
-          link_to(_("Provision"), hash_for_edit_discover_path(:id => host)),
-          link_to(_("Refresh facts"), hash_for_refresh_facts_discover_path(:id => host)),
-          display_delete_if_authorized(hash_for_discover_path(:id => host), :confirm => _("Delete %s?") % host.name, :action => :destroy))%>
+          link_to(_("Provision"), hash_for_edit_discovered_host_path(:id => host)),
+          link_to(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host)),
+          display_delete_if_authorized(hash_for_discovered_host_path(:id => host), :confirm => _("Delete %s?") % host.name, :action => :destroy))%>
         </td>
       </tr>
     <% end -%>

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

@@ -0,0 +1,2 @@
+<% title_actions multiple_discovered_hosts_actions_select -%>
+<%= render 'discovered_hosts_list' %>

data/app/views/{discovers → discovered_hosts}/multiple_destroy.html.erb

@@ -1,6 +1,6 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 
-<%= form_tag submit_multiple_destroy_discovers_path(:host_ids => params[:host_ids]), :onsubmit => "resetSelection()" do -%>
+<%= 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') %>
 <% end %>

data/app/views/{discovers → discovered_hosts}/select_multiple_location.html.erb

@@ -1,7 +1,7 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 <div class="row">
   <div class="col-md-8">
-    <%= form_for :location, :url => update_multiple_location_discovers_path(:host_ids => params[:host_ids]) do |f| %>
+    <%= form_for :location, :url => update_multiple_location_discovered_hosts_path(:host_ids => params[:host_ids]) do |f| %>
       <%= f.select :id, Location.all.map{|e| [e.name, e.id]},{:include_blank => _("Select location")},
                    :onchange => "toggle_multiple_ok_button(this)" %>
       <%= f.hidden_field :optimistic_import, :value => "yes" %>

data/app/views/{discovers → discovered_hosts}/select_multiple_organization.html.erb

@@ -1,7 +1,7 @@
 <%= render 'selected_hosts', :hosts => @hosts %>
 <div class="row">
   <div class="col-md-8">
-    <%= form_for :organization, :url => update_multiple_organization_discovers_path(:host_ids => params[:host_ids]) do |f| %>
+    <%= form_for :organization, :url => update_multiple_organization_discovered_hosts_path(:host_ids => params[:host_ids]) do |f| %>
       <%= f.select :id, Organization.all.map{|e| [e.name, e.id]},{:include_blank => _("Select organization")},
                    :onchange => "toggle_multiple_ok_button(this)" %>
       <%= f.hidden_field :optimistic_import, :value => "yes" %>

data/app/views/{discovers → discovered_hosts}/show.html.erb

@@ -1,6 +1,6 @@
 <% title(_("Discovered host: %s") % @host.to_label) %>
 
-<%= discovers_title_actions(@host) %>
+<%= discovered_hosts_title_actions(@host) %>
 
 <h3><%= _('Facts discovered on this host') -%></h3>
 <table class="table table-bordered table-striped table-condensed">

data/config/routes.rb

@@ -2,12 +2,12 @@
 Rails.application.routes.draw do
 
   # Needed to make the hosts/edit form render
-  match 'architecture_selected_discovers' => 'hosts#architecture_selected'
-  match 'os_selected_discovers'           => 'hosts#os_selected'
-  match 'medium_selected_discovers'       => 'hosts#medium_selected'
+  match 'architecture_selected_discovered_hosts' => 'hosts#architecture_selected'
+  match 'os_selected_discovered_hosts'           => 'hosts#os_selected'
+  match 'medium_selected_discovered_hosts'       => 'hosts#medium_selected'
 
   constraints(:id => /[^\/]+/) do
-    resources :discovers do
+    resources :discovered_hosts do
       member do
         get 'refresh_facts'
       end
@@ -23,4 +23,15 @@ Rails.application.routes.draw do
     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 do
+        collection do
+          post 'facts'
+        end
+      end
+    end
+  end
+
 end

data/lib/foreman_discovery/engine.rb

@@ -14,7 +14,7 @@ module ForemanDiscovery
     end
 
     initializer 'foreman_discovery.helper' do |app|
-      ActionView::Base.send :include, DiscoversHelper
+      ActionView::Base.send :include, DiscoveredHostsHelper
     end
 
     initializer 'foreman_discovery.register_gettext', :after => :load_config_initializers do |app|
@@ -30,13 +30,13 @@ module ForemanDiscovery
 
         # Add permissions
         security_block :discovery do
-          permission :view_discovered_hosts, {:discovers => [:index, :show, :auto_complete_search, :refresh_facts] }, :resource_type => 'Host'
-          permission :provision_discovered_hosts, {:discovers => [:new, :create] }, :resource_type => 'Host'
-          permission :edit_discovered_hosts, {:discovers => [:edit, :update, :update_multiple_location,
+          permission :view_discovered_hosts, {:discovered_hosts => [:index, :show, :auto_complete_search, :refresh_facts] }, :resource_type => 'Host'
+          permission :provision_discovered_hosts, {:discovered_hosts => [:new, :create] }, :resource_type => 'Host'
+          permission :edit_discovered_hosts, {:discovered_hosts => [:edit, :update, :update_multiple_location,
                                                              :select_multiple_organization,
                                                              :update_multiple_organization,
                                                              :select_multiple_location] }, :resource_type => 'Host'
-          permission :destroy_discovered_hosts, {:discovers => [:destroy, :submit_multiple_destroy, :multiple_destroy] }, :resource_type => 'Host'
+          permission :destroy_discovered_hosts, {:discovered_hosts => [:destroy, :submit_multiple_destroy, :multiple_destroy] }, :resource_type => 'Host'
 
         end
 
@@ -44,7 +44,7 @@ module ForemanDiscovery
         role "Discovery", [:view_discovered_hosts, :provision_discovered_hosts, :edit_discovered_hosts, :destroy_discovered_hosts]
 
         #add menu entry
-        menu :top_menu, :discovery, :url_hash => {:controller=> :discovers, :action=>:index},
+        menu :top_menu, :discovery, :url_hash => {:controller=> :discovered_hosts, :action=>:index},
              :caption=> N_('Discovered hosts'),
              :parent => :hosts_menu,
              :after=>:hosts

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.3.0.rc2"
+  VERSION = "1.3.0.rc3"
 end

data/locale/de/foreman_discovery.po

@@ -0,0 +1,175 @@
+# Template file for strings which can be localized in the Foreman Application.
+# 
+# This file is distributed under the same license as the Foreman.
+# 
+# 
+# Translators:
+# bechtoldt <mail@arnoldbechtoldt.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-04-08 15:59+0200\n"
+"PO-Revision-Date: 2014-04-09 10:00+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
+"Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%s - The following hosts are about to be changed"
+msgstr "%s - Die folgenden Hosts werden gerade geändert"
+
+msgid "%s ago"
+msgstr "vor %s"
+
+msgid "Are you sure?"
+msgstr "Sind Sie sicher?"
+
+msgid "Assign Location"
+msgstr "Standort zuweisen"
+
+msgid "Assign Organization"
+msgstr "Organisation zuweisen"
+
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgid "Could not get facts from proxy: %s"
+msgstr "Konnte keine Fakten vom Proxy empfangen: %s"
+
+msgid "Delete"
+msgstr "Löschen"
+
+msgid "Delete %s?"
+msgstr "Löschen %s?"
+
+msgid "Delete hosts"
+msgstr "Lösche Hosts"
+
+msgid "Destroyed selected hosts"
+msgstr "ausgewählte gelöschte Systeme"
+
+msgid "Discovered host: %s"
+msgstr "Entdeckte Hosts: %s"
+
+msgid "Discovered hosts"
+msgstr "Entdeckte Hosts"
+
+msgid "Fact"
+msgstr "Fakt"
+
+msgid "Facts discovered on this host"
+msgstr "Auf diesem Host entdeckte Fakten:"
+
+msgid "Facts refreshed for %s"
+msgstr "Fakten erneuert für %s"
+
+msgid "Failed to import facts for Host::Discovered"
+msgstr "Fakten für Host::Discovered konnten nicht importiert werden"
+
+msgid "Failed to import facts for Host::Discovered: %s"
+msgstr "Fakten für Host::Discovered konnten nicht importiert werden: %s"
+
+msgid "Failed to reboot: %s"
+msgstr "Neustart fehlgeschlagen: %s"
+
+msgid "Failed to refresh facts for %s"
+msgstr "Konnte für %s keine Fakten erneuern"
+
+msgid "Host Pool"
+msgstr "Host-Pool"
+
+msgid "Imported Host::Discovered"
+msgstr "Host::Discovered wurde importiert"
+
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+msgid "Invalid facts: hash does not contain the required fact '%s'"
+msgstr ""
+
+msgid "Last facts upload"
+msgstr "Letzter Fakten-Upload"
+
+msgid "Location"
+msgstr "Lokation"
+
+msgid "Model"
+msgstr "Modell"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "No hosts selected"
+msgstr "Keine Systeme ausgewählt"
+
+msgid "No hosts were found with that id or name"
+msgstr "es wurden keine Systeme mit dieser ID oder Namen gefunden"
+
+msgid "Organization"
+msgstr "Organisation"
+
+msgid "Please Confirm"
+msgstr "bitte bestätigen"
+
+msgid "Provision"
+msgstr "Bereitstellen"
+
+msgid "Rebooting %s"
+msgstr "Starte %s neu"
+
+msgid "Refresh facts"
+msgstr "Fakten erneuern"
+
+msgid "Select Action"
+msgstr "Aktion auswählen"
+
+msgid "Select all items in this page"
+msgstr "Alle Elemente auf dieser Seite auswählen"
+
+msgid "Select location"
+msgstr "Lokation auswählen"
+
+msgid "Select organization"
+msgstr "Organisation auswählen"
+
+msgid "Something went wrong while selecting hosts - %s"
+msgstr "Bei der Systemauswahl von %s ist ein Fehler aufgetreten"
+
+msgid "Submit"
+msgstr "Absenden"
+
+msgid "Subnet"
+msgstr "Subnetz"
+
+msgid "The default fact name to use for the MAC of the system"
+msgstr "Der Standard-Faktenname zum Verwenden für die MAC des Systems"
+
+msgid "The default location to place discovered hosts in"
+msgstr "Standard-Lokation zum Platzieren entdeckter Hosts"
+
+msgid "The default organization to place discovered hosts in"
+msgstr "Standard-Organisation zum Platzieren entdeckter Hosts"
+
+msgid "The following hosts were not deleted: %s"
+msgstr "Die folgende Systeme wurden nicht gelöscht: %s"
+
+msgid ""
+"This might take a while, as all hosts, facts and reports will be destroyed "
+"as well"
+msgstr "Dies kann eine Weile dauern, weil alle Systeme, Fakten und Reporte auch gelöscht werden"
+
+msgid "Unassigned hosts"
+msgstr "Unzugeordnete Hosts"
+
+msgid "Value"
+msgstr "Wert"
+
+msgid "Warning"
+msgstr "Warnung"
+
+msgid "items selected. Uncheck to Clear"
+msgstr "Elemente ausgewählt. Abwählen um zu Leeren"

data/locale/en_GB/{discovery.po → foreman_discovery.po}

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 17:47+0100\n"
-"PO-Revision-Date: 2013-11-22 09:30+0000\n"
-"Last-Translator: domcleal <dcleal@redhat.com>\n"
+"POT-Creation-Date: 2014-04-08 15:59+0200\n"
+"PO-Revision-Date: 2014-04-09 09:46+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,9 +52,6 @@ msgstr "Delete hosts"
 msgid "Destroyed selected hosts"
 msgstr "Destroyed selected hosts"
 
-msgid "Discovered Hosts"
-msgstr "Discovered Hosts"
-
 msgid "Discovered host: %s"
 msgstr "Discovered host: %s"
 
@@ -88,6 +85,12 @@ msgstr "Host Pool"
 msgid "Imported Host::Discovered"
 msgstr "Imported Host::Discovered"
 
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+msgid "Invalid facts: hash does not contain the required fact '%s'"
+msgstr ""
+
 msgid "Last facts upload"
 msgstr "Last facts upload"
 
@@ -121,8 +124,8 @@ msgstr "Rebooting %s"
 msgid "Refresh facts"
 msgstr "Refresh facts"
 
-msgid "Select action"
-msgstr "Select action"
+msgid "Select Action"
+msgstr ""
 
 msgid "Select all items in this page"
 msgstr "Select all items in this page"
@@ -142,6 +145,9 @@ msgstr "Submit"
 msgid "Subnet"
 msgstr "Subnet"
 
+msgid "The default fact name to use for the MAC of the system"
+msgstr ""
+
 msgid "The default location to place discovered hosts in"
 msgstr "The default location to place discovered hosts in"
 

data/locale/es/{discovery.po → foreman_discovery.po}

@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# francisvm <hackgo@gmail.com>, 2013
+# francisvm <hackgo@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 17:47+0100\n"
-"PO-Revision-Date: 2013-11-22 15:40+0000\n"
-"Last-Translator: francisvm <hackgo@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 15:59+0200\n"
+"PO-Revision-Date: 2014-04-09 10:00+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/foreman/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,9 +52,6 @@ msgstr "Borrar Equipos"
 msgid "Destroyed selected hosts"
 msgstr "Eliminados equipos seleccionados"
 
-msgid "Discovered Hosts"
-msgstr "Equipos descubiertos"
-
 msgid "Discovered host: %s"
 msgstr "Equipo descubierto: %s"
 
@@ -88,6 +85,12 @@ msgstr "Conjunto de equipos"
 msgid "Imported Host::Discovered"
 msgstr "Importado Host::Descubierto"
 
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+msgid "Invalid facts: hash does not contain the required fact '%s'"
+msgstr ""
+
 msgid "Last facts upload"
 msgstr "Últimos datos subidos"
 
@@ -121,8 +124,8 @@ msgstr "Reiniciando %s"
 msgid "Refresh facts"
 msgstr "Refrescar datos"
 
-msgid "Select action"
-msgstr "Seleccionar acción"
+msgid "Select Action"
+msgstr "Seleccione una Acción"
 
 msgid "Select all items in this page"
 msgstr "Seleccionar todos los objetos de esta página"
@@ -142,6 +145,9 @@ msgstr "Introducir"
 msgid "Subnet"
 msgstr "Subred"
 
+msgid "The default fact name to use for the MAC of the system"
+msgstr "El nombre de dato por defecto a usar para la MAC del sistema"
+
 msgid "The default location to place discovered hosts in"
 msgstr "La ubicación predeterminada para colocar hosts descubiertos "
 

data/locale/fr/{discovery.po → foreman_discovery.po}

@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Claer <transiblu@claer.hammock.fr>, 2013
+# Claer <transiblu@claer.hammock.fr>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 17:47+0100\n"
-"PO-Revision-Date: 2013-11-27 14:30+0000\n"
-"Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
+"POT-Creation-Date: 2014-04-08 15:59+0200\n"
+"PO-Revision-Date: 2014-04-09 10:00+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: French (http://www.transifex.com/projects/p/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,9 +52,6 @@ msgstr "Supprimer ces Hôtes"
 msgid "Destroyed selected hosts"
 msgstr "Hôtes sélectionnés détruits"
 
-msgid "Discovered Hosts"
-msgstr "Hôtes détectés"
-
 msgid "Discovered host: %s"
 msgstr "Hôtes détectés : %s"
 
@@ -88,6 +85,12 @@ msgstr "Regrouppement d'hôtes"
 msgid "Imported Host::Discovered"
 msgstr "Host::Discovered importé"
 
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+msgid "Invalid facts: hash does not contain the required fact '%s'"
+msgstr ""
+
 msgid "Last facts upload"
 msgstr "Derniers facts téléchargés"
 
@@ -121,7 +124,7 @@ msgstr "Redémarrage %s"
 msgid "Refresh facts"
 msgstr "Rafraichir les facts"
 
-msgid "Select action"
+msgid "Select Action"
 msgstr "Choisir l'action"
 
 msgid "Select all items in this page"
@@ -142,6 +145,9 @@ msgstr "Soumettre"
 msgid "Subnet"
 msgstr "Sous-Réseau"
 
+msgid "The default fact name to use for the MAC of the system"
+msgstr "Le nom du fact par défaut pour obtenir l'adresse MAC du système"
+
 msgid "The default location to place discovered hosts in"
 msgstr "Attribution de la localisation par défaut pour les hôtes détectés"
 

data/locale/sv_SE/{discovery.po → foreman_discovery.po}

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-20 17:47+0100\n"
-"PO-Revision-Date: 2014-01-14 14:34+0000\n"
-"Last-Translator: johnny Westerlund <johnny.westerlund@gmail.com>\n"
+"POT-Creation-Date: 2014-04-08 15:59+0200\n"
+"PO-Revision-Date: 2014-04-09 10:00+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/foreman/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,9 +52,6 @@ msgstr "Radera värdar"
 msgid "Destroyed selected hosts"
 msgstr "Förstör markerade värdar"
 
-msgid "Discovered Hosts"
-msgstr "Hittade värdar"
-
 msgid "Discovered host: %s"
 msgstr "Hittade värdar: %s"
 
@@ -88,6 +85,12 @@ msgstr "Värdpool"
 msgid "Imported Host::Discovered"
 msgstr "Importerade Host::Discovered"
 
+msgid "Invalid facts, must be a Hash"
+msgstr ""
+
+msgid "Invalid facts: hash does not contain the required fact '%s'"
+msgstr ""
+
 msgid "Last facts upload"
 msgstr "Sista faktauppladdning"
 
@@ -121,8 +124,8 @@ msgstr "Startar om %s"
 msgid "Refresh facts"
 msgstr "Uppdatera fakta"
 
-msgid "Select action"
-msgstr "Välj åtgärd"
+msgid "Select Action"
+msgstr "Välj Åtgärd"
 
 msgid "Select all items in this page"
 msgstr "Markera alla valbara på denna sida"
@@ -142,6 +145,9 @@ msgstr "Sänd"
 msgid "Subnet"
 msgstr "Subnät"
 
+msgid "The default fact name to use for the MAC of the system"
+msgstr "Fördefinierat faktanamn att använda för MAC för systemet"
+
 msgid "The default location to place discovered hosts in"
 msgstr "Standardplatsen att placera värdar i"
 

data/locale/zanata.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<config xmlns="http://zanata.org/namespace/config/">
+    <url>https://translate.zanata.org/zanata/</url> 
+    <project>satellite6-foreman-discovery</project>
+    <project-version>6.0</project-version>
+    <project-type>podir</project-type>
+    <locales>
+        <locale>fr</locale>
+        <locale>it</locale>
+        <locale>ja</locale>
+        <locale>ko</locale>
+        <locale>gu</locale>
+        <locale>hi</locale>
+        <locale>mr</locale>
+        <locale>or</locale>
+        <locale>ru</locale>
+        <locale>te</locale>
+        <locale>pa</locale>
+        <locale>kn</locale>
+        <locale map-from="de">de-DE</locale>
+        <locale map-from="es">es-ES</locale>
+        <locale map-from="pt_BR">pt-BR</locale>
+        <locale map-from="bn">bn-IN</locale>
+        <locale map-from="ta">ta-IN</locale>
+        <locale map-from="zh_CN">zh-Hans-CN</locale>
+        <locale map-from="zh_TW">zh-Hant-TW</locale>      
+    </locales>
+</config>

data/test/functional/{discovers_controller_test.rb → discovered_hosts_controller_test.rb}

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class DiscoversControllerTest < ActionController::TestCase
+class DiscoveredHostsControllerTest < ActionController::TestCase
   setup :initialize_host
 
   def test_index
@@ -17,7 +17,7 @@ class DiscoversControllerTest < ActionController::TestCase
   def test_add_entry_to_nav_menu
     get :index, {}, set_session_user
     assert_tag :tag => 'a',
-      :attributes => {:href => '/discovers'}
+      :attributes => {:href => '/discovered_hosts'}
   end
 
   private

data/test/unit/host_discovered_test.rb

@@ -16,14 +16,15 @@ class HostDiscoveredTest < ActiveSupport::TestCase
 
   test "should import facts from yaml as Host::Discovered" do
     raw = parse_json_fixture('/facts.json')
-    assert Host::Discovered.importHostAndFacts(raw['facts'])
+    assert Host::Discovered.import_host_and_facts(raw['facts'])
+    assert Host::Discovered.find_by_name('mace41f13cc3658')
   end
 
   test "should raise when fact_name setting isn't present" do
     raw = parse_json_fixture('/facts.json')
     Setting[:discovery_fact] = 'macaddress_foo'
     assert_raises Foreman::Exception do
-      Host::Discovered.importHostAndFacts(raw['facts'])
+      Host::Discovered.import_host_and_facts(raw['facts'])
     end
   end
 

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
+  version: 1.3.0.rc3
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ftools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: 'MaaS Discovery Plugin engine for Foreman '
+description: ! 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
 extensions: []
@@ -63,19 +63,25 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/discovers_controller.rb
-- app/helpers/discovers_helper.rb
+- app/controllers/api/v2/discovered_hosts_controller.rb
+- app/controllers/discovered_hosts_controller.rb
+- app/helpers/discovered_hosts_helper.rb
 - app/models/host/discovered.rb
 - app/models/host/managed_extensions.rb
 - app/models/setting/discovered.rb
 - app/overrides/add_dashboard_table.rb
-- app/views/discovers/_discovers_list.html.erb
-- app/views/discovers/_selected_hosts.html.erb
-- app/views/discovers/index.html.erb
-- app/views/discovers/multiple_destroy.html.erb
-- app/views/discovers/select_multiple_location.html.erb
-- app/views/discovers/select_multiple_organization.html.erb
-- app/views/discovers/show.html.erb
+- app/views/api/v2/discovered_hosts/base.json.rabl
+- app/views/api/v2/discovered_hosts/index.json.rabl
+- app/views/api/v2/discovered_hosts/main.json.rabl
+- app/views/api/v2/discovered_hosts/show.json.rabl
+- app/views/api/v2/discovered_hosts/update.json.rabl
+- app/views/discovered_hosts/_discovered_hosts_list.html.erb
+- app/views/discovered_hosts/_selected_hosts.html.erb
+- app/views/discovered_hosts/index.html.erb
+- app/views/discovered_hosts/multiple_destroy.html.erb
+- app/views/discovered_hosts/select_multiple_location.html.erb
+- app/views/discovered_hosts/select_multiple_organization.html.erb
+- app/views/discovered_hosts/show.html.erb
 - config/initializers/discovery_setup.rb
 - config/routes.rb
 - extra/build_iso.sh
@@ -108,17 +114,18 @@ files:
 - lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/facts.rb
 - lib/foreman_discovery/version.rb
-- locale/Makefile
-- locale/en_GB/LC_MESSAGES/foreman_discovery.mo
-- locale/en_GB/discovery.po
-- locale/es/LC_MESSAGES/foreman_discovery.mo
-- locale/es/discovery.po
+- locale/de/foreman_discovery.po
+- locale/en_GB/LC_MESSAGES/discovery.mo
+- locale/en_GB/foreman_discovery.po
+- locale/es/LC_MESSAGES/discovery.mo
+- locale/es/foreman_discovery.po
 - locale/foreman_discovery.pot
-- locale/fr/LC_MESSAGES/foreman_discovery.mo
-- locale/fr/discovery.po
-- locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/discovery.po
-- test/functional/discovers_controller_test.rb
+- locale/fr/LC_MESSAGES/discovery.mo
+- locale/fr/foreman_discovery.po
+- locale/sv_SE/LC_MESSAGES/discovery.mo
+- locale/sv_SE/foreman_discovery.po
+- locale/zanata.xml
+- test/functional/discovered_hosts_controller_test.rb
 - test/test_helper.rb
 - test/test_plugin_helper.rb
 - test/unit/facts.json
@@ -134,25 +141,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/functional/discovers_controller_test.rb
-- test/unit/setting_discovered_test.rb
-- test/unit/facts.json
-- test/unit/host_discovered_test.rb
 - test/test_plugin_helper.rb
+- test/functional/discovered_hosts_controller_test.rb
 - test/test_helper.rb
-has_rdoc: 
+- test/unit/facts.json
+- test/unit/setting_discovered_test.rb
+- test/unit/host_discovered_test.rb

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

@@ -1,2 +0,0 @@
-<% title_actions multiple_discovers_actions_select -%>
-<%= render 'discovers_list' %>

data/locale/Makefile

@@ -1,6 +0,0 @@
-#
-# Makefile for PO merging and MO generation. For more info see
-# locale/README in the Foreman Core.
-#
-include ../.foreman_app/locale/Makefile
-DOMAIN = discovery