facter 1.6.0 → 1.6.1

data/lib/facter/util/uptime.rb

@@ -8,12 +8,13 @@ module Facter::Util::Uptime
     end
 
     def self.get_uptime_seconds_win
-      require 'win32ole'
-      wmi = WIN32OLE.connect("winmgmts://")
-      query = wmi.ExecQuery("select * from Win32_OperatingSystem")
+      require 'facter/util/wmi'
+
       last_boot = ""
-      query.each { |x| last_boot = x.LastBootupTime}
-      self.compute_uptime(Time.parse(last_boot.split('.').first)) 
+      Facter::Util::WMI.execquery("select * from Win32_OperatingSystem").each do |x|
+        last_boot = x.LastBootupTime
+      end
+      self.compute_uptime(Time.parse(last_boot.split('.').first))
     end
 
     private

data/lib/facter/util/wmi.rb

@@ -0,0 +1,16 @@
+module Facter::Util::WMI
+  class << self
+    def connect(uri = wmi_resource_uri)
+      require 'win32ole'
+      WIN32OLE.connect(uri)
+    end
+
+    def wmi_resource_uri( host = '.' )
+      "winmgmts:{impersonationLevel=impersonate}!//#{host}/root/cimv2"
+    end
+
+    def execquery(query)
+      connect().execquery(query)
+    end
+  end
+end

data/lib/facter/virtual.rb

@@ -110,6 +110,9 @@ Facter.add("virtual") do
                     # --- look for pci vendor id used by Parallels video card
                     # ---   01:00.0 VGA compatible controller: Unknown device 1ab8:4005
                     result = "parallels" if p =~ /1ab8:|[Pp]arallels/
+                    # --- look for pci vendor id used by Xen HVM device
+                    # ---   00:03.0 Unassigned class [ff80]: XenSource, Inc. Xen Platform Device (rev 01)
+                    result = "xenhvm" if p =~ /XenSource/
                 end
             else
                 output = Facter::Util::Resolution.exec('dmidecode')
@@ -118,6 +121,7 @@ Facter.add("virtual") do
                         result = "parallels" if pd =~ /Parallels/
                         result = "vmware" if pd =~ /VMware/
                         result = "virtualbox" if pd =~ /VirtualBox/
+                        result = "xenhvm" if pd =~ /HVM domU/
                     end
                 elsif Facter.value(:kernel) == 'SunOS'
                     res = Facter::Util::Resolution.new('prtdiag')
@@ -129,13 +133,14 @@ Facter.add("virtual") do
                             result = "parallels" if pd =~ /Parallels/
                             result = "vmware" if pd =~ /VMware/
 							result = "virtualbox" if pd =~ /VirtualBox/
+                            result = "xenhvm" if pd =~ /HVM domU/
                         end
                     end
                 end
             end
             
-            if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
-                result = "vmware_server"
+            if output = Facter::Util::Resolution.exec("vmware -v")
+                result = output.sub(/(\S+)\s+(\S+).*/) { | text | "#{$1}_#{$2}"}.downcase
             end
         end
 
@@ -147,9 +152,9 @@ end
 #
 # Purpose: returning true or false for if a machine is virtualised or not.
 #
-# Resolution: The Xen domain 0 machine is virtualised to a degree, but is generally
-# not viewed as being a virtual machine. This checks that the machine is not
-# physical nor xen0, if that is the case, it is virtual.
+# Resolution: Hypervisors and the like may be detected as a virtual type, but
+# are not actual virtual machines, or should not be treated as such. This 
+# determines if the host is actually virtualized.
 #
 # Caveats:
 #
@@ -158,10 +163,12 @@ Facter.add("is_virtual") do
     confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX Darwin GNU/kFreeBSD}
 
     setcode do
-        if Facter.value(:virtual) != "physical" && Facter.value(:virtual) != "xen0"
-            "true"
-        else
+        physical_types = %w{physical xen0 vmware_server vmware_workstation openvzhn}
+
+        if physical_types.include? Facter.value(:virtual)
             "false"
+        else
+            "true"
         end
     end
 end

data/spec/fixtures/netsh/windows_netsh_addresses_with_multiple_interfaces

