foreman_default_hostgroup 1.0.0 → 1.0.1

data/README.md

@@ -13,7 +13,7 @@ for how to install Foreman plugins
 | Foreman Version | Plugin Version |
 | --------------- | --------------:|
 | <= 1.2          | 0.1.0          |
-| >= 1.3          | 1.0.0          |
+| >= 1.3          | 1.0.1          |
 
 ## Usage
 

data/lib/default_hostgroup.rake

@@ -0,0 +1,15 @@
+namespace :test do
+  desc "Test DefaultHostgroup plugin"
+  Rake::TestTask.new(: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
+end
+

data/lib/default_hostgroup_managed_host_patch.rb

@@ -13,6 +13,12 @@ module DefaultHostgroupManagedHostPatch
     def importHostAndFacts_with_apply_hostgroup hostname, facts, certname = nil
       host, result = importHostAndFacts_without_apply_hostgroup(hostname, facts, certname)
       Rails.logger.debug "DefaultHostgroup: performing Hostgroup check"
+
+      unless valid_hostgroup?
+        Rails.logger.debug "DefaultHostgroup: Could not find Hostgroup '#{Setting[:default_hostgroup]}'"
+        return host, result
+      end
+
       # 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.
       if host.present? && !host.new_record? && host.hostgroup.nil? && host.reports.empty?
@@ -22,5 +28,9 @@ module DefaultHostgroupManagedHostPatch
       end
       return host, result
     end
+
+    def valid_hostgroup?
+      Hostgroup.find_by_label(Setting[:default_hostgroup]) ? true : false
+    end
   end
 end

data/lib/foreman_default_hostgroup/engine.rb

@@ -15,5 +15,9 @@ module ForemanDefaultHostgroup
       ::Host::Managed.send :include, DefaultHostgroupManagedHostPatch
     end
 
+    rake_tasks do
+      load "default_hostgroup.rake"
+    end
+
   end
 end

data/lib/foreman_default_hostgroup/version.rb

@@ -1,3 +1,3 @@
 module ForemanDefaultHostgroup
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/unit/default_hostgroup_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+class DefaultHostgroupTest < ActiveSupport::TestCase
+  setup do
+    disable_orchestration
+    User.current = User.find_by_login "admin"
+
+    # this is not being run automatically by the
+    # initializers, for some strange reason....
+    Setting::DefaultHostgroup.load_defaults
+  end
+
+  def parse_json_fixture(relative_path)
+    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
+  end
+
+  def setup_hostgroup
+    @hostgroup = Hostgroup.create :name => "MyGroup"
+    Setting[:default_hostgroup] = @hostgroup.name
+  end
+
+  test "a new, fact-imported, host has a default hostgroup set" do
+    setup_hostgroup
+    raw = parse_json_fixture('/facts.json')
+    assert Host.importHostAndFacts(raw['name'], raw['facts'])
+    assert_equal @hostgroup, Host.find_by_name('sinn1636.lan').hostgroup
+  end
+
+  test "an invalid hostgroup setting does nothing" do
+    setup_hostgroup
+    Setting[:default_hostgroup] = "doesnotexist"
+    raw = parse_json_fixture('/facts.json')
+    assert     Host.importHostAndFacts(raw['name'], raw['facts'])
+    refute Host.find_by_name('sinn1636.lan').hostgroup
+  end
+
+end

data/test/unit/facts.json

@@ -0,0 +1,92 @@
+{
+  "name": "sinn1636.lan",
+  "facts": {
+    "processor3": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "productname": "IBM System x -[7870K4G]-",
+    "kernelmajversion": "2.6",
+    "kernelversion": "2.6.32",
+    "macaddress_vnet0": "FE:54:00:1E:45:13",
+    "macaddress_br181": "E4:1F:13:CC:36:58",
+    "macaddress_usb0": "E6:1F:13:D0:43:A3",
+    "macaddress_vnet1": "FE:54:00:45:E5:3E",
+    "rubysitedir": "/usr/lib/ruby/site_ruby/1.8",
+    "macaddress_br182": "E4:1F:13:CC:36:58",
+    "processor4": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet2": "FE:54:00:93:F5:56",
+    "macaddress_br183": "E4:1F:13:CC:36:58",
+    "ps": "ps -ef",
+    "processor5": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet10": "FE:54:00:7D:F8:24",
+    "uniqueid": "230a021b",
+    "macaddress_vnet3": "FE:54:00:05:49:DE",
+    "lsbdistcodename": "Santiago",
+    "hardwareisa": "x86_64",
+    "lsbdistrelease": "6.2",
+    "processor6": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "serialnumber": "abcdefg",
+    "processor7": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_vnet4": "FE:54:00:62:53:67",
+    "hostname": "h02",
+    "osfamily": "RedHat",
+    "gateway_if": "br180",
+    "lsbrelease": ":core-4.0-amd64:core-4.0-noarch:graphics-4.0-amd64:graphics-4.0-noarch:printing-4.0-amd64:printing-4.0-noarch",
+    "kernelrelease": "2.6.32-131.12.1.el6.x86_64",
+    "kernel": "Linux",
+    "facterversion": "1.6.2",
+    "uptime_seconds": "13651752",
+    "macaddress_vnet5": "FE:54:00:01:B9:9C",
+    "interfaces": "br180,br181,br182,br183,eth0,eth0_181,eth0_182,eth0_183,eth1,lo,usb0,vnet0,vnet1,vnet2,vnet3,vnet4,vnet5,vnet7,vnet10",
+    "macaddress_vnet7": "FE:54:00:D8:F9:38",
+    "netmask_br180": "255.255.255.192",
+    "macaddress_eth0": "E4:1F:13:CC:36:58",
+    "is_virtual": "false",
+    "macaddress": "E4:1F:13:CC:36:58",
+    "sshdsakey": "AAAAB3NzaC1kc3MAAACBAIbK60jlhYKSd4Nx6LCQPMUZcq/P1lTY3sQVrwpmfbF7d4JOGed2RWSoTBAzP3/Tjwlf+8DZ3Jd8a6Yhd6WuBzinE+owym8LXo2gDTvelhnzOVrTytM8hAi8uFEiBTGbnN1zka2y7qCPVxEu+kV20qC3mPODGxpV6y/4KOZ5Y4SHAAAAFQCyjeF+Jy9CDhiD2tfnmtMGAn1xzQAAAIBwtnUhhkB0r3ivPdQZgVy6qha8AJQG94I9FU9FnGJJEjkkfqlgNrj9SxV6Cg9EcrntnAKxZxk7PQhgvDesx69Lap9PAx3Ffb5Pl47cd7ilOXv2RJGKuxZQHNdKUF2445POwNjxSuhEkIB3/zpFXBB/zPMRfqUtlXJEwP9m6z9UFgAAAIAQDBpmcGChFP7i8T2RdMZo3hSMnU4y5lpEGhmwfbODoLSAX37wWQwUmwRP8byTEqFL0+5bp3hRbt/67EoD1O6n39/We19g/UqHkbUdZQqLqFjJfyzqfepq4HXtIIT8GbqW+FGJkH9x2fY5gtQrn9nVdmPDTwERFS98qU9glufbIw==",
+    "uptime": "158 days",
+    "manufacturer": "IBM",
+    "macaddress_eth1": "E4:1F:13:CC:36:5A",
+    "timezone": "GMT",
+    "fqdn": "a.server.b.domain",
+    "ipaddress_br180": "10.35.27.2",
+    "puppetversion": "2.6.12",
+    "path": "/root/.gem/bin:/root/.gem/ruby/1.8/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin:/sbin:/usr/sbin:/root/scripts",
+    "hardwaremodel": "x86_64",
+    "macaddress_eth0_181": "E4:1F:13:CC:36:58",
+    "netmask_lo": "255.0.0.0",
+    "uptime_days": "158",
+    "virtual": "physical",
+    "operatingsystemrelease": "6.2",
+    "processorcount": "8",
+    "sshrsakey": "AAAAB3NzaC1xcEabbAABIwAAAQEAwXfnuA0+6C6G152kzCbSZvTyUBrMwc0PGnmZgFpC3x4SkcMgRmtayPNqmY1vyYwyka1lNUoyU9u3TXOUkd7WrodoNYBbDQXWCAVpUci5099zUuZ8RVLcokKwNmQO0d1URgSLt2TtuLiUDB7JU2mHkoOuW9n7ODq+UzYsd2wf+/TQrvgsuyi25MROH2Z3WfMO+fmsj77h34gkuaavwB4e6lNRynjZLuEc4POFvDEW6kGCYm1g/8kRwUlB/Z1Cu0egxtxnTjILFFwfYFQu2Ksig020q1gLX3o4YL9X/YZz+JQuAOLGpK3F0owQUL7Ie3vokDsVmz2AweuLDFeh54i2Bw==",
+    "macaddress_eth0_182": "E4:1F:13:CC:36:58",
+    "memorysize": "15.57 GB",
+    "ipaddress": "10.35.27.2",
+    "rubyversion": "1.8.7",
+    "macaddress_eth0_183": "E4:1F:13:CC:36:58",
+    "physicalprocessorcount": "1",
+    "network_lo": "127.0.0.0",
+    "gateway": "10.35.27.62",
+    "lsbdistid": "RedHatEnterpriseServer",
+    "network_br180": "10.35.27.0",
+    "lsbdistdescription": "Red Hat Enterprise Linux Server release 6.2 (Santiago)",
+    "swapsize": "17.70 GB",
+    "processor0": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "processor1": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "macaddress_br180": "E4:1F:13:CC:36:58",
+    "selinux": "false",
+    "domain": "server.b.domain",
+    "architecture": "x86_64",
+    "uptime_hours": "3792",
+    "memoryfree": "6.87 GB",
+    "augeasversion": "0.9.0",
+    "operatingsystem": "RedHat",
+    "ipaddress_lo": "127.0.0.1",
+    "processor2": "Intel(R) Xeon(R) CPU           E5620  @ 2.40GHz",
+    "type": "Main Server Chassis",
+    "id": "root",
+    "vlans": "181,182,183",
+    "lsbmajdistrelease": "6",
+    "swapfree": "16.72 GB",
+    "netmask": "255.255.255.192"
+  }
+}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: foreman_default_hostgroup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies: []
 description: Adds the option to specify a default hostgroup for new hosts created
   from facts/reports
@@ -20,35 +21,41 @@ extra_rdoc_files:
 - README.md
 files:
 - app/models/setting/default_hostgroup.rb
+- config/environment.rb
+- lib/default_hostgroup.rake
 - lib/default_hostgroup_managed_host_patch.rb
-- lib/foreman_default_hostgroup.rb
-- lib/foreman_default_hostgroup/version.rb
 - lib/foreman_default_hostgroup/engine.rb
+- lib/foreman_default_hostgroup/version.rb
+- lib/foreman_default_hostgroup.rb
 - LICENSE
-- Rakefile
 - README.md
+- test/unit/facts.json
+- test/unit/default_hostgroup_test.rb
 homepage: http://github.com/GregSutcliffe/foreman_default_hostgroup
 licenses:
 - GPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Default Hostgroup Plugin for Foreman
-test_files: []
+test_files:
+- test/unit/facts.json
+- test/unit/default_hostgroup_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 80eeeefe5330eb909cbff3b1945df18fd64b5270
-  data.tar.gz: a31c296a3e787879056a7f167f6ae4e31a9ce999
-SHA512:
-  metadata.gz: df1e1a9fbf5adefc691245525c284125a3e7f19f29043189e5a0c402dd9468ad860326feee0fb0195fd32d14a809e2abd67f98dac397017f29256df0a873b1f5
-  data.tar.gz: 3d03a685af3174d5ba437330fee1172539b2cdd4961aa4e67bc7dcefadfb4b6228ea7d3e7e9df6595b7b24be17ab3c4d6e8575ca4904d7d5ea6e33a0f4ad3824

data/Rakefile

@@ -1,111 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'rake'
-require 'fileutils'
-
-task :default => :test
-
-ENGINE_DIR = File.expand_path('..', __FILE__)
-FOREMAN_DIR = 'test/foreman_app'
-
-namespace :test do
-  desc "Download latest foreman 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 #{foreman_repo} #{FOREMAN_DIR}")
-        puts "Error while getting latest Foreman code from #{foreman_repo} into #{FOREMAN_DIR}"
-        fail
-      end
-    end
-
-    gemfile_content = File.read(foreman_gemfile)
-    unless gemfile_content.include?('FOREMAN_GEMFILE')
-      puts 'Preparing Gemfile'
-      gemfile_content.gsub!('__FILE__', 'FOREMAN_GEMFILE')
-      gemfile_content.insert(0, "FOREMAN_GEMFILE = __FILE__ unless defined? FOREMAN_GEMFILE\n")
-      File.open(foreman_gemfile, 'w') { |f| f << gemfile_content }
-    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 test: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 :set_loadpath do
-    %w[lib test].each do |dir|
-      $:.unshift(File.expand_path(dir, ENGINE_DIR))
-    end
-  end
-
-  task :all => [:db_prepare, :set_loadpath] do
-    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','')  unless f.include? '/foreman_app/' }
-  end
-
-end
-
-task :test => 'test:all'