foreman_default_hostgroup 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fff9eac64ccb1b62640e34d82cc89c2453b85e8
-  data.tar.gz: 76a8cd81e26eb4fa703c01a3d659242f8afe9876
+  metadata.gz: 8405ed690d11f8d107656ee4a9237c14b0a41b99
+  data.tar.gz: 45e335b0f194f8016c020b533e0fee740b4869a3
 SHA512:
-  metadata.gz: 6a79eb9494c88912b3d33cd22624a78eaeefa938263f8d49fbbe2ba5a2c22db35b0d638093b72e033f4bd5d3027f7b74e670e24a6217c09642b4d567fbdadbf4
-  data.tar.gz: 8bc987cfb7e8759e36530cdabb7935601a0d84ca2e71c83a82294897886bce6ce2914723fa390695d84d7ed10639b9d73b5eb9d0f8f0968544c10d486b3748cd
+  metadata.gz: 2a06c0e8a304b5775e594261fc4fde1b906312f00a057bfbd415a3796e36c37915e8c1c4442ee9e16adc6546063ad35dcab980adf3095088403b00a6c4c832d1
+  data.tar.gz: a68ce3071ce99f86a14a6f87571de073932822d2ee7b94fba7d3acf7b2f6a11618491a22385b8af00027b05aeb85bf08b45bdc35cf404e17ee51eb97ef529924

data/README.md

@@ -5,8 +5,7 @@ a Hostgroup set.
 
 ## Installation
 
