facter 2.3.0-universal-darwin → 2.4.0-universal-darwin

data/lib/facter/util/ip.rb

@@ -31,6 +31,13 @@ module Facter::Util::IP
       :macaddress => /(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
       :netmask  => /.*\s+netmask (\S+)\s.*/
     },
+    :aix   => {
+      :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
+      :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :netmask  => /netmask\s+0x(\w{8})/,
+      :mtu => /mtu\s+(\d+)/,
+      :macaddress => /^Hardware\sAddress:\s(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+    },
     :windows => {}
   }
 
@@ -40,7 +47,7 @@ module Facter::Util::IP
   end
 
   def self.convert_from_hex?(kernel)
-    kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux", :"gnu/kfreebsd", :dragonfly]
+    kernels_to_convert = [:sunos, :openbsd, :netbsd, :freebsd, :darwin, :"hp-ux", :"gnu/kfreebsd", :dragonfly, :aix]
     kernels_to_convert.include?(kernel)
   end
 
@@ -73,7 +80,7 @@ module Facter::Util::IP
 
   def self.get_all_interface_output
     case Facter.value(:kernel)
-    when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly'
+    when 'Linux', 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly', 'AIX'
       output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"])
     when 'SunOS'
       output = Facter::Util::IP.exec_ifconfig(["-a"])
@@ -106,6 +113,23 @@ module Facter::Util::IP
     common_paths=["/bin/ifconfig","/sbin/ifconfig","/usr/sbin/ifconfig"]
     common_paths.select{|path| File.executable?(path)}.first
   end
+
+  ##
+  # exec_netstat uses the netstat command
+  #
+  # @return [String] the output of `netstat #{arguments} 2>/dev/null` or nil
+  def self.exec_netstat(additional_arguments=[])
+    Facter::Core::Execution.exec("#{self.get_netstat} #{additional_arguments.join(' ')}")
+  end
+  ##
+  # get_netstat looks up the netstat binary
+  #
+  # @return [String] path to the netstat binary
+  def self.get_netstat
+    common_paths=["/bin/netstat","/sbin/netstat","/usr/sbin/netstat","/usr/bin/netstat"]
+    common_paths.select{|path| File.executable?(path)}.first
+  end
+  
   ##
   # hpux_netstat_in is a delegate method that allows us to stub netstat -in
   # without stubbing exec.
@@ -117,7 +141,7 @@ module Facter::Util::IP
     if File.exists?("/sys/class/net/#{interface}/address") then
       ib_mac_address = `cat /sys/class/net/#{interface}/address`.chomp
     elsif File.exists?("/sbin/ip") then
