foreman_discovery 1.1.1 → 1.2.0.rc1

data/extra/ovirt-node-plugin-foreman/src/discovery-version-fact.rb.in

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+# vim: ts=2:sw=2:et
+#
+# Copyright (C) 2013 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+Facter.add("discovery_version") do
+  setcode do
+    '@PACKAGE_VERSION@'
+  end
+end

data/extra/ovirt-node-plugin-foreman/src/find-missing-libs

@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# vim: ts=2:sw=2:et
+#
+# Copyright (C) 2013 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+
+ifs=$IFS
+IFS=':'
+
+files=$(find /usr -type f)
+IFS=$ifs
+for i in $files
+do
+  if [ `file $i | grep -c 'ELF'` -ne 0 ]; then
+    if [ `ldd $i 2>/dev/null | grep -c 'not found'` -ne 0 ]; then
+      echo "$i:"
+      ldd $i 2>/dev/null | grep 'not found'
+    fi
+  fi
+done

data/lib/{tasks.rake → discovery.rake}

@@ -42,6 +42,10 @@ namespace :discovery do
       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=''
@@ -75,3 +79,21 @@ namespace :discovery do
 
   end
 end
+
+# Setup Tests
+namespace :test do
+  desc "Test Discovery plugin"
+  Rake::TestTask.new(:discovery) 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:discovery'].invoke
+end
+load 'tasks/jenkins.rake'
+Rake::Task["jenkins:unit"].enhance do
+  Rake::Task['test:discovery'].invoke
+end

data/lib/foreman_discovery/engine.rb

@@ -1,12 +1,13 @@
 require 'deface'
-require 'discovery_home_helper_patch'
+require 'fast_gettext'
+require 'gettext_i18n_rails'
 
 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
 
-    # Load this before the Foreman config initizializers, so that the Setting.descendants
+    # 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|
       require_dependency File.expand_path("../../../app/models/setting/discovered.rb", __FILE__) if (Setting.table_exists? rescue(false))
@@ -16,16 +17,47 @@ module ForemanDiscovery
       ActionView::Base.send :include, DiscoversHelper
     end
 
-    # Include extenstions to models in this config.to_prepare block
+    initializer 'foreman_discovery.register_gettext', :after => :load_config_initializers do |app|
+      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+      locale_domain = 'discovery'
+
+      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
+    end
+
+    initializer 'foreman_discovery.register_plugin', :after=> :finisher_hook do |app|
+      Foreman::Plugin.register :foreman_discovery do
+        requires_foreman '>= 1.4'
+
+        # Add permissions
+        security_block :discovery do
+          permission :view_discovered_hosts, {:discovers => [:index, :show, :auto_complete_search, :refresh_facts] }
+          permission :provision_discovered_hosts, {:discovers => [:new, :create] }
+          permission :edit_discovered_hosts, {:discovers => [:edit, :update, :update_multiple_location,
+                                                             :select_multiple_organization,
+                                                             :update_multiple_organization,
+                                                             :select_multiple_location] }
+          permission :destroy_discovered_hosts, {:discovers => [:destroy, :submit_multiple_destroy, :multiple_destroy] }
+
+        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]
+
+        #add menu entry
+        menu :top_menu, :discovery, :url_hash => {:controller=> :discovers, :action=>:index},
+             :caption=> N_('Discovered hosts'),
+             :parent => :hosts_menu,
+             :after=>:hosts
+      end
+    end
+    # Include extensions to models in this config.to_prepare block
     config.to_prepare do
-      # Include host extenstions
+      # Include host extensions
       ::Host::Managed.send :include, Host::ManagedExtensions
-      # Patch the menu
-      ::HomeHelper.send :include, DiscoveryHomeHelperPatch
     end
 
     rake_tasks do
-      load "tasks.rake"
+      load "discovery.rake"
     end
 
   end

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "1.1.1"
+  VERSION = "1.2.0.rc1"
 end

data/test/functional/discovers_controller_test.rb