-See [How_to_Install_a_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
-for how to install Foreman plugins
+See Foreman's [plugin installation documentation](https://theforeman.org/plugins/#2.Installation).
 
 ## Compatibility
 
@@ -16,12 +15,13 @@ for how to install Foreman plugins
 |    1.3          | 1.0.1          |
 |    1.4          | 1.1.0          |
 |    1.5          | 2.0.1          |
-| >= 1.6          | 3.0.0          |
+|    1.6 - 1.11   | 3.0.0          |
+| >= 1.12         | 4.0.0          |
 
 ## Usage
 
 The configuration is done inside foreman's plugin settings directory which is
-`~foreman/config/settings.plugins.d/`.
+`/etc/foreman/plugins/`.
 
 You can simply copy `default_hostgroup.yaml.example` and adjust it to fit
 your needs. The format is shown in the example. The simplest form would be:
@@ -33,6 +33,9 @@ your needs. The format is shown in the example. The simplest form would be:
     "Default":
       "hostname": ".*"
 ```
+If you are ugrading from plugin version 2.0.1 or older the format of this
+file changes and you will need modify `default_hostgroup.yaml.example` to
+follow the format above.
 
 *Important Note:* You have to restart foreman in order to apply changes in
 `default_hostgroup.yaml`!

data/app/models/setting/default_hostgroup.rb

@@ -3,17 +3,17 @@ class Setting::DefaultHostgroup < ::Setting
 
   def self.load_defaults
     # Check the table exists
+    return unless ActiveRecord::Base.connection.table_exists?('settings')
     return unless super
 
-      Setting.transaction do
-        [
-          self.set('force_hostgroup_match', 'Apply hostgroup matching even if a host already has one.', false),
-          self.set('force_hostgroup_match_only_new', 'Apply hostgroup matching only on new hosts', true),
-        ].compact.each { |s| self.create s.update(:category => 'Setting::DefaultHostgroup')}
-      end
+    Setting.transaction do
+      [
+        set('force_hostgroup_match', 'Apply hostgroup matching even if a host already has one.', false),
+        set('force_hostgroup_match_only_new', 'Apply hostgroup matching only on new hosts', true),
+        set('force_host_environment', "Apply hostgroup's environment to host even if a host already has a different one", true)
+      ].compact.each { |s| create s.update(category: 'Setting::DefaultHostgroup') }
+    end
 
     true
-
   end
-
 end

data/lib/default_hostgroup.rake

@@ -1,21 +1,34 @@
+# Tests
 namespace :test do
   desc "Test DefaultHostgroup plugin"
-  Rake::TestTask.new(:default_hostgroup) do |t|
+  Rake::TestTask.new(:foreman_default_hostgroup) do |t|
     test_dir = File.join(File.dirname(__FILE__), '..', 'test')
     t.libs << ["test",test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
   end
-
 end
 
-Rake::Task[:test].enhance do
-  Rake::Task['test:default_hostgroup'].invoke
+namespace :foreman_default_hostgroup do
+  task :rubocop do
+    begin
+      require 'rubocop/rake_task'
+      RuboCop::RakeTask.new(:rubocop_foreman_default_hostgroup) do |task|
+        task.patterns = ["#{ForemanDefaultHostgroup::Engine.root}/app/**/*.rb",
+                         "#{ForemanDefaultHostgroup::Engine.root}/lib/**/*.rb",
+                         "#{ForemanDefaultHostgroup::Engine.root}/test/**/*.rb"]
+      end
+    rescue
+      puts 'Rubocop not loaded.'
+    end
+
+    Rake::Task['rubocop_foreman_default_hostgroup'].invoke
+  end
 end
 
+Rake::Task[:test].enhance ['test:foreman_default_hostgroup']
+
 load 'tasks/jenkins.rake'
-if Rake::Task.task_defined?(:'jenkins:setup')
-  Rake::Task["jenkins:unit"].enhance do
-    Rake::Task['test:default_hostgroup'].invoke
-  end
+if Rake::Task.task_defined?(:'jenkins:unit')
+  Rake::Task['jenkins:unit'].enhance ['test:foreman_default_hostgroup', 'foreman_default_hostgroup:rubocop']
 end

data/lib/default_hostgroup_base_host_patch.rb

@@ -0,0 +1,83 @@
+module DefaultHostgroupBaseHostPatch
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :import_facts, :match_hostgroup
+  end
+
+  def import_facts_with_match_hostgroup(facts)
+    # Load the facts anyway, hook onto the end of it
+    result = import_facts_without_match_hostgroup(facts)
+
+    return result unless settings_exist?
+
+    Rails.logger.debug 'DefaultHostgroupMatch: performing Hostgroup match'
+
+    return result unless host_new_or_forced?
+    return result unless host_has_no_hostgroup_or_forced?
+
+    facts_map = SETTINGS[:default_hostgroup][:facts_map]
+    new_hostgroup = find_match(facts_map)
+
+    return result unless new_hostgroup
+
+    self.hostgroup = new_hostgroup
+    if Setting[:force_host_environment] == true
+      self.environment = new_hostgroup.environment
+    end
+    save(validate: false)
+    Rails.logger.info "DefaultHostgroupMatch: #{hostname} added to #{new_hostgroup}"
+
+    result
+  end
+
+  def find_match(facts_map)
+    facts_map.each do |group_name, facts|
+      hg = Hostgroup.find_by_title(group_name)
+      return hg if hg.present? && group_matches?(facts)
+    end
+    Rails.logger.info 'No match ...'
+    false
+  end
+
+  def group_matches?(facts)
+    facts.each do |fact_name, fact_regex|
+      fact_regex.gsub!(%r{(\A/|/\z)}, '')
+      host_fact_value = facts_hash[fact_name]
+      Rails.logger.info "Fact = #{fact_name}"
+      Rails.logger.info "Regex = #{fact_regex}"
+      return true if Regexp.new(fact_regex).match(host_fact_value)
+    end
+    false
+  end
+
+  def settings_exist?
+    unless SETTINGS[:default_hostgroup] && SETTINGS[:default_hostgroup][:facts_map]
+      Rails.logger.warn 'DefaultHostgroupMatch: Could not load :default_hostgroup map from Settings.'
+      return false
+    end
+    true
+  end
+
+  def host_new_or_forced?
+    if Setting[:force_hostgroup_match_only_new]
+      # hosts have already been saved during import_host, so test the creation age instead
+      new_host = ((Time.current - created_at) < 300)
+      unless new_host && hostgroup.nil? && reports.empty?
+        Rails.logger.debug 'DefaultHostgroupMatch: skipping, host exists'
+        return false
+      end
+    end
+    true
+  end
+
+  def host_has_no_hostgroup_or_forced?
+    unless Setting[:force_hostgroup_match]
+      if hostgroup.present?
+        Rails.logger.debug 'DefaultHostgroupMatch: skipping, host has hostgroup'
+        return false
+      end
+    end
+    true
+  end
+end

data/lib/foreman_default_hostgroup/engine.rb

@@ -1,28 +1,33 @@
-require 'default_hostgroup_managed_host_patch'
+require 'default_hostgroup_base_host_patch'
 
 module ForemanDefaultHostgroup
-  #Inherit from the Rails module of the parent app (Foreman), not the plugin.
-  #Thus, inherits from ::Rails::Engine and not from Rails::Engine
+  # 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
-
-    # Load this before the Foreman config initizializers, so that the Setting.descendants
-    # list includes the plugin STI setting class
-    initializer 'foreman_discovery.load_default_settings', :before => :load_config_initializers do |app|
-      require_dependency File.expand_path("../../../app/models/setting/default_hostgroup.rb", __FILE__) if (Setting.table_exists? rescue(false))
+    initializer 'foreman_default_hostgroup.load_default_settings',
+                before: :load_config_initializers do
+      require_dependency File.expand_path(
+        '../../../app/models/setting/default_hostgroup.rb', __FILE__)
     end
 
-    initializer 'foreman_default_hostgroup.register_plugin', :after=> :finisher_hook do |app|
-      Foreman::Plugin.register :foreman_default_hostgroup do
-      end if (Rails.env == "development" or defined? Foreman::Plugin)
+    initializer 'foreman_default_hostgroup.register_plugin',
+                before: :finisher_hook do
+      Foreman::Plugin.register :foreman_plugin_template do
+        requires_foreman '>= 1.12'
+      end
     end
 
     config.to_prepare do
-      ::Host::Managed.send :include, DefaultHostgroupManagedHostPatch
+      begin
+        ::Host::Base.send(:include, DefaultHostgroupBaseHostPatch)
+      rescue => e
+        Rails.logger.warn "ForemanDefaultHostgroup: skipping engine hook (#{e})"
+      end
     end
 
     rake_tasks do
-      load "default_hostgroup.rake"
+      load 'default_hostgroup.rake'
     end
-
   end
 end

data/lib/foreman_default_hostgroup/version.rb

@@ -1,3 +1,3 @@
 module ForemanDefaultHostgroup
-  VERSION = "3.0.0"
+  VERSION = '4.0.0'.freeze
 end

data/test/unit/default_hostgroup_test.rb

@@ -1,155 +1,219 @@
 require 'test_plugin_helper'
 
+# Tests for the plugin
 class DefaultHostgroupTest < ActiveSupport::TestCase
   setup do
     disable_orchestration
-    User.current = User.find_by_login "admin"
+    User.current = User.find_by_login 'admin'
+    setup_hostgroup_matchers
+    setup_host_and_facts
   end
 
-  def parse_json_fixture(relative_path)
-    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
-  end
-
-  def setup_hostgroup_match
+  def setup_hostgroup_matchers
     # The settings.yml fixture in Core wipes out the Setting table,
     # so we use FactoryGirl to re-create it
     FactoryGirl.create(:setting,
-                       :name => 'force_hostgroup_match',
-                       :category => 'Setting::DefaultHostgroup')
+                       name: 'force_hostgroup_match',
+                       category: 'Setting::DefaultHostgroup')
     FactoryGirl.create(:setting,
-                       :name => 'force_hostgroup_match_only_new',
-                       :category => 'Setting::DefaultHostgroup')
+                       name: 'force_hostgroup_match_only_new',
+                       category: 'Setting::DefaultHostgroup')
+    FactoryGirl.create(:setting,
+                       name: 'force_host_environment',
+                       category: 'Setting::DefaultHostgroup')
+    # Set the defaults
     Setting[:force_hostgroup_match] = false
     Setting[:force_hostgroup_match_only_new] = true
-    SETTINGS[:default_hostgroup] = Hash.new
+    Setting[:force_host_environment] = true
+
+    # Mimic plugin config fron config file
+    FactoryGirl.create(:hostgroup, :with_environment, name: 'Test Default')
+    SETTINGS[:default_hostgroup] = {}
+    SETTINGS[:default_hostgroup][:facts_map] = {
+      'Test Default' => { 'hostname' => '.*' }
+    }
   end
 
-  test "full matching regex not enclosed in /" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "Test Full" => {'hostname' =>'^sinn1636.lan$'} }
-
-    hostgroup = Hostgroup.create(:name => "Test Full")
-    raw = parse_json_fixture('/facts.json')
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  def setup_host_and_facts
+    raw = JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + '/facts.json')))
+    @name  = raw['name']
+    @host  = Host.import_host(raw['name'], 'puppet')
+    @facts = raw['facts']
   end
 
-  test "partial matching regex enclosed in /" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "Test Partial" => {'hostname' => '/\.lan$/' }}
-
-    hostgroup = Hostgroup.create(:name => "Test Partial")
-    raw = parse_json_fixture('/facts.json')
+  context 'import_facts_with_match_hostgroup' do
+    test 'matched host is saved with new hostgroup' do
+      assert @host.import_facts(@facts)
+      assert_equal Hostgroup.find_by_name('Test Default'), Host.find_by_name(@name).hostgroup
+    end
 
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
-  end
+    test 'matched host not updated if host already has a hostgroup' do
+      hostgroup = FactoryGirl.create(:hostgroup)
+      @host.hostgroup = hostgroup
+      @host.save(validate: false)
 
-  test "invalid hostgroup name is ignored" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "Nonexistent Group" => {'hostname' => '.*'}, "Existent Group" => {'hostname' => '/\.lan$/'} }
+      assert @host.import_facts(@facts)
+      assert_equal hostgroup, Host.find_by_name(@name).hostgroup
+    end
 
-    hostgroup = Hostgroup.create(:name => "Existent Group")
-    raw = parse_json_fixture('/facts.json')
+    test 'hostgroup is not updated if host is not new' do
+      @host.created_at = Time.current - 1000
+      @host.save(validate: false)
 
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+      assert @host.import_facts(@facts)
+      refute Host.find_by_name(@name).hostgroup
+    end
   end
 
-  test "first matching hostgroup is used" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "First Group" => {'hostname' => '.*'}, "Second Group" => {'hostname' => '.*'} }
-
-    hostgroup = Hostgroup.create(:name => "First Group")
-    raw = parse_json_fixture('/facts.json')
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  context 'force host environment setting' do
+    test 'environment is updated if enabled' do
+      h = FactoryGirl.create(:host, :with_environment, created_at: Time.current)
+      h.import_facts(@facts)
+      assert_equal Hostgroup.find_by_name('Test Default').environment, h.environment
+    end
+
+    test 'environment not updated if disabled' do
+      Setting[:force_host_environment] = false
+      h = FactoryGirl.create(:host, :with_environment, created_at: Time.current)
+      h.import_facts(@facts)
+      refute_equal Hostgroup.find_by_name('Test Default').environment, h.environment
+    end
   end
 
-  test "invalid keys ignored" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "First Group" => {'nosuchfact' => '.*', 'hostname' => '.*'} }
-
-    hostgroup = Hostgroup.create(:name => "First Group")
-    raw = parse_json_fixture('/facts.json')
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  context 'find_match' do
+    # takes a config map, returns a group or false
+    test 'match a single hostgroup' do
+      facts_map = SETTINGS[:default_hostgroup][:facts_map]
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert_equal Hostgroup.find_by_name('Test Default'), @host.find_match(facts_map)
+    end
+
+    test 'returns false for no match' do
+      facts_map = SETTINGS[:default_hostgroup][:facts_map] = {
+        'Test Default'     => { 'hostname' => 'nosuchhost' }
+      }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      refute @host.find_match(facts_map)
+    end
+
+    test 'matches first available hostgroup' do
+      facts_map = SETTINGS[:default_hostgroup][:facts_map] = {
+        'Test Default'     => { 'hostname' => '.*' },
+        'Some Other Group' => { 'hostname' => '/\.lan$/' }
+      }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert_equal Hostgroup.find_by_name('Test Default'), @host.find_match(facts_map)
+    end
+
+    test 'nonexistant groups are ignored' do
+      facts_map = SETTINGS[:default_hostgroup][:facts_map] = {
+        'Some Other Group' => { 'hostname' => '.*' },
+        'Test Default'     => { 'hostname' => '/\.lan$/' }
+      }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert_equal Hostgroup.find_by_name('Test Default'), @host.find_match(facts_map)
+    end
   end
 
-  test "unmatched values ignored" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "First Group" => {'hostname' => 'nosuchname', 'osfamily' => '.*'} }
-
-    hostgroup = Hostgroup.create(:name => "First Group")
-    raw = parse_json_fixture('/facts.json')
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  context 'group_matches?' do
+    # passing a hash of (group_name, regex) pairs
+    test 'full regex matches' do
+      regex = { 'hostname' => '^sinn1636.lan$' }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert @host.group_matches?(regex)
+    end
+
+    test 'partial regex matches' do
+      regex = { 'hostname' => '.lan$' }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert @host.group_matches?(regex)
+    end
+
+    test 'regex slashes are stripped' do
+      regex = { 'hostname' => '/\.lan$/' }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert @host.group_matches?(regex)
+    end
+
+    test 'invalid keys are ignored' do
+      regex = { 'nosuchfact' => '.*' }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      refute @host.group_matches?(regex)
+    end
+
+    test 'unmatched values are ignored' do
+      regex = { 'hostname' => 'nosuchname' }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      refute @host.group_matches?(regex)
+    end
+
+    test 'multiple entries with invalid keys / values match' do
+      regex = {
+        'nosuchfact' => '.*',
+        'osfamily'   => 'nosuchos',
+        'hostname'   => '.lan$'
+      }
+      assert @host.import_facts_without_match_hostgroup(@facts)
+      assert @host.group_matches?(regex)
+    end
   end
 
-  test "default hostgroup" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "Test Default" => {'hostname' =>'.*'} }
-
-    hostgroup = Hostgroup.create(:name => "Test Default")
-    raw = parse_json_fixture('/facts.json')
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  context 'settings_exist?' do
+    test 'true when Settings exist' do
+      h = FactoryGirl.create(:host)
+      assert h.settings_exist?
+    end
+
+    test 'false when Settings are missing' do
+      SETTINGS[:default_hostgroup] = {}
+      h = FactoryGirl.create(:host)
+      refute h.settings_exist?
+    end
   end
 
-  test "host already has a hostgroup" do
-    setup_hostgroup_match
-    SETTINGS[:default_hostgroup][:facts_map] = { "Test Default" => {'hostname' => '.*'} }
-
-    hostgroup = Hostgroup.create(:name => "Test Group")
-    Hostgroup.create(:name => "Test Default")
-    raw = parse_json_fixture('/facts.json')
-
-    host, result = Host.import_host_and_facts_without_match_hostgroup(raw['name'], raw['facts'])
-    host.hostgroup = hostgroup
-    host.save(:validate => false)
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  context 'host_new_or_forced?' do
+    test 'true when host is new' do
+      h = FactoryGirl.create(:host, created_at: Time.current)
+      assert h.host_new_or_forced?
+    end
+
+    test 'false when host has existed for > 300s' do
+      h = FactoryGirl.create(:host, created_at: Time.current - 1000)
+      refute h.host_new_or_forced?
+    end
+
+    test 'false when host has a hostgroup' do
+      h = FactoryGirl.create(:host, :with_hostgroup, created_at: Time.current)
+      refute h.host_new_or_forced?
+    end
+
+    test 'false when host has reports' do
+      h = FactoryGirl.create(:host, :with_reports, created_at: Time.current)
+      refute h.host_new_or_forced?
+    end
+
+    test 'true when setting is forced' do
+      Setting[:force_hostgroup_match_only_new] = false
+      h = FactoryGirl.create(:host, :with_hostgroup, created_at: Time.current)
+      assert h.host_new_or_forced?
+    end
   end
 
-  test "force hostgroup match on host with existing hostgroup" do
-    setup_hostgroup_match
-    Setting[:force_hostgroup_match] = true
-    Setting[:force_hostgroup_match_only_new] = false
-    SETTINGS[:default_hostgroup][:facts_map] = { "Test Default" => {'hostname' => '.*'} }
-
-    hostgroup = Hostgroup.create(:name => "Test Group")
-    default = Hostgroup.create(:name => "Test Default")
-    raw = parse_json_fixture('/facts.json')
-
-    host, result = Host.import_host_and_facts_without_match_hostgroup(raw['name'], raw['facts'])
-    host.hostgroup = hostgroup
-    host.save(:validate => false)
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal default, Host.find_by_name('sinn1636.lan').hostgroup
+  context 'host_has_no_hostgroup_or_forced?' do
+    test 'true if host has no hostgroup' do
+      h = FactoryGirl.create(:host)
+      assert h.host_has_no_hostgroup_or_forced?
+    end
+
+    test 'false if host has hostgroup' do
+      h = FactoryGirl.create(:host, :with_hostgroup)
+      refute h.host_has_no_hostgroup_or_forced?
+    end
+
+    test 'true if host has hostgroup and setting forced' do
+      Setting[:force_hostgroup_match] = true
+      h = FactoryGirl.create(:host, :with_hostgroup)
+      assert h.host_has_no_hostgroup_or_forced?
+    end
   end
-
-  test "hostgroup is not updated if host is not new" do
-    setup_hostgroup_match
-    Setting[:force_hostgroup_match] = true
-    SETTINGS[:default_hostgroup][:facts_map] = { "Test Default" => {'hostname' => '.*'} }
-
-    hostgroup = Hostgroup.create(:name => "Test Group")
-    Hostgroup.create(:name => "Test Default")
-    raw = parse_json_fixture('/facts.json')
-
-    host, result = Host.import_host_and_facts_without_match_hostgroup(raw['name'], raw['facts'])
-    host.hostgroup = hostgroup
-    host.save(:validate => false)
-
-    assert Host.import_host_and_facts(raw['name'], raw['facts'])
-    assert_equal hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_default_hostgroup
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies: []
 description: Adds the option to specify a default hostgroup for new hosts created
   from facts/reports
@@ -24,7 +24,7 @@ files:
 - app/models/setting/default_hostgroup.rb
 - default_hostgroup.yaml.example
 - lib/default_hostgroup.rake
-- lib/default_hostgroup_managed_host_patch.rb
+- lib/default_hostgroup_base_host_patch.rb
 - lib/foreman_default_hostgroup.rb
 - lib/foreman_default_hostgroup/engine.rb
 - lib/foreman_default_hostgroup/version.rb
@@ -51,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Default Hostgroup Plugin for Foreman

data/lib/default_hostgroup_managed_host_patch.rb

@@ -1,74 +0,0 @@
-module DefaultHostgroupManagedHostPatch
-  def self.included(base)
-    base.extend ClassMethods
-    base.class_eval do
-      class << self
-        alias_method_chain :import_host_and_facts, :match_hostgroup
-      end
-    end
-  end
-
-  module ClassMethods
-    def import_host_and_facts_with_match_hostgroup hostname, facts, certname = nil, proxy_id = nil
-      @host, result = import_host_and_facts_without_match_hostgroup(hostname, facts, certname, proxy_id)
-
-      unless SETTINGS[:default_hostgroup] && SETTINGS[:default_hostgroup][:facts_map]
-        Rails.logger.warn "DefaultHostgroupMatch: Could not load default_hostgroup map from settings, check config."
-        return @host, result
-      end
-
-      Rails.logger.debug "DefaultHostgroupMatch: performing Hostgroup match"
-
-      if Setting[:force_hostgroup_match_only_new]
-        # host.new_record? will only test for the early return in the core method, a real host
-        # will have already been saved at least once.
-        unless @host.present? && !@host.new_record? && @host.hostgroup.nil? && @host.reports.empty?
-
-          Rails.logger.debug "DefaultHostgroupMatch: skipping, host exists"
-          return @host, result
-        end
-      end
-
-      unless Setting[:force_hostgroup_match]
-        if @host.hostgroup.present?
-          Rails.logger.debug "DefaultHostgroupMatch: skipping, host has hostgroup"
-          return @host, result
-        end
-      end
-
-      facts_map = SETTINGS[:default_hostgroup][:facts_map]
-      new_hostgroup = find_match(facts_map)
-
-      return @host, result unless new_hostgroup
-
-      @host.hostgroup = new_hostgroup
-      @host.save(:validate => false)
-      Rails.logger.info "DefaultHostgroupMatch: #{hostname} added to #{new_hostgroup}"
-
-      return @host, result
-    end
-
-    def group_matches?(fact)
-      fact.each do |fact_name, fact_regex|
-        fact_regex.gsub!(/(\A\/|\/\z)/, '')
-        host_fact_value = @host.facts_hash[fact_name]
-        Rails.logger.info "Fact = #{fact_name}"
-        Rails.logger.info "Regex = #{fact_regex}"
-        return true if Regexp.new(fact_regex).match(host_fact_value)
-      end
-      return false
-    end
-
-    def find_match(facts_map)
-      facts_map.each do |group_name, facts|
-        return Hostgroup.find_by_title(group_name) if group_matches?(facts) and valid_hostgroup?(group_name)
-      end
-      Rails.logger.info "No match ..."
-      return false
-    end
-
-    def valid_hostgroup?(hostgroup)
-      Hostgroup.find_by_title(hostgroup) ? true : false
-    end
-  end
-end