@@ -0,0 +1,35 @@
+Address ::1 Parameters
+---------------------------------------------------------
+Interface Luid     : Loopback Pseudo-Interface 1
+Scope Id           : 0.0
+Valid Lifetime     : infinite
+Preferred Lifetime : infinite
+DAD State          : Preferred
+Address Type       : Other
+
+Address fe80::7128:aa90:8f2a:8375%9 Parameters
+---------------------------------------------------------
+Interface Luid     : Local Area Connection
+Scope Id           : 0.9
+Valid Lifetime     : infinite
+Preferred Lifetime : infinite
+DAD State          : Preferred
+Address Type       : Other
+
+Address fe80::5efe:172.16.138.216%11 Parameters
+---------------------------------------------------------
+Interface Luid     : isatap.localdomain
+Scope Id           : 0.11
+Valid Lifetime     : infinite
+Preferred Lifetime : infinite
+DAD State          : Deprecated
+Address Type       : Other
+
+Address 2001:0:4137:9e76:2087:77a:53ef:7527 Parameters
+---------------------------------------------------------
+Interface Luid     : Teredo Tunneling Pseudo-Interface
+Scope Id           : 0.0
+Valid Lifetime     : infinite
+Preferred Lifetime : infinite
+DAD State          : Preferred
+Address Type       : Public

data/spec/fixtures/unit/util/loader/nosuchfact.rb

@@ -0,0 +1 @@
+Facter.value(:nosuchfact)

data/spec/spec_helper.rb

@@ -20,5 +20,6 @@ RSpec.configure do |config|
   config.before :each do
     Facter::Util::Loader.any_instance.stubs(:load_all)
     Facter.clear
+    Facter.clear_messages
   end
 end

data/spec/unit/data/windows_netsh_all_interfaces

@@ -0,0 +1,12 @@
+Idx     Met         MTU          State                Name
+---  ----------  ----------  ------------  ---------------------------
+  1          50  4294967295  connected     Loopback Pseudo-Interface 1
+  9          10        1500  connected     Local Area Connection
+
+
+Idx     Met         MTU          State                Name
+---  ----------  ----------  ------------  ---------------------------
+  1          50  4294967295  connected     Loopback Pseudo-Interface 1
+  9          10        1500  connected     Local Area Connection
+ 11          50        1280  disconnected  isatap.localdomain
+ 12          50        1280  connected     Teredo Tunneling Pseudo-Interface

data/spec/unit/data/windows_netsh_single_interface

@@ -0,0 +1,7 @@
+Configuration for interface "Local Area Connection"
+    DHCP enabled:                         Yes
+    IP Address:                           172.16.138.216
+    Subnet Prefix:                        172.16.138.0/24 (mask 255.255.255.0)
+    Default Gateway:                      172.16.138.2
+    Gateway Metric:                       0
+    InterfaceMetric:                      10

data/spec/unit/data/windows_netsh_single_interface6

@@ -0,0 +1,18 @@
+
+Address fe80::2087:77a:53ef:7527%12 Parameters
+---------------------------------------------------------
+Interface Luid     : Teredo Tunneling Pseudo-Interface
+Scope Id           : 0.12
+Valid Lifetime     : infinite
+Preferred Lifetime : infinite
+DAD State          : Preferred
+Address Type       : Other
+
+Address 2001:0:4137:9e76:2087:77a:53ef:7527 Parameters
+---------------------------------------------------------
+Interface Luid     : Teredo Tunneling Pseudo-Interface
+Scope Id           : 0.0
+Valid Lifetime     : infinite
+Preferred Lifetime : infinite
+DAD State          : Preferred
+Address Type       : Public

data/spec/unit/domain_spec.rb