@@ -1,5 +1,4 @@
-require 'test_helper'
-require 'mocha/setup'
+require 'test_plugin_helper'
 
 class DiscoversControllerTest < ActionController::TestCase
   setup :initialize_host
@@ -17,20 +16,8 @@ class DiscoversControllerTest < ActionController::TestCase
 
   def test_add_entry_to_nav_menu
     get :index, {}, set_session_user
-    assert_tag :tag => 'div',
-      :attributes => { :class => "nav-collapse collapse nav2" },
-      :child => { :tag => 'ul',
-        :child => { :tag => 'li',
-          :child => { :tag => 'ul',
-            :child => { :tag => 'li',
-              :child => {
-                :tag => 'a',
-                :attributes => {:href => '/discovers'}
-              }
-            }
-          }
-        }
-      }
+    assert_tag :tag => 'a',
+      :attributes => {:href => '/discovers'}
   end
 
   private

data/test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 ENV["RAILS_ENV"] ||= 'test'
-require File.join("foreman_app/config/environment.rb")
+require File.expand_path("../../.foreman_app/config/environment.rb", __FILE__)
 
 require 'test/unit'
 require 'foreman_discovery'
@@ -16,7 +16,7 @@ class ActiveSupport::TestCase
   # Note: You'll currently still have to declare fixtures explicitly in integration tests
   # -- they do not yet inherit this setting
 
-  foreman_dir =  File.expand_path("../foreman_app", File.join(Dir.pwd, __FILE__))
+  foreman_dir =  File.expand_path("../../.foreman_app", File.join(Dir.pwd, __FILE__))
   fixture_path=File.join(foreman_dir, "test/fixtures")
   fixtures :all
 

data/test/test_plugin_helper.rb

@@ -0,0 +1,6 @@
+# This calls the main test_helper in Foreman-core
+require 'test_helper'
+
+# Add plugin to FactoryGirl's paths
+FactoryGirl.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
+FactoryGirl.reload

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"
+  }
+}

data/test/unit/host_discovered_test.rb

@@ -3,6 +3,10 @@ require 'test_helper'
 class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by_login "admin"
+    FactoryGirl.create(:setting,
+                       name: 'discovery_fact',
+                       value: 'macaddress',
+                       category: 'Setting::Discovered')
   end
 
   test "should be able to create Host::Discovered objects" do
@@ -11,13 +15,27 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   end
 
   test "should import facts from yaml as Host::Discovered" do
-    assert Host::Discovered.importHostAndFacts(File.read(File.expand_path(File.dirname(__FILE__) + "/facts.yml")))
+    raw = parse_json_fixture('/facts.json')
+    assert Host::Discovered.importHostAndFacts(raw['facts'])
+  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'])
+    end
   end
 
   test "should be able to refresh facts" do
     host = Host.create :name => "mydiscoveredhost", :ip => "1.2.3.4", :type => "Host::Discovered"
-    ForemanDiscovery::Facts.any_instance.stubs(:facts).returns({"macaddress_eth0" => "aa:bb:cc:dd:ee:ff"})
+    raw = parse_json_fixture('/facts.json')
+    ForemanDiscovery::Facts.any_instance.stubs(:facts).returns(raw['facts'])
     assert host.refresh_facts
   end
 
+  def parse_json_fixture(relative_path)
+    return JSON.parse(File.read(File.expand_path(File.dirname(__FILE__) + relative_path)))
+  end
+
 end

metadata

@@ -1,58 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0.rc1
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2014-01-22 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: []
@@ -60,39 +60,56 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- app/views/discovers/index.html.erb
-- app/views/discovers/show.html.erb
-- app/views/discovers/_discovers_list.html.erb
-- app/views/discovers/select_multiple_organization.html.erb
-- app/views/discovers/_selected_hosts.html.erb
-- app/views/discovers/select_multiple_location.html.erb
-- app/views/discovers/multiple_destroy.html.erb
+- LICENSE
+- README.md
+- Rakefile
+- app/controllers/discovers_controller.rb
 - app/helpers/discovers_helper.rb
