foreman_discovery 1.4.1 → 2.0.0.rc1

data/test/unit/discovery_attribute_set_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class DiscoveryAttributeSetTest < ActiveSupport::TestCase
+  test "can search discovered hosts by cpu" do
+    raw = parse_json_fixture('/facts.json')
+    host = Host::Discovered.import_host_and_facts(raw['facts']).first
+    results = Host::Discovered.search_for("cpu_count = #{host.facts_hash['physicalprocessorcount'].to_i}")
+    assert_equal 1, results.count
+    results = Host::Discovered.search_for("cpu_count > #{host.facts_hash['physicalprocessorcount'].to_i}")
+    assert_equal 0, results.count
+  end
+
+  test "can search discovered hosts by memory" do
+    raw = parse_json_fixture('/facts.json')
+    host = Host::Discovered.import_host_and_facts(raw['facts']).first
+    results = Host::Discovered.search_for("memory = #{host.facts_hash['memorysize_mb'].to_f.ceil}")
+    assert_equal 1, results.count
+    results = Host::Discovered.search_for("memory > #{host.facts_hash['memorysize_mb'].to_f.ceil}")
+    assert_equal 0, results.count
+  end
+
+  test "can search discovered hosts by disk_count" do
+    raw = parse_json_fixture('/facts.json')
+    host = Host::Discovered.import_host_and_facts(raw['facts']).first
+    results = Host::Discovered.search_for("disk_count = 1")
+    assert_equal 1, results.count
+    results = Host::Discovered.search_for("disk_count = 3")
+    assert_equal 0, results.count
+  end
+
+  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}")
+    assert_equal 1, results.count
+    results = Host::Discovered.search_for("disks_size > #{host.facts_hash['blockdevice_sda_size'].to_f.ceil}")
+    assert_equal 0, results.count
+  end
+
+  def parse_json_fixture(relative_path)
+    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
+  end
+end

data/test/unit/facts.json

@@ -87,6 +87,9 @@
     "vlans": "181,182,183",
     "lsbmajdistrelease": "6",
     "swapfree": "16.72 GB",
-    "netmask": "255.255.255.192"
+    "netmask": "255.255.255.192",
+    "discovery_bootif": "AA:BB:CC:DD:EE:FF",
+    "memorysize_mb": "742.13",
+    "blockdevice_sda_size": "214749184"
   }
 }

data/test/unit/host_discovered_test.rb

@@ -4,8 +4,12 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by_login "admin"
     FactoryGirl.create(:setting,
-                       :name     => 'discovery_fact',
-                       :value    => 'macaddress',
+                       :name => 'discovery_fact',
+                       :value => 'discovery_bootif',
+                       :category => 'Setting::Discovered')
+    FactoryGirl.create(:setting,
+                       :name => 'discovery_prefix',
+                       :value => 'mac',
                        :category => 'Setting::Discovered')
   end
 
@@ -17,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('mace41f13cc3658')
+    assert Host::Discovered.find_by_name('macaabbccddeeff')
   end
 
   test "should raise when fact_name setting isn't present" do
@@ -31,10 +35,46 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should be able to refresh facts" do
     host = Host.create :name => "mydiscoveredhost", :ip => "1.2.3.4", :type => "Host::Discovered"
     raw = parse_json_fixture('/facts.json')
-    ForemanDiscovery::Facts.any_instance.stubs(:facts).returns(raw['facts'])
+    ForemanDiscovery::ProxyOperations.any_instance.stubs(:parse_get_operation).returns(raw['facts'])
     assert host.refresh_facts
   end
 
+  test "should create discovered host with fact_name as a name" do
+    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
+  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
+  end
+
+  test "should not name discovered host with prefix that starts with a number, fallback to 'mac'" do
+    raw = parse_json_fixture('/facts.json')
+    Setting[:discovery_prefix] = '123'
+    host = Host::Discovered.import_host_and_facts(raw['facts']).first
+    assert host.name.start_with?('mac')
+  end
+
+  test "should not name discovered host with prefix that starts with a special character, fallback to 'mac'" do
+    raw = parse_json_fixture('/facts.json')
+    Setting[:discovery_prefix] = '^abc'
+    host = Host::Discovered.import_host_and_facts(raw['facts']).first
+    assert host.name.start_with?('mac')
+  end
+
+  test "should not name discovered host with prefix that starts with a _, fallback to 'mac'" do
+    raw = parse_json_fixture('/facts.json')
+    Setting[:discovery_prefix] = '_abc'
+    host = Host::Discovered.import_host_and_facts(raw['facts']).first
+    assert host.name.start_with?('mac')
+  end
+
   def parse_json_fixture(relative_path)
     return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
   end