-      ip_output = %x{/sbin/ip link show #{interface}}
+      ip_output = %x{/sbin/ip link show '#{interface}'}
       ib_mac_address = ip_output.scan(%r{infiniband\s+((\w{1,2}:){5,}\w{1,2})})
     else
       ib_mac_address = "FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF:FF"
@@ -127,7 +151,7 @@ module Facter::Util::IP
   end
 
   def self.ifconfig_interface(interface)
-    output = Facter::Util::IP.exec_ifconfig([interface,"2>/dev/null"])
+    output = Facter::Util::IP.exec_ifconfig(["'#{interface}'","2>/dev/null"])
   end
 
   def self.get_single_interface_output(interface)
@@ -151,6 +175,9 @@ module Facter::Util::IP
        hpux_lanscan.scan(/(\dx\S+).*UP\s+(\w+\d+)/).each {|i| mac = i[0] if i.include?(interface) }
        mac = mac.sub(/0x(\S+)/,'\1').scan(/../).join(":")
        output = ifc + "\n" + mac
+    when 'AIX'
+        output = Facter::Util::IP.ifconfig_interface(interface) + "\n" + aix_get_mtu(interface) + "\n" + aix_get_macadress(interface)
+        output
     end
     output
   end
@@ -163,6 +190,34 @@ module Facter::Util::IP
     Facter::Core::Execution.exec("/usr/sbin/lanscan")
   end
 
+  def self.aix_lsattr_interface(interface)
+    Facter::Core::Execution.exec("/usr/sbin/lsattr -El #{interface}")
+  end
+
+  def self.aix_entstat_interface(interface)
+    if interface[0..1] != "lo"
+      Facter::Core::Execution.exec("/usr/bin/entstat #{interface}")
+    else
+      return ""
+    end
+  end
+
+  def self.aix_get_mtu(interface)
+    aix_lsattr_interface(interface).each_line do |s|
+      if s =~ /mtu\s+(\d+)/
+        return s
+      end
+    end
+  end
+
+  def self.aix_get_macadress(interface)
+    aix_entstat_interface(interface).each_line do |s|
+      if s =~ /^Hardware\sAddress:\s(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
+        return s
+      end
+    end
+  end
+
   def self.get_output_for_interface_and_label(interface, label)
     return get_single_interface_output(interface) unless Facter.value(:kernel) == 'windows'
 
@@ -188,7 +243,7 @@ module Facter::Util::IP
       return nil
     end
     regex = /SLAVE[,>].* (bond[0-9]+)/
-      ethbond = regex.match(%x{/sbin/ip link show #{interface}})
+      ethbond = regex.match(%x{/sbin/ip link show '#{interface}'})
     if ethbond
       device = ethbond[1]
     else

data/lib/facter/util/ip/windows.rb

@@ -43,8 +43,8 @@ class Facter::Util::IP::Windows
     interface_names = []
 
     network_adapter_configurations.map do |nic|
-      Facter::Util::WMI.execquery("SELECT * FROM Win32_NetworkAdapter WHERE Index = #{nic.Index} AND NetEnabled = TRUE").each do |nic|
-        interface_names << nic.NetConnectionId unless nic.NetConnectionId.nil? or nic.NetConnectionId.empty?
+      Facter::Util::WMI.execquery("SELECT * FROM Win32_NetworkAdapter WHERE Index = #{nic.Index} AND NetEnabled = TRUE").each do |sub_nic|
+        interface_names << sub_nic.NetConnectionId unless sub_nic.NetConnectionId.nil? or sub_nic.NetConnectionId.empty?
       end
     end
 

data/lib/facter/util/partitions.rb

@@ -37,6 +37,10 @@ module Facter::Util::Partitions
     implementation.filesystem(partition)
   end
 
+  def self.label(partition)
+    implementation.label(partition)
+  end
+
   def self.available?
     !self.list.empty?
   end

data/lib/facter/util/partitions/linux.rb

@@ -55,6 +55,12 @@ module Facter::Util::Partitions
       end
     end
     
+    def self.label(partition)
+      if Facter::Core::Execution.which('blkid')
+        Facter::Core::Execution.exec("blkid #{File.join('/dev', partition)}").scan(/LABEL="([^"]*)"/).flatten.first
+      end
+    end
+    
     private
     def self.read_size(partition)
       if device = partition.match(/(\D+)/)[1] and File.readable?(File.join(SYSFS_BLOCK_DIRECTORY, device, partition, 'size'))

data/lib/facter/util/partitions/openbsd.rb

@@ -22,6 +22,11 @@ module Facter::Util::Partitions
     def self.filesystem(partition)
       scan_mount(/\/dev\/#{partition}\son\s\S+\stype\s(\S+)/)
     end
+   
+    # On OpenBSD there are no labels for partitions
+    def self.label(partition)
+      nil
+    end
 
     private
     def self.scan_mount(scan_regex)

data/lib/facter/util/resolution.rb

@@ -25,7 +25,7 @@ class Facter::Util::Resolution
 
   class << self
     # Expose command execution methods that were extracted into
-    # Facter::Util::Execution from Facter::Util::Resolution in Facter 2.0.0 for
+    # Facter::Core::Execution from Facter::Util::Resolution in Facter 2.0.0 for
     # compatibility.
     #
     # @deprecated

data/lib/facter/util/uptime.rb

@@ -40,7 +40,7 @@ module Facter::Util::Uptime
 
     if output
       up=0
-      if output =~ /(\d+) day(?:s|\(s\))?,\s+(\d+):(\d+)/
+      if output =~ /(\d+) day(?:s|\(s\))?,?\s+(\d+):-?(\d+)/
         # Regexp handles Solaris, AIX, HP-UX, and Tru64.
         # 'day(?:s|\(s\))?' says maybe 'day', 'days',
         #   or 'day(s)', and don't set $2.
@@ -51,9 +51,10 @@ module Facter::Util::Uptime
         up=86400*$1.to_i + 60*$2.to_i
       elsif output =~ /(\d+) day(?:s|\(s\))?,/
         up=86400*$1.to_i
-      elsif output =~ /up\s+(\d+):(\d+),/
+      elsif output =~ /up\s+(\d+):-?(\d+),/
         # must anchor to 'up' to avoid matching time of day
-        # at beginning of line.
+        # at beginning of line. Certain versions of uptime on
+        # Solaris may insert a '-' into the minutes field.
         up=3600*$1.to_i + 60*$2.to_i
       elsif output =~ /(\d+) hr(?:s|\(s\))?,/
         up=3600*$1.to_i
@@ -77,6 +78,6 @@ module Facter::Util::Uptime
   end
 
   def self.uptime_executable_cmd
-    "/usr/bin/uptime"
+    "uptime"
   end
 end

data/lib/facter/util/virtual.rb

@@ -153,7 +153,13 @@ module Facter::Util::Virtual
   def self.lxc?
     path = Pathname.new('/proc/1/cgroup')
     return false unless path.readable?
-    in_lxc = path.readlines.any? {|l| l.split(":")[2].to_s.start_with? '/lxc/' }
+    begin
+      in_lxc = path.readlines.any? {|l| l.split(":")[2].to_s.start_with? '/lxc/' }
+    rescue Errno::EPERM => exc
+      # If we get "operation not permitted" here, it probably means we are
+      # running OpenVZ. We are not running LXC anyway, so...
+      return false
+    end
     return true if in_lxc
     return false
   end
@@ -164,7 +170,12 @@ module Facter::Util::Virtual
   def self.docker?
     path = Pathname.new('/proc/1/cgroup')
     return false unless path.readable?
-    in_docker = path.readlines.any? {|l| l.split(":")[2].to_s.start_with? '/docker/' }
+    begin
+      in_docker = path.readlines.any? {|l| l.split(":")[2].to_s.start_with? '/docker/' }
+    rescue Errno::EPERM => exc
+      # This can fail under OpenVZ, just like in .lxc?
+      return false
+    end
     return true if in_docker
     return false
   end

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.3.0'
+    FACTERVERSION = '2.4.0'
   end
 
   # Returns the running version of Facter.

data/lib/facter/virtual.rb

@@ -131,7 +131,7 @@ Facter.add("virtual") do
 
     if Facter::Util::Virtual.xen?
       next "xen0" if FileTest.exists?("/dev/xen/evtchn")
-      next "xenu" if FileTest.exists?("/proc/xen")
+      next "xenu" if FileTest.exists?("/proc/xen") || FileTest.exists?("/dev/xvda1")
     end
 
     next "virtualbox" if Facter::Util::Virtual.virtualbox?

data/spec/unit/core/logging_spec.rb

@@ -8,6 +8,7 @@ describe Facter::Core::Logging do
   after(:all) do
     subject.debugging(false)
     subject.timing(false)
+    subject.on_message
   end
 
   describe "emitting debug messages" do
@@ -101,4 +102,122 @@ describe Facter::Core::Logging do
       expect(subject.timing?).to be_false
     end
   end
+
+  describe 'without a logging callback' do
+    before :each do
+      subject.timing(true)
+      subject.debugging(true)
+      subject.on_message
+    end
+
+    it 'calls puts for debug' do
+      subject.expects(:puts).with(subject::GREEN + 'foo' + subject::RESET).once
+      subject.debug('foo')
+    end
+
+    it 'calls puts for debugonce' do
+      subject.expects(:puts).with(subject::GREEN + 'foo' + subject::RESET).once
+      subject.debugonce('foo')
+      subject.debugonce('foo')
+    end
+
+    it 'calls Kernel.warn for warn' do
+      Kernel.expects(:warn).with('foo').once
+      subject.warn('foo')
+    end
+
+    it 'calls Kernel.warn for warnonce' do
+      Kernel.expects(:warn).with('foo').once
+      subject.warnonce('foo')
+      subject.warnonce('foo')
+    end
+
+    it 'calls $stderr.puts for timing' do
+      $stderr.expects(:puts).with(subject::GREEN + 'foo' + subject::RESET).once
+      subject.show_time('foo')
+    end
+  end
+
+  describe 'with a logging callback' do
+    before :each do
+      subject.debugging(true)
+      subject.timing(true)
+      subject.on_message
+    end
+
+    def log_message(level, message)
+      called = false
+      subject.on_message do |lvl, msg|
+        called = true
+        expect(lvl).to eq(level)
+        expect(msg).to eq(message)
+      end
+      case level
+      when :debug
+        Facter.debug(message)
+      when :warn
+        Facter.warn(message)
+      when :info
+        Facter.show_time(message)
+      else
+        raise 'unexpected logging level'
+      end
+      subject.on_message
+      expect(called).to be_true
+    end
+
+    def log_message_once(level, message)
+      calls = 0
+      subject.on_message do |lvl, msg|
+        expect(lvl).to eq(level)
+        expect(msg).to eq(message)
+        calls += 1
+      end
+      case level
+      when :debug
+        Facter.debugonce(message)
+        Facter.debugonce(message)
+      when :warn
+        Facter.warnonce(message)
+        Facter.warnonce(message)
+      else
+        raise 'unexpected logging level'
+      end
+      expect(calls).to eq(1)
+    end
+
+    it 'does not call puts for debug or debugonce' do
+      subject.on_message {}
+      subject.expects(:puts).never
+      subject.debug('debug message')
+      subject.debugonce('debug once message')
+    end
+
+    it 'passes debug messages to callback' do
+      log_message(:debug, 'debug message')
+      log_message_once(:debug, 'debug once message')
+    end
+
+    it 'does not call Kernel.warn for warn or warnonce' do
+      subject.on_message {}
+      Kernel.expects(:warn).never
+      subject.warn('warn message')
+      subject.warnonce('warn once message')
+    end
+
+    it 'passes warning messages to callback' do
+      log_message(:warn, 'warn message')
+      log_message_once(:warn, 'warn once message')
+    end
+
+    it 'does not call $stderr.puts for show_time' do
+      subject.on_message {}
+      $stderr.expects(:puts).never
+      subject.show_time('debug message')
+    end
+
+    it 'passes info messages to callback' do
+      log_message(:info, 'timing message')
+    end
+  end
 end

data/spec/unit/dhcp_servers_spec.rb

@@ -18,6 +18,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface eth0").returns(my_fixture_read("nmcli_eth0_dhcp"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface wlan0").returns(my_fixture_read("nmcli_wlan0_dhcp"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("connected\n")
         end
 
         it "should produce a dhcp_servers fact that includes values for 'system' as well as each dhcp enabled interface" do
@@ -30,6 +31,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface eth0").returns(my_fixture_read("nmcli_eth0_static"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface wlan0").returns(my_fixture_read("nmcli_wlan0_dhcp"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("connected\n")
         end
 
         it "should a dhcp_servers fact that includes values for each dhcp enables interface and NO 'system' value" do
@@ -43,6 +45,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface eth0").returns(my_fixture_read("nmcli_eth0_dhcp"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface wlan0").returns(my_fixture_read("nmcli_wlan0_dhcp"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("connected\n")
         end
 
         it "should a dhcp_servers fact that includes values for each dhcp enables interface and NO 'system' value" do
@@ -55,6 +58,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface eth0").returns(my_fixture_read("nmcli_eth0_static"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d list iface wlan0").returns(my_fixture_read("nmcli_wlan0_static"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("connected\n")
         end
 
         it "should not produce a dhcp_servers fact" do
@@ -65,6 +69,7 @@ describe "DHCP server facts" do
       describe "with no CONNECTED devices" do
         before :each do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices_disconnected"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("disconnected\n")
         end
 
         it "should not produce a dhcp_servers fact" do
@@ -84,6 +89,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show eth0").returns(my_fixture_read("nmcli_eth0_dhcp"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show wlan0").returns(my_fixture_read("nmcli_wlan0_dhcp"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("connected\n")
         end
 
         it "should produce a dhcp_servers fact that includes values for 'system' as well as each dhcp enabled interface" do
@@ -96,6 +102,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show eth0").returns(my_fixture_read("nmcli_eth0_static"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show wlan0").returns(my_fixture_read("nmcli_wlan0_dhcp"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("connected\n")
         end
 
         it "should a dhcp_servers fact that includes values for each dhcp enables interface and NO 'system' value" do
@@ -109,6 +116,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show eth0").returns(my_fixture_read("nmcli_eth0_dhcp"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show wlan0").returns(my_fixture_read("nmcli_wlan0_dhcp"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("connected\n")
         end
 
         it "should a dhcp_servers fact that includes values for each dhcp enables interface and NO 'system' value" do
@@ -121,6 +129,7 @@ describe "DHCP server facts" do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show eth0").returns(my_fixture_read("nmcli_eth0_static"))
           Facter::Core::Execution.stubs(:exec).with("nmcli -f all d show wlan0").returns(my_fixture_read("nmcli_wlan0_static"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("connected\n")
         end
 
         it "should not produce a dhcp_servers fact" do
@@ -131,6 +140,7 @@ describe "DHCP server facts" do
       describe "with no CONNECTED devices" do
         before :each do
           Facter::Core::Execution.stubs(:exec).with("nmcli d").returns(my_fixture_read("nmcli_devices_disconnected"))
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("disconnected\n")
         end
 
         it "should not produce a dhcp_servers fact" do
@@ -139,6 +149,34 @@ describe "DHCP server facts" do
       end
     end
 
+    describe 'without NetworkManager running' do
+      before :each do
+        Facter::Core::Execution.stubs(:which).with('nmcli').returns('/usr/bin/nmcli')
+      end
+
+      describe 'with nmcli version >= 0.9.9 available' do
+        before :each do
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE g 2>/dev/null').returns("unknown\n")
+          Facter::Core::Execution.stubs(:exec).with('nmcli --version').returns('nmcli tool, version 0.9.9.0')
+        end
+
+        it 'should not produce a dhcp_servers fact' do
+          Facter.fact(:dhcp_servers).value.should be_nil
+        end
+      end
+
+      describe 'with nmcli version <= 0.9.8 available' do
+        before :each do
+          Facter::Core::Execution.stubs(:exec).with('nmcli -t -f STATE nm 2>/dev/null').returns("unknown\n")
+          Facter::Core::Execution.stubs(:exec).with('nmcli --version').returns('nmcli tool, version 0.9.7.0')
+        end
+
+        it 'should not produce a dhcp_servers fact' do
+          Facter.fact(:dhcp_servers).value.should be_nil
+        end
+      end
+    end
+
     describe "without nmcli available" do
       before :each do
         Facter::Core::Execution.stubs(:which).with('nmcli').returns(nil)