@@ -0,0 +1,91 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Domain name facts" do
+
+  describe "on linux" do
+    before do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(true)
+    end
+
+    it "should use the hostname binary" do
+      Facter::Util::Resolution.expects(:exec).with("hostname").returns "test.example.com"
+      Facter.fact(:domain).value.should == "example.com"
+    end
+
+    it "should fall back to the dnsdomainname binary" do
+      Facter::Util::Resolution.expects(:exec).with("hostname").returns("myhost")
+      Facter::Util::Resolution.expects(:exec).with("dnsdomainname").returns("example.com")
+      Facter.fact(:domain).value.should == "example.com"
+    end
+
+
+    it "should fall back to /etc/resolv.conf" do
+      Facter::Util::Resolution.expects(:exec).with("hostname").at_least_once.returns("myhost")
+      Facter::Util::Resolution.expects(:exec).with("dnsdomainname").at_least_once.returns("")
+      File.expects(:open).with('/etc/resolv.conf').at_least_once
+      Facter.fact(:domain).value
+    end
+
+    it "should attempt to resolve facts in a specific order" do
+      seq = sequence('domain')
+      Facter::Util::Resolution.stubs(:exec).with("hostname").in_sequence(seq).at_least_once
+      Facter::Util::Resolution.stubs(:exec).with("dnsdomainname").in_sequence(seq).at_least_once
+      File.expects(:open).with('/etc/resolv.conf').in_sequence(seq).at_least_once
+      Facter.fact(:domain).value
+    end
+
+    describe "when using /etc/resolv.conf" do
+      before do
+        Facter::Util::Resolution.stubs(:exec).with("hostname")
+        Facter::Util::Resolution.stubs(:exec).with("dnsdomainname")
+        @mock_file = mock()
+        File.stubs(:open).with("/etc/resolv.conf").yields(@mock_file)
+      end
+
+      it "should use the domain field over the search field" do
+        lines = [
+          "nameserver 4.2.2.1",
+          "search example.org",
+          "domain example.com",
+        ]
+        @mock_file.expects(:each).multiple_yields(*lines)
+        Facter.fact(:domain).value.should == 'example.com'
+      end
+
+      it "should fall back to the search field" do
+        lines = [
+          "nameserver 4.2.2.1",
+          "search example.org",
+        ]
+        @mock_file.expects(:each).multiple_yields(*lines)
+        Facter.fact(:domain).value.should == 'example.org'
+      end
+
+      it "should use the first domain in the search field" do
+        lines = [
+          "search example.org example.net",
+        ]
+        @mock_file.expects(:each).multiple_yields(*lines)
+        Facter.fact(:domain).value.should == 'example.org'
+      end
+    end
+  end
+
+  describe "on Windows" do
+    it "should use the DNSDomain for the first nic where ip is enabled" do
+      Facter.fact(:kernel).stubs(:value).returns("windows")
+
+      nic = stubs 'nic'
+      nic.stubs(:DNSDomain).returns("foo.com")
+
+      nic2 = stubs 'nic'
+      nic2.stubs(:DNSDomain).returns("bar.com")
+
+      require 'facter/util/wmi'
+      Facter::Util::WMI.stubs(:execquery).with("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").returns([nic, nic2])
+
+      Facter.fact(:domain).value.should == 'foo.com'
+    end
+  end
+end

data/spec/unit/facter_spec.rb

@@ -185,6 +185,27 @@ describe Facter do
         end
     end
 
+    describe "when warning once" do
+        it "should only warn once" do
+          Kernel.stubs(:warnonce)
+          Kernel.expects(:warn).with('foo').once
+          Facter.warnonce('foo')
+          Facter.warnonce('foo')
+        end
+
+        it "should not warnonce if nil is passed" do
+          Kernel.stubs(:warn)
+          Kernel.expects(:warnonce).never
+          Facter.warnonce(nil)
+        end
+
+        it "should not warnonce if an empty string is passed" do
+          Kernel.stubs(:warn)
+          Kernel.expects(:warnonce).never
+          Facter.warnonce('')
+        end
+    end
+
     describe "when setting debugging mode" do
         it "should have debugging enabled using 1" do
             Facter.debugging(1)

data/spec/unit/hostname_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Hostname facts" do
+
+  describe "on linux" do
+    before do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      Facter.fact(:kernelrelease).stubs(:value).returns("2.6")
+    end
+
+    it "should use the hostname command" do
+      Facter::Util::Resolution.expects(:exec).with('hostname').at_least_once
+      Facter.fact(:hostname).value.should be_nil
+    end
+
+    it "should use hostname as the fact if unqualified" do
+      Facter::Util::Resolution.stubs(:exec).with('hostname').returns('host1')
+      Facter.fact(:hostname).value.should == "host1"
+    end
+
+    it "should truncate the domain name if qualified" do
+      Facter::Util::Resolution.stubs(:exec).with('hostname').returns('host1.example.com')
+      Facter.fact(:hostname).value.should == "host1"
+    end
+  end
+
+  describe "on darwin release R7" do
+    before do
+      Facter.fact(:kernel).stubs(:value).returns("Darwin")
+      Facter.fact(:kernelrelease).stubs(:value).returns("R7")
+    end
+
+    it "should use scutil to get the hostname" do
+      Facter::Util::Resolution.expects(:exec).with('/usr/sbin/scutil --get LocalHostName').returns("host1")
+      Facter.fact(:hostname).value.should == "host1"
+    end
+  end
+end

data/spec/unit/id_spec.rb

@@ -9,9 +9,9 @@ describe "id fact" do
     kernel.each do |k|
         describe "with kernel reported as #{k}" do
             it "should return the current user" do