metadata

@@ -1,44 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: open4
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.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'
-description: ! 'MaaS Discovery Plugin engine for Foreman '
+        version: '1.0'
+description: 'MaaS Discovery Plugin engine for Foreman '
 email: gsutclif@redhat.com
 executables: []
 extensions: []
@@ -46,80 +32,112 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- LICENSE
-- README.md
-- Rakefile
-- app/controllers/api/v2/discovered_hosts_controller.rb
+- app/controllers/discovery_rules_controller.rb
 - app/controllers/discovered_hosts_controller.rb
-- app/helpers/discovered_hosts_helper.rb
+- app/controllers/concerns/foreman/controller/discovered_extensions.rb
+- app/controllers/api/v2/discovery_rules_controller.rb
+- app/controllers/api/v2/discovered_hosts_controller.rb
 - app/lib/puppet_fact_parser_extensions.rb
+- app/helpers/discovery_rules_helper.rb
+- app/helpers/discovered_hosts_helper.rb
+- app/overrides/subnet_form_with_discovery_proxy.rb
+- app/models/setting/discovered.rb
+- app/models/hostgroup_extensions.rb
 - app/models/host/discovered.rb
 - app/models/host/managed_extensions.rb
-- app/models/setting/discovered.rb
-- 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/models/discovery_rule.rb
+- app/models/concerns/discovery_subnet.rb
+- app/models/discovery_attribute_set.rb
+- app/views/dashboard/_discovery_widget_host_list.html.erb
 - app/views/dashboard/_discovery_widget.html.erb
-- app/views/discovered_hosts/_discovered_hosts_list.html.erb
+- app/views/discovery_rules/new.html.erb
+- app/views/discovery_rules/edit.html.erb
+- app/views/discovery_rules/index.html.erb
+- app/views/discovery_rules/_form.html.erb
+- app/views/discovered_hosts/_discovered_host.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/index.html.erb
 - app/views/discovered_hosts/select_multiple_organization.html.erb
+- app/views/discovered_hosts/_discovered_hosts_list.html.erb
 - app/views/discovered_hosts/show.html.erb
-- config/initializers/discovery_setup.rb
-- config/routes.rb
+- app/views/discovered_hosts/select_multiple_location.html.erb
+- app/views/api/v2/discovery_rules/index.json.rabl
+- app/views/api/v2/discovery_rules/base.json.rabl
+- app/views/api/v2/discovery_rules/main.json.rabl
+- app/views/api/v2/discovery_rules/show.json.rabl
+- app/views/api/v2/discovered_hosts/index.json.rabl
+- app/views/api/v2/discovered_hosts/update.json.rabl
+- app/views/api/v2/discovered_hosts/auto_provision_all.json.rabl
+- app/views/api/v2/discovered_hosts/base.json.rabl
+- app/views/api/v2/discovered_hosts/main.json.rabl
+- app/views/api/v2/discovered_hosts/auto_provision.json.rabl
+- app/views/api/v2/discovered_hosts/show.json.rabl
 - extra/build_iso.sh
-- extra/discover_host
-- extra/discovery_init.sh.example
+- extra/wait_for_network.sh
 - extra/disk_facts.rb
+- extra/discover_host
 - extra/foreman_startup.rb
-- extra/ovirt-node-build/Vagrantfile
+- extra/discovery_init.sh.example
 - extra/ovirt-node-build/build_image.sh
-- extra/wait_for_network.sh
+- extra/ovirt-node-build/Vagrantfile
+- config/routes.rb
+- config/initializers/discovery_setup.rb
+- db/migrate/20141107091416_create_discovery_rules.rb
+- db/migrate/20141107091417_add_discovery_rule_to_host.rb
+- db/migrate/20141126165451_add_discovery_id_to_subnet.rb
+- db/migrate/20141223101707_create_discovery_attribute_sets.rb
+- db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb
+- db/seeds.d/60_discovery_proxy_feature.rb
 - lib/discovery.rake
 - lib/foreman_discovery.rb
