foreman_discovery 1.4.1 → 2.0.0.rc1

data/db/migrate/20141126165451_add_discovery_id_to_subnet.rb

@@ -0,0 +1,9 @@
+class AddDiscoveryIdToSubnet < ActiveRecord::Migration
+  def self.up
+    add_column :subnets, :discovery_id, :integer
+  end
+
+  def self.down
+    remove_column :subnets, :discovery_id
+  end
+end

data/db/migrate/20141223101707_create_discovery_attribute_sets.rb

@@ -0,0 +1,14 @@
+class CreateDiscoveryAttributeSets < ActiveRecord::Migration
+  def change
+    create_table :discovery_attribute_sets do |t|
+      t.references :host
+      t.integer :memory, :limit => 8, :default => 0
+      t.integer :cpu_count, :default => 0
+      t.integer :disk_count, :default => 0
+      t.integer :disks_size, :limit => 8, :default => 0
+      t.timestamps
+    end
+    add_index :discovery_attribute_sets, :host_id
+    add_foreign_key "discovery_attribute_sets", "hosts", name: "discovery_attribute_sets_host_id_fk"
+  end
+end

data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb

@@ -0,0 +1,8 @@
+class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration
+  def up
+    Host::Discovered.scoped.each { |host| host.populate_fields_from_facts}
+  end
+
+  def down
+  end
+end

data/db/seeds.d/60_discovery_proxy_feature.rb

@@ -0,0 +1,2 @@
+f = Feature.find_or_create_by_name('Discovery')
+raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?

data/lib/discovery.rake