-- app/models/host/managed_extensions.rb
 - app/models/host/discovered.rb
+- app/models/host/managed_extensions.rb
 - app/models/setting/discovered.rb
 - app/overrides/add_dashboard_table.rb
-- app/controllers/discovers_controller.rb
-- extra/discovery_init.sh.example
+- 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
+- config/initializers/discovery_setup.rb
+- config/routes.rb
 - extra/build_iso.sh
 - extra/discover_host
-- extra/foreman_startup.rb
+- extra/discovery_init.sh.example
 - extra/disk_facts.rb
-- config/initializers/discovery_setup.rb
-- config/routes.rb
-- lib/discovery_home_helper_patch.rb
-- lib/tasks.rake
+- extra/foreman_startup.rb
+- extra/ovirt-node-plugin-foreman/COPYING
+- extra/ovirt-node-plugin-foreman/Makefile.am
+- extra/ovirt-node-plugin-foreman/README.md
+- extra/ovirt-node-plugin-foreman/autogen.sh
+- extra/ovirt-node-plugin-foreman/conf/Makefile.am
+- extra/ovirt-node-plugin-foreman/conf/foreman-plugin.firewall.in
+- extra/ovirt-node-plugin-foreman/conf/foreman-plugin.logs
+- extra/ovirt-node-plugin-foreman/configure.ac
+- extra/ovirt-node-plugin-foreman/ovirt-node-plugin-foreman.spec.in
+- extra/ovirt-node-plugin-foreman/recipe/Makefile.am
+- extra/ovirt-node-plugin-foreman/recipe/foreman-plugin-iso.ks
+- extra/ovirt-node-plugin-foreman/recipe/foreman-plugin-minimizer.ks
+- extra/ovirt-node-plugin-foreman/src/Makefile.am
+- extra/ovirt-node-plugin-foreman/src/discover-host.rb.in
+- extra/ovirt-node-plugin-foreman/src/discover-host.service
+- extra/ovirt-node-plugin-foreman/src/discovery-version-fact.rb.in
+- extra/ovirt-node-plugin-foreman/src/find-missing-libs
+- lib/discovery.rake
 - lib/foreman_discovery.rb
-- lib/foreman_discovery/version.rb
-- lib/foreman_discovery/facts.rb
 - lib/foreman_discovery/engine.rb
-- LICENSE
-- Rakefile
-- README.md
+- lib/foreman_discovery/facts.rb
+- lib/foreman_discovery/version.rb
 - test/functional/discovers_controller_test.rb
 - test/test_helper.rb
+- test/test_plugin_helper.rb
+- test/unit/facts.json
 - test/unit/host_discovered_test.rb
-- test/unit/facts.yml
 - test/unit/setting_discovered_test.rb
 homepage: http://github.com/theforeman/foreman_discovery
 licenses:
@@ -104,23 +121,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+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/test_helper.rb
-- test/unit/host_discovered_test.rb
-- test/unit/facts.yml
+- test/unit/facts.json
 - test/unit/setting_discovered_test.rb
+- test/unit/host_discovered_test.rb
+- test/test_plugin_helper.rb
+- test/test_helper.rb

data/lib/discovery_home_helper_patch.rb

@@ -1,18 +0,0 @@
-module DiscoveryHomeHelperPatch
-  def self.included(base)
-    base.send(:include, InstanceMethods)
-
-    base.class_eval do
-      alias_method_chain :settings_menu_items, :discovers_link
-    end
-  end
-
-  module InstanceMethods
-    # Adds a discovers link to the More menu
-    def settings_menu_items_with_discovers_link
-      menu_items = settings_menu_items_without_discovers_link
-      menu_items[2][2].insert(2,['Discovered Hosts', :discovers]) if menu_items[2]
-      menu_items
-    end
-  end
-end

data/test/unit/facts.yml

@@ -1,91 +0,0 @@
---- !ruby/object:Puppet::Node::Facts 
-expiration: 2009-08-20 21:07:46.053586 +08:00
-name: sinn1636.lan
-values: 
-  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