-- lib/foreman_discovery/engine.rb
-- lib/foreman_discovery/facts.rb
+- lib/foreman_discovery/proxy_operations.rb
 - lib/foreman_discovery/version.rb
+- lib/foreman_discovery/engine.rb
+- locale/foreman_discovery.pot
 - locale/Makefile
-- locale/de/LC_MESSAGES/foreman_discovery.mo
+- locale/ru/foreman_discovery.po
+- locale/ru/LC_MESSAGES/foreman_discovery.mo
 - locale/de/foreman_discovery.po
-- locale/en_GB/LC_MESSAGES/foreman_discovery.mo
+- locale/de/LC_MESSAGES/foreman_discovery.mo
+- locale/pt_BR/foreman_discovery.po
+- locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
 - locale/en_GB/foreman_discovery.po
-- locale/es/LC_MESSAGES/foreman_discovery.mo
+- locale/en_GB/LC_MESSAGES/foreman_discovery.mo
+- locale/zh_TW/foreman_discovery.po
+- locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
 - locale/es/foreman_discovery.po
-- locale/foreman_discovery.pot
-- locale/fr/LC_MESSAGES/foreman_discovery.mo
+- locale/es/LC_MESSAGES/foreman_discovery.mo
 - locale/fr/foreman_discovery.po
-- locale/gl/LC_MESSAGES/foreman_discovery.mo
-- locale/gl/foreman_discovery.po
-- locale/it/LC_MESSAGES/foreman_discovery.mo
+- locale/fr/LC_MESSAGES/foreman_discovery.mo
 - locale/it/foreman_discovery.po
-- locale/ja/LC_MESSAGES/foreman_discovery.mo
+- locale/it/LC_MESSAGES/foreman_discovery.mo
 - locale/ja/foreman_discovery.po
-- locale/ko/LC_MESSAGES/foreman_discovery.mo
+- locale/ja/LC_MESSAGES/foreman_discovery.mo
 - locale/ko/foreman_discovery.po
-- locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
-- locale/pt_BR/foreman_discovery.po
-- locale/ru/LC_MESSAGES/foreman_discovery.mo
-- locale/ru/foreman_discovery.po
-- locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/foreman_discovery.po
-- locale/zanata.xml
-- locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
+- locale/ko/LC_MESSAGES/foreman_discovery.mo
 - locale/zh_CN/foreman_discovery.po
-- locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_TW/foreman_discovery.po
+- locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
+- locale/zanata.xml
+- locale/gl/foreman_discovery.po
+- locale/gl/LC_MESSAGES/foreman_discovery.mo
+- locale/sv_SE/foreman_discovery.po
+- locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
+- LICENSE
+- README.md
+- test/functional/discovery_rules_controller_test.rb
+- test/functional/api/v2/discovery_rules_controller_test.rb
+- test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/discovered_hosts_controller_test.rb
-- test/test_helper.rb
-- test/test_plugin_helper.rb
+- test/factories/discovery_rule_related.rb
+- test/unit/discovered_extensions_test.rb
+- test/unit/discovery_attribute_set_test.rb
+- test/unit/setting_discovered_test.rb
 - test/unit/facts.json
-- test/unit/host_discovered_test.rb
 - test/unit/puppet_fact_parser_extensions_test.rb
-- test/unit/setting_discovered_test.rb
+- test/unit/host_discovered_test.rb
+- test/test_plugin_helper.rb
+- test/test_helper.rb
 homepage: http://github.com/theforeman/foreman_discovery
 licenses:
 - GPL-3
@@ -130,25 +148,32 @@ 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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/test_plugin_helper.rb
+- test/functional/discovery_rules_controller_test.rb
+- test/functional/api/v2/discovery_rules_controller_test.rb
+- test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/discovered_hosts_controller_test.rb
-- test/test_helper.rb
+- test/factories/discovery_rule_related.rb
+- test/unit/discovered_extensions_test.rb
+- test/unit/discovery_attribute_set_test.rb
+- test/unit/setting_discovered_test.rb
 - test/unit/facts.json
 - test/unit/puppet_fact_parser_extensions_test.rb
-- test/unit/setting_discovered_test.rb
 - test/unit/host_discovered_test.rb