@@ -1,85 +1,3 @@
-require 'open4'
-require 'ftools'
-
-desc <<-END_DESC
-A task to (re)build the discovery TCL image using the latest code from
-github for the smart proxy. Outputs to ./discovery_image/*
-
-Available conditions:
-* build_verbose - print all the STDOUT and STDERR of the buildscript
-END_DESC
-namespace :discovery do
-  task :build_image => :environment do
-
-    verbose = ( ENV['build_verbose'] and ENV['build_verbose'] != 'false' ) ? true : false
-    mode = case ENV['mode']
-           when /prod/
-             "prod"
-           else
-             "debug"
-           end
-
-    # This requires a lot of root-level actions, lets ensure we have root access
-    if Process.uid == 0 && Process.euid == 0
-      prefix = ''
-    else
-      puts 'not running as root, testing sudo access'
-      `sudo true`
-      unless $?.success?
-        puts "Please run this task with root/sudo priviledges"
-        exit 1
-      end
-      puts 'sudo access confirmed'
-      prefix = 'sudo'
-    end
-
-    # dep check
-    unless system("echo -n 'testing dependency: ' ; which unsquashfs")
-      puts "please install unsquashfs"
-      exit 1
-    end
-    unless system("echo -n 'testing dependency: ' ; which advdef")
-      puts "please install advdef"
-      exit 1
-    end
-    unless system("echo -n 'testing dependency: ' ; which git")
-      puts "please install git"
-      exit 1
-    end
-
-    script = File.join(File.dirname(__FILE__), '..', 'extra', 'build_iso.sh')
-    builddir=''
-    begin
-      status = Open4::popen4("#{prefix} #{script} #{mode}") do |pid, stdin, stdout, stderr|
-        puts "pid        : #{ pid }" if verbose
-        stdrout=stdout.read.strip
-        builddir = stdrout.split("\n").delete_if {|x| x !~ /#TMPDIR#/}.to_s.split(' ').last.sub(/[\]\"]+/,"")
-        puts "stdout     : #{ stdrout }" if verbose
-        puts "stderr     : #{ stderr.read.strip }" if verbose
-      end
-    rescue Exception => e
-      e.message
-      e.backtrace
-    end
-
-    if status.exitstatus == 0
-      Dir.mkdir 'discovery_image' unless File.directory?('discovery_image')
-      #File.copy "#{builddir}/initrd.gz", './discovery_image/'  # this seems to give
-      #File.copy "#{builddir}/vmlinuz", './discovery_image/'    # some weird errors...
-      `cp #{builddir}/initrd.gz ./discovery_image/`
-      `cp #{builddir}/vmlinuz ./discovery_image/`
-      puts "Your Discovery Image is in ./discovery_image - please copy these files"
-      puts "to your TFTP server and configure the default boot to use them"
-    else
-      puts "status     : #{ status.inspect }"
-      puts "exitstatus : #{ status.exitstatus }"
-      puts "builddir   : #{ builddir.inspect }"
-      puts 'Run with build_verbose=true for more detail' unless verbose
-    end
-
-  end
-end
-
 # Setup Tests
 namespace :test do
   desc "Test Discovery plugin"

data/lib/foreman_discovery/engine.rb

@@ -1,11 +1,17 @@
 require 'fast_gettext'
 require 'gettext_i18n_rails'
+require 'deface'
 
 module ForemanDiscovery
   #Inherit from the Rails module of the parent app (Foreman), not the plugin.
   #Thus, inherits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
 
+    # support for concerns for pre-4 Rails versions
+    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
+
     # Load this before the Foreman config initializers, so that the Setting.descendants
     # list includes the plugin STI setting class
     initializer 'foreman_discovery.load_default_settings', :before => :load_config_initializers do |app|
@@ -23,26 +29,31 @@ module ForemanDiscovery
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
+    # Add any db migrations
+    initializer "foreman_discovery.load_app_instance_data" do |app|
+      app.config.paths['db/migrate'] += ForemanDiscovery::Engine.paths['db/migrate'].existent
+    end
+
     initializer 'foreman_discovery.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '> 1.5'
+        requires_foreman '>= 1.6'
 
-        # Add permissions
+        # discovered hosts permissions
         security_block :discovery do
           permission :view_discovered_hosts, {
             :discovered_hosts          => [:index, :show, :auto_complete_search],
             :"api/v2/discovered_hosts" => [:index, :show]
           }, :resource_type => 'Host'
           permission :provision_discovered_hosts, {
-            :discovered_hosts          => [:new, :create],
-            :"api/v2/discovered_hosts" => [:create]
+            :discovered_hosts          => [:new, :create, :auto_provision, :auto_provision_all],
+            :"api/v2/discovered_hosts" => [:create, :auto_provision, :auto_provision_all]
           }, :resource_type => 'Host'
           permission :edit_discovered_hosts, {
             :discovered_hosts          => [:edit, :update, :update_multiple_location,
                                            :select_multiple_organization,
                                            :update_multiple_organization,
-                                           :select_multiple_location, :refresh_facts],
-                                           :"api/v2/discovered_hosts" => [:update, :facts]
+                                           :select_multiple_location, :refresh_facts, :reboot],
+            :"api/v2/discovered_hosts" => [:update, :facts, :refresh_facts, :reboot]
           }, :resource_type => 'Host'
           permission :destroy_discovered_hosts, {
             :discovered_hosts          => [:destroy, :submit_multiple_destroy, :multiple_destroy],
@@ -50,27 +61,76 @@ module ForemanDiscovery
           }, :resource_type => 'Host'
         end
 
-        # Add a new role called 'Discovery' if it doesn't exist
-        role "Discovery", [:view_discovered_hosts, :provision_discovered_hosts, :edit_discovered_hosts, :destroy_discovered_hosts]
+        # discovery rules permissions
+        security_block :discovery_rules do
+          permission :view_discovery_rules, {
+            :discovery_rules => [:index, :show, :auto_complete_search],
+            :"api/v2/discovery_rules" => [:index, :show]
+          }
+          permission :new_discovery_rules, {
+            :discovery_rules => [:new, :create],
+            :"api/v2/discovery_rules" => [:create]
+          }
+          permission :edit_discovery_rules, {
+            :discovery_rules => [:edit, :update, :enable, :disable],
+            :"api/v2/discovery_rules" => [:create, :update]
+          }
+          permission :execute_discovery_rules, {
+            :discovery_rules => [:auto_provision, :auto_provision_all],
+            :"api/v2/discovery_rules" => [:auto_provision, :auto_provision_all]
+          }
+          permission :delete_discovery_rules, {
+            :discovery_rules => [:destroy],
+            :"api/v2/discovery_rules" => [:destroy]
+          }
+        end
+
+        # roles (only added if they don't exist)
+        role "Discovery Manager", [:view_discovered_hosts, :provision_discovered_hosts, :edit_discovered_hosts, :destroy_discovered_hosts, :view_discovery_rules, :new_discovery_rules, :edit_discovery_rules, :execute_discovery_rules, :delete_discovery_rules]
+        role "Discovery Reader", [:view_discovered_hosts, :view_discovery_rules]
 
-        #add menu entry
-        menu :top_menu, :discovery, :url_hash => {:controller=> :discovered_hosts, :action=>:index},
+        # menu entries
+        menu :top_menu, :discovered_hosts, :url_hash => {:controller => :discovered_hosts, :action => :index},
           :caption=> N_('Discovered hosts'),
           :parent => :hosts_menu,
           :after=>:hosts
 
+        menu :top_menu, :discovery_rules, :url_hash => {:controller => :discovery_rules, :action => :index},
+          :caption => N_('Discovery rules'),
+          :parent => :configure_menu,
+          :after=> :hostgroups
+
         # add dashboard widget
-        widget 'discovery_widget', :name=>N_('Discovery widget'), :sizex => 4, :sizey =>1
+        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
       end
     end
+
+    initializer "foreman_discovery.load_app_instance_data" do |app|
+      app.config.paths['db/migrate'] += ForemanDiscovery::Engine.paths['db/migrate'].existent
+    end
+
     initializer "foreman_discovery.apipie" do
       # this condition is here for compatibility reason to work with Foreman 1.4.x
-      if Apipie.configuration.api_controllers_matcher.is_a?(Array) && Apipie.configuration.respond_to?(:checksum_path)
-        Apipie.configuration.api_controllers_matcher << "#{ForemanDiscovery::Engine.root}/app/controllers/api/v2/*.rb"
+      # Also need to handle the reverse of the 1.8 method above
+      unless (SETTINGS[:version].to_s.include?('develop') or Gem::Version.new(SETTINGS[:version]) >= Gem::Version.new('1.8'))
+        if Apipie.configuration.api_controllers_matcher.is_a?(Array)
+          Apipie.configuration.api_controllers_matcher << "#{ForemanDiscovery::Engine.root}/app/controllers/api/v2/*.rb"
+        end
+      end
+      if Apipie.configuration.respond_to?(:checksum_path)
         Apipie.configuration.checksum_path += ['/discovered_hosts/']
       end
     end
+
     # Include extensions to models in this config.to_prepare block
     config.to_prepare do
 
@@ -81,12 +141,19 @@ module ForemanDiscovery
         Rails.logger.warn 'PuppetFactParser not found, not loading Parser extensions'
       end
 
-      # Include host extensions
+      # Model extensions
       ::Host::Managed.send :include, Host::ManagedExtensions
+      ::Hostgroup.send :include, HostgroupExtensions
+
+      # Include subnet extensions
+      ::Subnet.send :include, DiscoverySubnet
     end
 
     rake_tasks do
       load "discovery.rake"
+      Rake::Task['db:seed'].enhance do
+        ForemanDiscovery::Engine.load_seed
+      end
     end
 
   end

data/lib/foreman_discovery/proxy_operations.rb

@@ -0,0 +1,18 @@
+module ForemanDiscovery
+  class ProxyOperations < ::ProxyAPI::Resource
+    def initialize args
+      @url  = args[:url]
+      @operation = args[:operation]
+      super args
+    end
+
+    def parse_put_operation
+      parse put({}, "/#{@operation}")
+    end
+
+    def parse_get_operation
+      @url  += "/#{@operation}"
+      parse get
+    end
+  end
+end

data/lib/foreman_discovery/version.rb

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

data/locale/de/foreman_discovery.po

@@ -9,7 +9,7 @@
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 16:47+0000\n"

data/locale/en_GB/foreman_discovery.po

@@ -7,7 +7,7 @@
 # Dominic Cleal <dcleal@redhat.com>, 2013-2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-22 09:57+0000\n"

data/locale/es/foreman_discovery.po

@@ -5,14 +5,14 @@
 # 
 # Translators:
 # francis <hackgo@gmail.com>, 2013-2014
-# Sergio Ocón <sergio.ocon@redhat.com>, 2014
+# Sergio Ocón <sergio@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-29 11:11+0000\n"
-"Last-Translator: Sergio Ocón <sergio.ocon@redhat.com>\n"
+"Last-Translator: Sergio Ocón <sergio@redhat.com>\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"

data/locale/fr/foreman_discovery.po

@@ -8,7 +8,7 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-25 08:30+0000\n"

data/locale/gl/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-08-22 09:57+0000\n"

data/locale/it/foreman_discovery.po

@@ -7,7 +7,7 @@
 # caifti <caifti@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:11+0000\n"

data/locale/ja/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"

data/locale/ko/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:21+0000\n"

data/locale/pt_BR/foreman_discovery.po

@@ -9,7 +9,7 @@
 # luizvasconcelos <luizvasconceloss@yahoo.com.br>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:30+0000\n"

data/locale/ru/foreman_discovery.po

@@ -8,7 +8,7 @@
 # Dominic Cleal <dcleal@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:30+0000\n"

data/locale/sv_SE/foreman_discovery.po

@@ -8,7 +8,7 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 1.4.1\n"
+"Project-Id-Version: foreman_discovery 1.4.0.rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-20 08:33+0100\n"
 "PO-Revision-Date: 2014-09-16 13:30+0000\n"