-                Facter::Util::Resolution.stubs(:exec).with('uname -s').returns(k)
-                Facter::Util::Resolution.stubs(:exec).with('lsb_release -a 2>/dev/null').returns('foo')
-                Facter::Util::Resolution.expects(:exec).once.with('whoami', '/bin/sh').returns 'bar'
+                Facter.fact(:kernel).stubs(:value).returns(k)
+                Facter::Util::Config.stubs(:is_windows?).returns(k == 'windows')
+                Facter::Util::Resolution.expects(:exec).once.with('whoami').returns 'bar'
 
                 Facter.fact(:id).value.should == 'bar'
             end
@@ -19,9 +19,10 @@ describe "id fact" do
     end
 
     it "should return the current user on Solaris" do
+       Facter::Util::Config.stubs(:is_windows?).returns(false)
        Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('SunOS')
-       Facter::Util::Resolution.expects(:exec).once.with('/usr/xpg4/bin/id -un', '/bin/sh').returns 'bar'
+       Facter::Util::Resolution.expects(:exec).once.with('/usr/xpg4/bin/id -un').returns 'bar'
 
        Facter.fact(:id).value.should == 'bar'
-    end 
+    end
 end

data/spec/unit/interfaces_spec.rb

@@ -13,4 +13,11 @@ describe "Per Interface IP facts" do
         Facter::Util::IP.stubs(:get_interfaces).returns %w{eth0:1 eth1:2}
         Facter.fact(:interfaces).value.should == %{eth0_1,eth1_2}
     end
+
+  it "should replace non-alphanumerics in an interface list with '_'" do
+    Facter.fact(:kernel).stubs(:value).returns("windows")
+
+    Facter::Util::IP.stubs(:get_interfaces).returns ["Local Area Connection", "Loopback \"Pseudo-Interface\" (#1)"]
+    Facter.fact(:interfaces).value.should == %{Local_Area_Connection,Loopback__Pseudo_Interface____1_}
+  end
 end

data/spec/unit/ipaddress6_spec.rb

@@ -9,7 +9,15 @@ def ifconfig_fixture(filename)
   ifconfig = File.new(File.join($basedir, 'fixtures', 'ifconfig', filename)).read
 end
 
+def netsh_fixture(filename)
+  ifconfig = File.new(File.join($basedir, 'fixtures', 'netsh', filename)).read
+end
+
 describe "IPv6 address fact" do
+  before do
+    Facter::Util::Config.stubs(:is_windows?).returns(false)
+  end
+
   it "should return ipaddress6 information for Darwin" do
     Facter::Util::Resolution.stubs(:exec).with('uname -s').returns('Darwin')
     Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
@@ -33,4 +41,15 @@ describe "IPv6 address fact" do
 
     Facter.value(:ipaddress6).should == "2610:10:20:209:203:baff:fe27:a7c"
   end
+
+  it "should return ipaddress6 information for Windows" do
+    ENV.stubs(:[]).with('SYSTEMROOT').returns('d:/windows')
+    Facter::Util::Config.stubs(:is_windows?).returns(true)
+
+    fixture = netsh_fixture('windows_netsh_addresses_with_multiple_interfaces')
+    Facter::Util::Resolution.stubs(:exec).with('d:/windows/system32/netsh interface ipv6 show address level=verbose').
+      returns(fixture)
+
+    Facter.value(:ipaddress6).should == "2001:0:4137:9e76:2087:77a:53ef:7527"
+  end
 end

data/spec/unit/macaddress_spec.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+$basedir = File.expand_path(File.dirname(__FILE__) + '/..')
+require File.join($basedir, 'spec_helper')
+
+require 'facter'
+
+def ifconfig_fixture(filename)
+  ifconfig = File.new(File.join($basedir, 'fixtures', 'ifconfig', filename)).read
+end
+
+def netsh_fixture(filename)
+  ifconfig = File.new(File.join($basedir, 'fixtures', 'netsh', filename)).read
+end
+
+describe "macaddress fact" do
+  before do
+    Facter::Util::Config.stubs(:is_windows?).returns(false)
+  end
+
+  it "should return macaddress information for Linux" do
+    Facter.fact(:kernel).stubs(:value).returns("Linux")
+    Facter.fact(:operatingsystem).stubs(:value).returns("Linux")
+    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig -a').
+      returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces'))
+
+    Facter.value(:macaddress).should == "00:12:3f:be:22:01"
+  end
+
+  it "should return macaddress information for BSD" do
+    Facter.fact(:kernel).stubs(:value).returns("FreeBSD")
+    Facter::Util::Resolution.stubs(:exec).with('/sbin/ifconfig').
+      returns(ifconfig_fixture('bsd_ifconfig_all_with_multiple_interfaces'))
+
+    Facter.value(:macaddress).should == "00:0b:db:93:09:67"
+  end
+
+end