+- test/test_plugin_helper.rb
+- test/test_helper.rb
+has_rdoc: 

data/Rakefile

@@ -1,110 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'rake'
-require 'fileutils'
-
-task :default => :test
-
-PLUGIN_NAME = "discovery"
-ENGINE_DIR = File.expand_path('..', __FILE__)
-FOREMAN_DIR = '.foreman_app'
-
-ENV['TEXTDOMAIN'] = PLUGIN_NAME
-import "#{FOREMAN_DIR}/Rakefile" if File.exists? "#{FOREMAN_DIR}/Rakefile"
-
-namespace :setup do
-  desc "Download latest foreman core devel source and install dependencies"
-  task :foreman_prepare do
-    foreman_repo = 'https://github.com/theforeman/foreman.git'
-    foreman_gemfile = File.join(FOREMAN_DIR, "Gemfile")
-    unless File.exists?(foreman_gemfile)
-      puts "Foreman source code is not present at #{FOREMAN_DIR}"
-      puts "Downloading latest Foreman development branch into #{FOREMAN_DIR}..."
-      FileUtils.mkdir_p(FOREMAN_DIR)
-
-      unless system("git clone --depth 1 #{foreman_repo} #{FOREMAN_DIR}")
-        puts "Error while getting latest Foreman code from #{foreman_repo} into #{FOREMAN_DIR}"
-        fail
-      end
-    end
-
-    settings_file = "#{FOREMAN_DIR}/config/settings.yaml"
-    unless File.exists?(settings_file)
-      puts 'Preparing settings file'
-      FileUtils.copy("#{settings_file}.example", settings_file)
-      settings_content = File.read(settings_file)
-      settings_content.sub!('organizations_enabled: false', 'organizations_enabled: true')
-      settings_content << ":puppetgem: true\n"
-      File.open(settings_file, 'w') { |f| f << settings_content }
-    end
-
-    db_file = "#{FOREMAN_DIR}/config/database.yml"
-    unless File.exists?(db_file)
-      puts 'Preparing database file'
-      FileUtils.copy("#{db_file}.example", db_file)
-    end
-
-    ["#{ENGINE_DIR}/.bundle/config", "#{FOREMAN_DIR}/.bundle/config"].each do |bundle_file|
-      unless File.exists?(bundle_file)
-        FileUtils.mkdir_p(File.dirname(bundle_file))
-        puts 'Preparing bundler configuration'
-        File.open(bundle_file, 'w') { |f| f << <<FILE }
----
-BUNDLE_WITHOUT: console:development:fog:jsonp:libvirt:mysql:mysql2:ovirt:postgresql:vmware
-FILE
-      end
-    end
-
-    local_gemfile = "#{FOREMAN_DIR}/bundler.d/Gemfile.local.rb"
-    unless File.exist?(local_gemfile)
-      File.open(local_gemfile, 'w') { |f| f << <<GEMFILE }
-gem "puppet"
-gem "facter"
-GEMFILE
-    end
-
-    puts 'Installing dependencies...'
-    unless system('bundle install')
-      fail
-    end
-  end
-
-  task :db_prepare do
-    unless File.exists?(FOREMAN_DIR)
-      puts <<MESSAGE
-Foreman source code not prepared. Run
-
-  rake setup:foreman_prepare
-
-to download foreman source and its dependencies
-MESSAGE
-      fail
-    end
-
-    # once we are Ruby19 only, switch to block variant of cd
-    pwd = FileUtils.pwd
-    FileUtils.cd(FOREMAN_DIR)
-    unless system('rake db:test:prepare RAILS_ENV=test')
-      puts "Migrating database first"
-      system('rake db:migrate db:schema:dump db:test:prepare RAILS_ENV=test') || fail
-    end
-    FileUtils.cd(pwd)
-  end
-
-  task :all => [:foreman_prepare, :db_prepare]
-end
-
-namespace :test do
-  task :set_loadpath do
-    %w[lib test].each do |dir|
-      $:.unshift(File.expand_path(dir, ENGINE_DIR))
-    end
-  end
-
-  task :all => ['setup:db_prepare', 'test:set_loadpath'] do
-    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','') unless f.include? '.foreman_app/' }
-  end
-end
-
-task :test => 'test:all'