facter 1.6.16 → 1.6.17.rc1

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
+cows: 'base-lucid-i386.cow base-natty-i386.cow base-oneiric-i386.cow base-precise-i386.cow base-quantal-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'

data/ext/osx/file_mapping.yaml

@@ -10,12 +10,12 @@ directories:
     group: 'wheel'
     perms: '0755'
   facter:
-    path: 'var/lib/facter'
+    path: 'private/var/lib/facter'
     owner: 'root'
     group: 'wheel'
     perms: '0644'
   etc:
-    path: 'etc'
+    path: 'private/etc'
     owner: 'root'
     group: 'wheel'
     perms: '0644'

data/lib/facter/ec2.rb

@@ -21,7 +21,9 @@ end
 def userdata()
   Facter.add(:ec2_userdata) do
     setcode do
-      open("http://169.254.169.254/2008-02-01/user-data/").read.split
+      if userdata = Facter::Util::EC2.userdata
+        userdata.split
+      end
     end
   end
 end

data/lib/facter/ipaddress.rb

@@ -22,23 +22,18 @@
 #   checking this is a useful IP address.
 #
 
+require 'facter/util/ip'
+
 Facter.add(:ipaddress) do
   confine :kernel => :linux
   setcode do
     ip = nil
-    output = %x{/sbin/ifconfig 2>/dev/null}
-
-    output.split(/^\S/).each { |str|
-      if str =~ /inet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
-        tmp = $1
-        unless tmp =~ /^127\./
-          ip = tmp
-          break
-        end
+    if output = Facter::Util::IP.get_ifconfig
+      regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
+      if match = regexp.match(output)
+        match[1] unless /^127/.match(match[1])
       end
-    }
-
-    ip
+    end
   end
 end
 

data/lib/facter/util/ec2.rb

@@ -58,4 +58,44 @@ module Facter::Util::EC2
       return false
     end
   end
+
+  ##
+  # userdata returns a single string containing the body of the response of the
+  # GET request for the URI http://169.254.169.254/latest/user-data/  If the
+  # metadata server responds with a 404 Not Found error code then this method
+  # retuns `nil`.
+  #
+  # @param version [String] containing the API version for the request.
+  # Defaults to "latest" and other examples are documented at
+  # http://aws.amazon.com/archives/Amazon%20EC2
+  #
+  # @api public
+  #
+  # @return [String] containing the response body or `nil`
+  def self.userdata(version="latest")
+    uri = "http://169.254.169.254/#{version}/user-data/"
+    begin
+      read_uri(uri)
+    rescue OpenURI::HTTPError => detail
+      case detail.message
+      when /404 Not Found/i
+        Facter.debug "No user-data present at #{uri}: server responded with #{detail.message}"
+        return nil
+      else
+        raise detail
+      end
+    end
+  end
+
+  ##
+  # read_uri provides a seam method to easily test the HTTP client
+  # functionality of a HTTP based metadata server.
+  #
+  # @api private
+  #
+  # @return [String] containing the body of the response
+  def self.read_uri(uri)
+    open(uri).read
+  end
+  private_class_method :read_uri
 end

data/lib/facter/util/ip.rb

@@ -81,7 +81,14 @@ module Facter::Util::IP
     when 'SunOS'
       output = %x{/usr/sbin/ifconfig -a}
     when 'HP-UX'
-      output = %x{/bin/netstat -in | sed -e 1d}
+      # (#17487)[https://projects.puppetlabs.com/issues/17487]
+      # Handle NIC bonding where asterisks and virtual NICs are printed.
+      if output = hpux_netstat_in
+        output.gsub!(/\*/, "")                  # delete asterisks.
+        output.gsub!(/^[^\n]*none[^\n]*\n/, "") # delete lines with 'none' instead of IPs.
+        output.sub!(/^[^\n]*\n/, "")            # delete the header line.
+        output
+      end
     when 'windows'
       output = %x|#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ip show interface|
       output += %x|#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ipv6 show interface|
@@ -89,6 +96,21 @@ module Facter::Util::IP
     output
   end
 
+  ##
+  # get_ifconfig simply delegates to the ifconfig command.
+  #
+  # @return [String] the output of `/sbin/ifconfig 2>/dev/null` or nil
+  def self.get_ifconfig
+    Facter::Util::Resolution.exec("/sbin/ifconfig 2>/dev/null")
+  end
+
+  ##
+  # hpux_netstat_in is a delegate method that allows us to stub netstat -in
+  # without stubbing exec.
+  def self.hpux_netstat_in
+    Facter::Util::Resolution.exec("/bin/netstat -in")
+  end
+
   def self.get_infiniband_macaddress(interface)
     if File.exists?("/sys/class/net/#{interface}/address") then
       ib_mac_address = `cat /sys/class/net/#{interface}/address`.chomp
@@ -123,14 +145,22 @@ module Facter::Util::IP
       output = %x{/usr/sbin/ifconfig #{interface}}
     when 'HP-UX'
        mac = ""
-       ifc = %x{/usr/sbin/ifconfig #{interface}}
-       %x{/usr/sbin/lanscan}.scan(/(\dx\S+).*UP\s+(\w+\d+)/).each {|i| mac = i[0] if i.include?(interface) }
+       ifc = hpux_ifconfig_interface(interface)
+       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
     end
     output
   end
 
+  def self.hpux_ifconfig_interface(interface)
+    Facter::Util::Resolution.exec("/usr/sbin/ifconfig #{interface}")
+  end
+
+  def self.hpux_lanscan
+    Facter::Util::Resolution.exec("/usr/sbin/lanscan")
+  end
+
   def self.get_output_for_interface_and_label(interface, label)
     return get_single_interface_output(interface) unless Facter.value(:kernel) == 'windows'
 
@@ -168,6 +198,19 @@ module Facter::Util::IP
     device
   end
 
+  ##
+  # get_interface_value obtains the value of a specific attribute of a specific
+  # interface.
+  #
+  # @param interface [String] the interface identifier, e.g. "eth0" or "bond0"
+  #
+  # @param label [String] the attribute of the interface to obtain a value for,
+  # e.g. "netmask" or "ipaddress"
+  #
+  # @api private
+  #
+  # @return [String] representing the requested value.  An empty array is
+  # returned if the kernel is not supported by the REGEX_MAP constant.
   def self.get_interface_value(interface, label)
     tmp1 = []
 
@@ -186,9 +229,11 @@ module Facter::Util::IP
     # We have to dig a bit to get the original/real MAC address of the interface.
     bonddev = get_bonding_master(interface)
     if label == 'macaddress' and bonddev
-      bondinfo = IO.readlines("/proc/net/bonding/#{bonddev}")
-      hwaddrre = /^Slave Interface: #{interface}\n[^\n].+?\nPermanent HW addr: (([0-9a-fA-F]{2}:?)*)$/m
-      value = hwaddrre.match(bondinfo.to_s)[1].upcase
+      bondinfo = read_proc_net_bonding("/proc/net/bonding/#{bonddev}")
+      re = /^Slave Interface: #{interface}\b.*?\bPermanent HW addr: (([0-9A-F]{2}:?)*)$/im
+      if match = re.match(bondinfo)
+        value = match[1].upcase
+      end
     else
       output_int = get_output_for_interface_and_label(interface, label)
 
@@ -208,6 +253,19 @@ module Facter::Util::IP
     end
   end
 
+  ##
+  # read_proc_net_bonding is a seam method for mocking purposes.
+  #
+  # @param path [String] representing the path to read, e.g. "/proc/net/bonding/bond0"
+  #
+  # @api private
+  #
+  # @return [String] modeling the raw file read
+  def self.read_proc_net_bonding(path)
+    File.read(path) if File.exists?(path)
+  end
+  private_class_method :read_proc_net_bonding
+
   def self.get_network_value(interface)
     require 'ipaddr'
 

data/lib/facter/util/processor.rb

@@ -217,7 +217,7 @@ module Processor
     if File.exists?(cpuinfo)
       model = Facter.value(:architecture)
       case model
-      when "x86_64", "amd64", "i386", /parisc/, "hppa", "ia64"
+      when "x86_64", "amd64", "i386", "x86", /parisc/, "hppa", "ia64"
         Thread::exclusive do
           File.readlines(cpuinfo).each do |l|
             if l =~ /processor\s+:\s+(\d+)/

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '1.6.16'
+    FACTERVERSION = '1.6.17-rc1'
   end
 
   def self.version

data/spec/fixtures/ifconfig/linux_ifconfig_no_addr

@@ -0,0 +1,19 @@
+em1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 131.252.209.153  netmask 255.255.255.0  broadcast 192.168.76.255
+        inet6 2610:10:20:209:212:3fff:febe:2201  prefixlen 128  scopeid 0x0<global>
+        inet6 fe80::221:ccff:fe4b:297d  prefixlen 64  scopeid 0x20<link>
+        ether 00:21:cc:4b:29:7d  txqueuelen 1000  (Ethernet)
+        RX packets 27222144  bytes 31247414760 (29.1 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 10259038  bytes 7784519352 (7.2 GiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+        device interrupt 20  memory 0xd2600000-d2620000  
+
+lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 16436
+        inet 127.0.0.1  netmask 255.0.0.0
+        inet6 ::1  prefixlen 128  scopeid 0x10<host>
+        loop  txqueuelen 0  (Local Loopback)
+        RX packets 257371  bytes 37104110 (35.3 MiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 257371  bytes 37104110 (35.3 MiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

data/spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt

@@ -0,0 +1,19 @@
+em1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 131.252.209.153  netmask 255.255.255.0  broadcast 192.168.76.255
+        inet6 2610:10:20:209:212:3fff:febe:2201  prefixlen 128  scopeid 0x0<global>
+        inet6 fe80::221:ccff:fe4b:297d  prefixlen 64  scopeid 0x20<link>
+        ether 00:21:cc:4b:29:7d  txqueuelen 1000  (Ethernet)
+        RX packets 27222144  bytes 31247414760 (29.1 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 10259038  bytes 7784519352 (7.2 GiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0
+        device interrupt 20  memory 0xd2600000-d2620000  
+
+lo: flags=73<UP,LOOPBACK,RUNNING>  mtu 16436
+        inet 127.0.0.1  netmask 255.0.0.0
+        inet6 ::1  prefixlen 128  scopeid 0x10<host>
+        loop  txqueuelen 0  (Local Loopback)
+        RX packets 257371  bytes 37104110 (35.3 MiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 257371  bytes 37104110 (35.3 MiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

data/spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt

@@ -0,0 +1,16 @@
+eth0      Link encap:Ethernet  HWaddr 42:01:0a:57:50:6e  
+          inet addr:10.87.80.110  Bcast:10.87.80.110  Mask:255.255.255.255
+          UP BROADCAST RUNNING MULTICAST  MTU:1460  Metric:1
+          RX packets:1609444 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:1479569 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:673812693 (673.8 MB)  TX bytes:221186872 (221.1 MB)
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:5435415 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:5435415 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:734540224 (734.5 MB)  TX bytes:734540224 (734.5 MB)
+

data/spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lan0

@@ -0,0 +1,2 @@
+lan0: flags=843<UP,BROADCAST,RUNNING,MULTICAST>
+        inet 192.168.3.10 netmask ffffff00 broadcast 192.168.3.255

data/spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lan1

@@ -0,0 +1,2 @@
+lan1: flags=843<UP,BROADCAST,RUNNING,MULTICAST>
+        inet 10.1.1.6 netmask ffffff00 broadcast 10.1.1.255

data/spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lo0

@@ -0,0 +1,2 @@
+lo0: flags=849<UP,LOOPBACK,RUNNING,MULTICAST>
+        inet 127.0.0.1 netmask ff000000

data/spec/fixtures/unit/util/ip/hpux_1111_lanscan

@@ -0,0 +1,5 @@
+Hardware Station        Crd Hdw   Net-Interface  NM  MAC       HP-DLPI DLPI
+Path     Address        In# State NamePPA        ID  Type      Support Mjr#
+0/0/0/0  0x00307F0C79DC 0   UP    lan0 snap0     1   ETHER     Yes     119
+0/10/0/0/6/0 0x0010797B5CDE 1   UP    lan1 snap1     2   ETHER     Yes     119
+0/10/0/0/7/0 0x0010797B5CDF 2   UP    lan2 snap2     3   ETHER     Yes     119

data/spec/fixtures/unit/util/ip/hpux_1111_netstat_in

@@ -0,0 +1,4 @@
+Name           Mtu Network            Address                 Ipkts      Opkts
+lan1          1500 10.1.1.0           10.1.1.6            435347580    1287271
+lan0          1500 192.168.3.0        192.168.3.10         28101904 3569941319
+lo0           4136 127.0.0.0          127.0.0.1             5071536    5071539

data/spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lan0

@@ -0,0 +1,2 @@
+lan0: flags=843<UP,BROADCAST,RUNNING,MULTICAST>
+        inet 192.168.3.9 netmask ffffff00 broadcast 192.168.3.255

data/spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lan1

@@ -0,0 +1,2 @@
+lan1: flags=842<BROADCAST,RUNNING,MULTICAST>
+        inet 10.10.0.5 netmask ffffff00 broadcast 10.10.0.255

data/spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lo0

@@ -0,0 +1,2 @@
+lo0: flags=849<UP,LOOPBACK,RUNNING,MULTICAST>
+        inet 127.0.0.1 netmask ff000000

data/spec/fixtures/unit/util/ip/hpux_1131_asterisk_lanscan

@@ -0,0 +1,5 @@
+Hardware Station        Crd  Hdw   Net-Interface    NM   MAC       HP-DLPI DLPI
+Path     Address        In#  State NamePPA          ID   Type      Support Mjr#
+0/0/0/0  0x00305D0626B2 0    UP    lan0 snap0       1    ETHER       Yes   119
+0/4/2/0/6/0 0x0010797BBE46 1    UP    lan1 snap1       2    ETHER       Yes   119
+0/4/2/0/7/0 0x0010797BBE47 2    DOWN  lan2 snap2       3    ETHER       Yes   119

data/spec/fixtures/unit/util/ip/hpux_1131_asterisk_netstat_in

@@ -0,0 +1,4 @@
+Name      Mtu  Network         Address         Ipkts   Ierrs Opkts   Oerrs Coll
+lan1*     1500 10.10.0.0       10.10.0.5       786     0     240     0     0
+lan0      1500 192.168.3.0     192.168.3.9     1823744990 0     23598735 0     0
+lo0       4136 127.0.0.0       127.0.0.1       7048047 0     7048047 0     0

data/spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lan0

@@ -0,0 +1,2 @@
+lan0: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+        inet 192.168.30.152 netmask ffffff00 broadcast 192.168.30.255

data/spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lan1

@@ -0,0 +1,2 @@
+lan1: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+        inet 10.1.54.36 netmask ffffff00 broadcast 10.1.54.255

data/spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lo0

@@ -0,0 +1,2 @@
+lo0: flags=849<UP,LOOPBACK,RUNNING,MULTICAST>
+        inet 127.0.0.1 netmask ff000000

data/spec/fixtures/unit/util/ip/hpux_1131_lanscan

@@ -0,0 +1,4 @@
+Hardware Station        Crd  Hdw   Net-Interface    NM   MAC       HP-DLPI DLPI
+Path     Address        In#  State NamePPA          ID   Type      Support Mjr#
+0/1/2/0  0x0012317D6209 0    UP    lan0 snap0       1    ETHER       Yes   119
+0/6/1/0  0x0017FD2D2A57 1    UP    lan1 snap1       2    ETHER       Yes   119

data/spec/fixtures/unit/util/ip/hpux_1131_netstat_in

@@ -0,0 +1,4 @@
+Name      Mtu  Network         Address         Ipkts   Ierrs Opkts   Oerrs Coll
+lan1      1500 10.1.54.0       10.1.54.36      117489535 0     1681709 0     79
+lan0      1500 192.168.30.0    192.168.30.152  964843646 0     1668475345 0     0
+lo0       4136 127.0.0.0       127.0.0.1       4658855 0     4658855 0     0

data/spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan1

@@ -0,0 +1,2 @@
+lan1: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+        inet 192.168.30.32 netmask ffffff00 broadcast 192.168.30.255

data/spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan4

@@ -0,0 +1,2 @@
+lan4: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+        inet 192.168.32.75 netmask ffffff00 broadcast 192.168.32.255

data/spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan4_1

@@ -0,0 +1,2 @@
+lan4:1: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
+        inet 192.168.1.197 netmask ffffff00 broadcast 192.168.1.255

data/spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lo0

@@ -0,0 +1,2 @@
+lo0: flags=849<UP,LOOPBACK,RUNNING,MULTICAST>
+        inet 127.0.0.1 netmask ff000000

data/spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_lanscan

@@ -0,0 +1,9 @@
+Hardware Station        Crd  Hdw   Net-Interface    NM   MAC       HP-DLPI DLPI
+Path     Address        In#  State NamePPA          ID   Type      Support Mjr#
+0/1/2/0  0x001319BD1C2D 0    UP    lan0 snap0       1    ETHER       Yes   119
+0/2/1/0  0x0012819E48DE 1    UP    lan1 snap1       2    ETHER       Yes   119
+0/2/1/1  0x0012819E48DF 2    UP    lan2 snap2       3    ETHER       Yes   119
+0/4/2/0/6/0 0x001165EB7385 5    UP    lan5 snap5       4    ETHER       Yes   119
+0/5/2/0/6/0 0x001165EB73E6 3    UP    lan3 snap3       5    ETHER       Yes   119
+0/6/1/0  0x0012819E4A7E 4    UP    lan4 snap4       6    ETHER       Yes   119
+0/6/1/1  0x0012819E4A7F 6    UP    lan6 snap6       7    ETHER       Yes   119

data/spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_netstat_in

@@ -0,0 +1,6 @@
+Name      Mtu  Network         Address         Ipkts   Ierrs Opkts   Oerrs Coll
+lan4:1    1500 192.168.1.0     192.168.1.197   121     0     6       0     0
+lan3*     1500 none            none            0       0     0       0     0
+lan1      1500 192.168.30.0    192.168.30.32   211188606 0     132070934 0     0
+lo0       4136 127.0.0.0       127.0.0.1       513508160 0     513509185 0     0
+lan4      1500 192.168.32.0    192.168.32.75   2640827721 0     2257447701 0     0

data/spec/fixtures/unit/util/ip/linux_2_6_35_proc_net_bonding_bond0

@@ -0,0 +1,19 @@
+Ethernet Channel Bonding Driver: v3.5.0 (November 4, 2008)
+
+Bonding Mode: fault-tolerance (active-backup)
+Primary Slave: None
+Currently Active Slave: eth0
+MII Status: up
+MII Polling Interval (ms): 100
+Up Delay (ms): 200
+Down Delay (ms): 200
+
+Slave Interface: eth1
+MII Status: up
+Link Failure Count: 0
+Permanent HW addr: 00:11:22:33:44:56
+
+Slave Interface: eth0
+MII Status: up
+Link Failure Count: 0
+Permanent HW addr: 00:11:22:33:44:55

data/spec/fixtures/unit/util/processor/x86-pentium2

@@ -0,0 +1,41 @@
+processor : 0
+vendor_id : GenuineIntel
+cpu family  : 6
+model   : 5
+model name  : Pentium II (Deschutes)
+stepping  : 1
+cpu MHz   : 333.379
+cache size  : 512 KB
+fdiv_bug  : no
+hlt_bug   : no
+f00f_bug  : no
+coma_bug  : no
+fpu   : yes
+fpu_exception : yes
+cpuid level : 2
+wp    : yes
+flags   : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr
+bogomips  : 667.53
+clflush size  : 32
+power management:
+
+processor : 1
+vendor_id : GenuineIntel
+cpu family  : 6
+model   : 5
+model name  : Pentium II (Deschutes)
+stepping  : 1
+cpu MHz   : 333.379
+cache size  : 512 KB
+fdiv_bug  : no
+hlt_bug   : no
+f00f_bug  : no
+coma_bug  : no
+fpu   : yes
+fpu_exception : yes
+cpuid level : 2
+wp    : yes
+flags   : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 mmx fxsr
+bogomips  : 666.44
+clflush size  : 32
+power management:

data/spec/unit/ec2_spec.rb

@@ -68,9 +68,9 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").
         at_least_once.returns(StringIO.new(""))
 
-      Facter::Util::Resolution.any_instance.expects(:open).
-        with("#{api_prefix}/2008-02-01/user-data/").
-        at_least_once.returns(StringIO.new("test"))
+      Facter::Util::EC2.stubs(:read_uri).
+        with("#{api_prefix}/latest/user-data/").
+        returns("test")
 
       Facter.collection.loader.load(:ec2)
       Facter.fact(:ec2_userdata).value.should == ["test"]
@@ -94,9 +94,9 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").\
         at_least_once.returns(StringIO.new(""))
 
-      Facter::Util::Resolution.any_instance.expects(:open).\
-        with("#{api_prefix}/2008-02-01/user-data/").\
-        at_least_once.returns(StringIO.new("test"))
+      Facter::Util::EC2.stubs(:read_uri).
+        with("#{api_prefix}/latest/user-data/").
+        returns("test")
 
       # Force a fact load
       Facter.collection.loader.load(:ec2)
@@ -122,9 +122,9 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").\
         at_least_once.returns(StringIO.new(""))
 
-      Facter::Util::Resolution.any_instance.expects(:open).\
-        with("#{api_prefix}/2008-02-01/user-data/").\
-        at_least_once.returns(StringIO.new("test"))
+      Facter::Util::EC2.stubs(:read_uri).
+        with("#{api_prefix}/latest/user-data/").
+        returns("test")
 
       # Force a fact load
       Facter.collection.loader.load(:ec2)
@@ -140,9 +140,9 @@ describe "ec2 facts" do
         with("#{api_prefix}/2008-02-01/meta-data/").
         at_least_once.raises(RuntimeError, 'host unreachable')
 
-      Facter::Util::Resolution.any_instance.expects(:open).
-        with("#{api_prefix}/2008-02-01/user-data/").
-        at_least_once.raises(RuntimeError, 'host unreachable')
+      Facter::Util::EC2.stubs(:read_uri).
+        with("#{api_prefix}/latest/user-data/").
+        raises(RuntimeError, 'host unreachable')
 
       # Force a fact load
       Facter.collection.loader.load(:ec2)

data/spec/unit/ipaddress_spec.rb

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby
+
+require 'spec_helper'
+require 'facter/util/ip'
+
+shared_examples_for "ifconfig output" do |platform, address, fixture|
+  it "correctly on #{platform}" do
+    Facter::Util::IP.stubs(:get_ifconfig).returns(my_fixture_read(fixture))
+    subject.value.should == address
+  end
+end
+
+RSpec.configure do |config|
+  config.alias_it_should_behave_like_to :example_behavior_for, "parses"
+end
+
+describe "The ipaddress fact" do
+  subject do
+    Facter.collection.loader.load(:ipaddress)
+    Facter.fact(:ipaddress)
+  end
+  context "on Linux" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+    end
+
+    example_behavior_for "ifconfig output",
+      "Ubuntu 12.04", "10.87.80.110", "ifconfig_ubuntu_1204.txt"
+    example_behavior_for "ifconfig output",
+      "Fedora 17", "131.252.209.153", "ifconfig_net_tools_1.60.txt"
+  end
+end

data/spec/unit/util/ec2_spec.rb

@@ -151,4 +151,30 @@ describe Facter::Util::EC2 do
       end
     end
   end
+
+  describe "Facter::Util::EC2.userdata" do
+    let :not_found_error do
+      OpenURI::HTTPError.new("404 Not Found", StringIO.new)
+    end
+
+    let :example_userdata do
+      "owner=jeff@puppetlabs.com\ngroup=platform_team"
+    end
+
+    it 'returns nil when no userdata is present' do
+      Facter::Util::EC2.stubs(:read_uri).raises(not_found_error)
+      Facter::Util::EC2.userdata.should be_nil
+    end
+
+    it "returns the string containing the body" do
+      Facter::Util::EC2.stubs(:read_uri).returns(example_userdata)
+      Facter::Util::EC2.userdata.should == example_userdata
+    end
+
+    it "uses the specified API version" do
+      expected_uri = "http://169.254.169.254/2008-02-01/user-data/"
+      Facter::Util::EC2.expects(:read_uri).with(expected_uri).returns(example_userdata)
+      Facter::Util::EC2.userdata('2008-02-01').should == example_userdata
+    end
+  end
 end

data/spec/unit/util/ip_spec.rb

@@ -42,12 +42,6 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_interfaces().should == ["lo0", "e1000g0"]
   end
 
-  it "should return a list three interfaces on HP-UX with three interfaces multiply reporting" do
-    hpux_netstat = my_fixture_read("hpux_netstat_all_interfaces")
-    Facter::Util::IP.stubs(:get_all_interface_output).returns(hpux_netstat)
-    Facter::Util::IP.get_interfaces().should == ["lan1", "lan0", "lo0"]
-  end
-
   it "should return a list of six interfaces on a GNU/kFreeBSD with six interfaces" do
     kfreebsd_ifconfig = my_fixture_read("debian_kfreebsd_ifconfig")
     Facter::Util::IP.stubs(:get_all_interface_output).returns(kfreebsd_ifconfig)
@@ -97,24 +91,6 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_network_value("e1000g0").should == "172.16.15.0"
   end
 
-  it "should return ipaddress information for HP-UX" do
-    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
-
-    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-    Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-    Facter::Util::IP.get_interface_value("lan0", "ipaddress").should == "168.24.80.71"
-  end
-
-  it "should return macaddress information for HP-UX" do
-    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
-
-    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-    Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-    Facter::Util::IP.get_interface_value("lan0", "macaddress").should == "00:13:21:BD:9C:B7"
-  end
-
   it "should return macaddress with leading zeros stripped off for GNU/kFreeBSD" do
     kfreebsd_ifconfig = my_fixture_read("debian_kfreebsd_ifconfig")
 
@@ -124,24 +100,6 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_interface_value("em0", "macaddress").should == "0:11:a:59:67:90"
   end
 
-  it "should return netmask information for HP-UX" do
-    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
-
-    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-    Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-    Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
-  end
-
-  it "should return calculated network information for HP-UX" do
-    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
-
-    Facter::Util::IP.stubs(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-    Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-    Facter::Util::IP.get_network_value("lan0").should == "168.24.80.0"
-  end
-
   it "should return interface information for FreeBSD supported via an alias" do
     ifconfig_interface = my_fixture_read("6.0-STABLE_FreeBSD_ifconfig")
 
@@ -178,15 +136,6 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
   end
 
-  it "should return a human readable netmask on HP-UX" do
-    hpux_ifconfig_interface = my_fixture_read("hpux_ifconfig_single_interface")
-
-    Facter::Util::IP.expects(:get_single_interface_output).with("lan0").returns(hpux_ifconfig_interface)
-    Facter.stubs(:value).with(:kernel).returns("HP-UX")
-
-    Facter::Util::IP.get_interface_value("lan0", "netmask").should == "255.255.255.0"
-  end
-
   it "should return a human readable netmask on Darwin" do
     darwin_ifconfig_interface = my_fixture_read("darwin_ifconfig_single_interface")
 
@@ -292,6 +241,135 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_interface_value("e1000g0", "mtu").should == "1500"
   end
 
+  # (#17487) - tests for HP-UX.
+  # some fake data for testing robustness of regexps.
+  def self.fake_netstat_in_examples
+    examples = []
+    examples << ["Header row\na line with none in it\na line without\nanother line without\n",
+                 "a line without\nanother line without\n"]
+    examples << ["Header row\na line without\na line with none in it\nanother line with none\nanother line without\n",
+                 "a line without\nanother line without\n"]
+    examples << ["Header row\na line with * asterisks *\na line with none in it\nanother line without\n",
+                 "a line with  asterisks \nanother line without\n"]
+    examples << ["a line with none none none in it\na line with none in it\na line without\nanother line without\n",
+                 "another line without\n"]
+    examples
+  end
+
+  fake_netstat_in_examples.each_with_index do |example, i|
+    input, expected_output = example
+    it "should pass regexp test on fake netstat input example #{i}" do
+      Facter.stubs(:value).with(:kernel).returns("HP-UX")
+      Facter::Util::IP.stubs(:hpux_netstat_in).returns(input)
+      Facter::Util::IP.get_all_interface_output().should == expected_output
+    end
+  end
+
+  # and some real data for exhaustive tests.
+  def self.hpux_examples
+    examples = []
+    examples << ["HP-UX 11.11",
+                   ["lan1",              "lan0",              "lo0"      ],
+                   ["1500",              "1500",              "4136"     ],
+                   ["10.1.1.6",          "192.168.3.10",      "127.0.0.1"],
+                   ["255.255.255.0",     "255.255.255.0",     "255.0.0.0"],
+                   ["00:10:79:7B:5C:DE", "00:30:7F:0C:79:DC", nil        ],
+                   [my_fixture_read("hpux_1111_ifconfig_lan1"),
+                      my_fixture_read("hpux_1111_ifconfig_lan0"),
+                        my_fixture_read("hpux_1111_ifconfig_lo0")],
+                           my_fixture_read("hpux_1111_netstat_in"),
+                           my_fixture_read("hpux_1111_lanscan")]
+
+    examples << ["HP-UX 11.31",
+                   ["lan1",              "lan0",              "lo0"      ],
+                   ["1500",              "1500",              "4136"     ],
+                   ["10.1.54.36",        "192.168.30.152",    "127.0.0.1"],
+                   ["255.255.255.0",     "255.255.255.0",     "255.0.0.0"],
+                   ["00:17:FD:2D:2A:57", "00:12:31:7D:62:09", nil        ],
+                   [my_fixture_read("hpux_1131_ifconfig_lan1"),
+                      my_fixture_read("hpux_1131_ifconfig_lan0"),
+                        my_fixture_read("hpux_1131_ifconfig_lo0")],
+                           my_fixture_read("hpux_1131_netstat_in"),
+                           my_fixture_read("hpux_1131_lanscan")]
+
+    examples << ["HP-UX 11.31 with an asterisk after a NIC that has an address",
+                   ["lan1",              "lan0",              "lo0"      ],
+                   ["1500",              "1500",              "4136"     ],
+                   ["10.10.0.5",         "192.168.3.9",       "127.0.0.1"],
+                   ["255.255.255.0",     "255.255.255.0",     "255.0.0.0"],
+                   ["00:10:79:7B:BE:46", "00:30:5D:06:26:B2", nil        ],
+                   [my_fixture_read("hpux_1131_asterisk_ifconfig_lan1"),
+                      my_fixture_read("hpux_1131_asterisk_ifconfig_lan0"),
+                        my_fixture_read("hpux_1131_asterisk_ifconfig_lo0")],
+                           my_fixture_read("hpux_1131_asterisk_netstat_in"),
+                           my_fixture_read("hpux_1131_asterisk_lanscan")]
+
+    examples << ["HP-UX 11.31 with NIC bonding and one virtual NIC",
+                   ["lan4:1",        "lan1",              "lo0",       "lan4"             ],
+                   ["1500",          "1500",              "4136",      "1500"             ],
+                   ["192.168.1.197", "192.168.30.32",     "127.0.0.1", "192.168.32.75"    ],
+                   ["255.255.255.0", "255.255.255.0",     "255.0.0.0", "255.255.255.0"    ],
+                   [nil,             "00:12:81:9E:48:DE", nil,         "00:12:81:9E:4A:7E"],
+                   [my_fixture_read("hpux_1131_nic_bonding_ifconfig_lan4_1"),
+                      my_fixture_read("hpux_1131_nic_bonding_ifconfig_lan1"),
+                        my_fixture_read("hpux_1131_nic_bonding_ifconfig_lo0"),
+                          my_fixture_read("hpux_1131_nic_bonding_ifconfig_lan4")],
+                           my_fixture_read("hpux_1131_nic_bonding_netstat_in"),
+                           my_fixture_read("hpux_1131_nic_bonding_lanscan")]
+    examples
+  end
+
+  hpux_examples.each do |example|
+    description, array_of_expected_ifs, array_of_expected_mtus,
+      array_of_expected_ips, array_of_expected_netmasks,
+        array_of_expected_macs, array_of_ifconfig_fixtures,
+           netstat_in_fixture, lanscan_fixture = example
+
+    it "should return a list three interfaces on #{description}" do
+      Facter.stubs(:value).with(:kernel).returns("HP-UX")
+      Facter::Util::IP.stubs(:hpux_netstat_in).returns(netstat_in_fixture)
+      Facter::Util::IP.get_interfaces().should == array_of_expected_ifs
+    end
+
+    array_of_expected_ifs.each_with_index do |nic, i|
+      ifconfig_fixture = array_of_ifconfig_fixtures[i]
+      expected_mtu = array_of_expected_mtus[i]
+      expected_ip = array_of_expected_ips[i]
+      expected_netmask = array_of_expected_netmasks[i]
+      expected_mac = array_of_expected_macs[i]
+
+      # (#17808) These tests fail because MTU facts haven't been implemented for HP-UX.
+      #it "should return MTU #{expected_mtu} on #{nic} for #{description} example" do
+      #  Facter.stubs(:value).with(:kernel).returns("HP-UX")
+      #  Facter::Util::IP.stubs(:hpux_netstat_in).returns(netstat_in_fixture)
+      #  Facter::Util::IP.stubs(:hpux_lanscan).returns(lanscan_fixture)
+      #  Facter::Util::IP.stubs(:hpux_ifconfig_interface).with(nic).returns(ifconfig_fixture)
+      #  Facter::Util::IP.get_interface_value(nic, "mtu").should == expected_mtu
+      #end
+
+      it "should return IP #{expected_ip} on #{nic} for #{description} example" do
+        Facter.stubs(:value).with(:kernel).returns("HP-UX")
+        Facter::Util::IP.stubs(:hpux_lanscan).returns(lanscan_fixture)
+        Facter::Util::IP.stubs(:hpux_ifconfig_interface).with(nic).returns(ifconfig_fixture)
+        Facter::Util::IP.get_interface_value(nic, "ipaddress").should == expected_ip
+      end
+
+      it "should return netmask #{expected_netmask} on #{nic} for #{description} example" do
+        Facter.stubs(:value).with(:kernel).returns("HP-UX")
+        Facter::Util::IP.stubs(:hpux_lanscan).returns(lanscan_fixture)
+        Facter::Util::IP.stubs(:hpux_ifconfig_interface).with(nic).returns(ifconfig_fixture)
+        Facter::Util::IP.get_interface_value(nic, "netmask").should == expected_netmask
+      end
+
+      it "should return MAC address #{expected_mac} on #{nic} for #{description} example" do
+        Facter.stubs(:value).with(:kernel).returns("HP-UX")
+        Facter::Util::IP.stubs(:hpux_lanscan).returns(lanscan_fixture)
+        Facter::Util::IP.stubs(:hpux_ifconfig_interface).with(nic).returns(ifconfig_fixture)
+        Facter::Util::IP.get_interface_value(nic, "macaddress").should == expected_mac
+      end
+    end
+  end
+
   describe "on Windows" do
     before :each do
       Facter.stubs(:value).with(:kernel).returns("windows")
@@ -330,4 +408,27 @@ describe Facter::Util::IP do
       Facter::Util::IP.get_interface_value("Teredo Tunneling Pseudo-Interface", "ipaddress6").should == "2001:0:4137:9e76:2087:77a:53ef:7527"
     end
   end
+
+  context "with bonded ethernet interfaces on Linux" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+    end
+
+    describe "Facter::Util::Ip.get_interface_value" do
+      before :each do
+        Facter::Util::IP.stubs(:read_proc_net_bonding).
+          with("/proc/net/bonding/bond0").
+          returns(my_fixture_read("linux_2_6_35_proc_net_bonding_bond0"))
+
+        Facter::Util::IP.stubs(:get_bonding_master).returns("bond0")
+      end
+
+      it 'provides the real device macaddress for eth0' do
+        Facter::Util::IP.get_interface_value("eth0", "macaddress").should == "00:11:22:33:44:55"
+      end
+      it 'provides the real device macaddress for eth1' do
+        Facter::Util::IP.get_interface_value("eth1", "macaddress").should == "00:11:22:33:44:56"
+      end
+    end
+  end
 end

data/spec/unit/util/processor_spec.rb

@@ -8,68 +8,86 @@ def cpuinfo_fixture(filename)
 end
 
 describe Facter::Util::Processor do
-  it "should get the processor description from the amd64solo fixture" do
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:architecture).stubs(:value).returns("amd64")
-    File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-    File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64solo"))
+  describe "on linux" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
+      File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
+    end
 
-    Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
-  end
+    describe "with architecture amd64" do
+      before :each do
+        Facter.fact(:architecture).stubs(:value).returns("amd64")
+      end
 
-  it "should get the processor descriptions from the amd64dual fixture" do
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:architecture).stubs(:value).returns("amd64")
-    File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-    File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64dual"))
+      it "should get the processor description from the amd64solo fixture" do
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64solo"))
+        Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+      end
 
-    Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
-    Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
-  end
+      it "should get the processor descriptions from the amd64dual fixture" do
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64dual"))
 
-  it "should get the processor descriptions from the amd64tri fixture" do
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:architecture).stubs(:value).returns("amd64")
-    File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-    File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64tri"))
+        Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+        Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+      end
 
-    Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
-    Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
-    Facter::Util::Processor.enum_cpuinfo[2].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
-  end
+      it "should get the processor descriptions from the amd64tri fixture" do
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64tri"))
 
-  it "should get the processor descriptions from the amd64quad fixture" do
-    Facter.fact(:kernel).stubs(:value).returns("Linux")
-    Facter.fact(:architecture).stubs(:value).returns("amd64")
-    File.stubs(:exists?).with("/proc/cpuinfo").returns(true)
-    File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64quad"))
+        Facter::Util::Processor.enum_cpuinfo[0].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+        Facter::Util::Processor.enum_cpuinfo[1].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+        Facter::Util::Processor.enum_cpuinfo[2].should == "Intel(R) Core(TM)2 Duo CPU     P8700  @ 2.53GHz"
+      end
 
-    Facter::Util::Processor.enum_cpuinfo[0].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
-    Facter::Util::Processor.enum_cpuinfo[1].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
-    Facter::Util::Processor.enum_cpuinfo[2].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
-    Facter::Util::Processor.enum_cpuinfo[3].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
-  end
+      it "should get the processor descriptions from the amd64quad fixture" do
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(cpuinfo_fixture("amd64quad"))
+
+        Facter::Util::Processor.enum_cpuinfo[0].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+        Facter::Util::Processor.enum_cpuinfo[1].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+        Facter::Util::Processor.enum_cpuinfo[2].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+        Facter::Util::Processor.enum_cpuinfo[3].should == "Quad-Core AMD Opteron(tm) Processor 2374 HE"
+      end
+    end
 
-  it "should get the processor description on Solaris (x86)" do
-    Facter.fact(:kernel).stubs(:value).returns("SunOS")
-    Facter.fact(:architecture).stubs(:value).returns("i86pc")
-    Facter::Util::Resolution.stubs(:exec).with("/usr/bin/kstat cpu_info").returns(my_fixture_read("solaris-i86pc"))
+    describe "with architecture x86" do
+      before :each do
+        Facter.fact(:architecture).stubs(:value).returns("x86")
+        File.stubs(:readlines).with("/proc/cpuinfo").returns(my_fixture_read("x86-pentium2").lines)
+      end
 
-    Facter::Util::Processor.enum_kstat[0].should == "Intel(r) Core(tm) i5 CPU       M 450  @ 2.40GHz"
+      subject { Facter::Util::Processor.enum_cpuinfo }
+
+      it "should have the correct processor titles" do
+        subject[0].should == "Pentium II (Deschutes)"
+        subject[1].should == "Pentium II (Deschutes)"
+      end
+    end
   end
 
-  it "should get the processor description on Solaris (SPARC64)" do
-    Facter.fact(:kernel).stubs(:value).returns("SunOS")
-    Facter.fact(:architecture).stubs(:value).returns("sun4u")
-    Facter::Util::Resolution.stubs(:exec).with("/usr/bin/kstat cpu_info").returns(my_fixture_read("solaris-sun4u"))
-
-    Facter::Util::Processor.enum_kstat[0].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[1].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[2].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[3].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[4].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[5].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[6].should == "SPARC64-VII"
-    Facter::Util::Processor.enum_kstat[7].should == "SPARC64-VII"
+  describe "on Solaris" do
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns("SunOS")
+    end
+
+    it "should get the processor description on Solaris (x86)" do
+      Facter.fact(:architecture).stubs(:value).returns("i86pc")
+      Facter::Util::Resolution.stubs(:exec).with("/usr/bin/kstat cpu_info").returns(my_fixture_read("solaris-i86pc"))
+
+      Facter::Util::Processor.enum_kstat[0].should == "Intel(r) Core(tm) i5 CPU       M 450  @ 2.40GHz"
+    end
+
+    it "should get the processor description on Solaris (SPARC64)" do
+      Facter.fact(:architecture).stubs(:value).returns("sun4u")
+      Facter::Util::Resolution.stubs(:exec).with("/usr/bin/kstat cpu_info").returns(my_fixture_read("solaris-sun4u"))
+
+      Facter::Util::Processor.enum_kstat[0].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[1].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[2].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[3].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[4].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[5].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[6].should == "SPARC64-VII"
+      Facter::Util::Processor.enum_kstat[7].should == "SPARC64-VII"
+    end
   end
 end

metadata

@@ -1,32 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: facter
-version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 16
-  version: 1.6.16
+version: !ruby/object:Gem::Version
+  version: 1.6.17.rc1
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-01 00:00:00 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies: []
-
 description: You can prove anything with facts!
 email: info@puppetlabs.com
-executables: 
+executables:
 - facter
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
@@ -173,6 +164,7 @@ files:
 - spec/fixtures/ifconfig/fedora_8_eth0
 - spec/fixtures/ifconfig/freebsd_6_0
 - spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces
+- spec/fixtures/ifconfig/linux_ifconfig_no_addr
 - spec/fixtures/ifconfig/linux_ifconfig_no_mac
 - spec/fixtures/ifconfig/linux_ifconfig_venet
 - spec/fixtures/ifconfig/open_solaris_10
@@ -192,6 +184,8 @@ files:
 - spec/fixtures/netstat/ubuntu_7_04
 - spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info
 - spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info
+- spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/selinux/selinux_sestatus
 - spec/fixtures/unit/util/ec2/centos-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-ec2.out
@@ -203,8 +197,28 @@ files:
 - spec/fixtures/unit/util/ip/darwin_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/unit/util/ip/darwin_ifconfig_single_interface
 - spec/fixtures/unit/util/ip/debian_kfreebsd_ifconfig
-- spec/fixtures/unit/util/ip/hpux_ifconfig_single_interface
-- spec/fixtures/unit/util/ip/hpux_netstat_all_interfaces
+- spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lan0
+- spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1111_lanscan
+- spec/fixtures/unit/util/ip/hpux_1111_netstat_in
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lan0
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_lanscan
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_netstat_in
+- spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lan0
+- spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1131_lanscan
+- spec/fixtures/unit/util/ip/hpux_1131_netstat_in
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan4
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan4_1
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_lanscan
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_netstat_in
+- spec/fixtures/unit/util/ip/linux_2_6_35_proc_net_bonding_bond0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_eth0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_ib0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_lo
@@ -224,6 +238,7 @@ files:
 - spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag
 - spec/fixtures/unit/util/processor/solaris-i86pc
 - spec/fixtures/unit/util/processor/solaris-sun4u
+- spec/fixtures/unit/util/processor/x86-pentium2
 - spec/fixtures/unit/util/uptime/kstat_boot_time
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_darwin
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd
@@ -252,6 +267,7 @@ files:
 - spec/unit/id_spec.rb
 - spec/unit/interfaces_spec.rb
 - spec/unit/ipaddress6_spec.rb
+- spec/unit/ipaddress_spec.rb
 - spec/unit/lsbdistcodename_spec.rb
 - spec/unit/lsbdistdescription_spec.rb
 - spec/unit/lsbdistid_spec.rb
@@ -290,38 +306,29 @@ files:
 - spec/watchr.rb
 homepage: https://github.com/puppetlabs/facter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Facter, a system inventory tool
-test_files: 
+test_files:
 - spec/fixtures/cpuinfo/amd64dual
 - spec/fixtures/cpuinfo/amd64quad
 - spec/fixtures/cpuinfo/amd64solo
@@ -357,6 +364,7 @@ test_files:
 - spec/fixtures/ifconfig/fedora_8_eth0
 - spec/fixtures/ifconfig/freebsd_6_0
 - spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces
+- spec/fixtures/ifconfig/linux_ifconfig_no_addr
 - spec/fixtures/ifconfig/linux_ifconfig_no_mac
 - spec/fixtures/ifconfig/linux_ifconfig_venet
 - spec/fixtures/ifconfig/open_solaris_10
@@ -376,6 +384,8 @@ test_files:
 - spec/fixtures/netstat/ubuntu_7_04
 - spec/fixtures/processorcount/solaris-sparc-kstat-cpu-info
 - spec/fixtures/processorcount/solaris-x86_64-kstat-cpu-info
+- spec/fixtures/unit/ipaddress/ifconfig_net_tools_1.60.txt
+- spec/fixtures/unit/ipaddress/ifconfig_ubuntu_1204.txt
 - spec/fixtures/unit/selinux/selinux_sestatus
 - spec/fixtures/unit/util/ec2/centos-arp-ec2.out
 - spec/fixtures/unit/util/ec2/linux-arp-ec2.out
@@ -387,8 +397,28 @@ test_files:
 - spec/fixtures/unit/util/ip/darwin_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/unit/util/ip/darwin_ifconfig_single_interface
 - spec/fixtures/unit/util/ip/debian_kfreebsd_ifconfig
-- spec/fixtures/unit/util/ip/hpux_ifconfig_single_interface
-- spec/fixtures/unit/util/ip/hpux_netstat_all_interfaces
+- spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lan0
+- spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1111_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1111_lanscan
+- spec/fixtures/unit/util/ip/hpux_1111_netstat_in
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lan0
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_lanscan
+- spec/fixtures/unit/util/ip/hpux_1131_asterisk_netstat_in
+- spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lan0
+- spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1131_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1131_lanscan
+- spec/fixtures/unit/util/ip/hpux_1131_netstat_in
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan1
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan4
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lan4_1
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_ifconfig_lo0
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_lanscan
+- spec/fixtures/unit/util/ip/hpux_1131_nic_bonding_netstat_in
+- spec/fixtures/unit/util/ip/linux_2_6_35_proc_net_bonding_bond0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_eth0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_ib0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_lo
@@ -408,6 +438,7 @@ test_files:
 - spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag
 - spec/fixtures/unit/util/processor/solaris-i86pc
 - spec/fixtures/unit/util/processor/solaris-sun4u
+- spec/fixtures/unit/util/processor/x86-pentium2
 - spec/fixtures/unit/util/uptime/kstat_boot_time
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_darwin
 - spec/fixtures/unit/util/uptime/sysctl_kern_boottime_openbsd
@@ -436,6 +467,7 @@ test_files:
 - spec/unit/id_spec.rb
 - spec/unit/interfaces_spec.rb
 - spec/unit/ipaddress6_spec.rb
+- spec/unit/ipaddress_spec.rb
 - spec/unit/lsbdistcodename_spec.rb
 - spec/unit/lsbdistdescription_spec.rb
 - spec/unit/lsbdistid_spec.rb

data/spec/fixtures/unit/util/ip/hpux_ifconfig_single_interface

@@ -1,3 +0,0 @@
-lan0: flags=1843<UP,BROADCAST,RUNNING,MULTICAST,CKO>
-	inet 168.24.80.71 netmask ffffff00 broadcast 168.24.80.255
-00:13:21:BD:9C:B7

data/spec/fixtures/unit/util/ip/hpux_netstat_all_interfaces

@@ -1,3 +0,0 @@
-lan1      1500 192.168.100.0   192.168.100.182 12964   0     900     0     0
-lan0      1500 192.168.100.0   192.168.100.181 12964   0     715     0     0   
-lo0       4136 127.0.0.0       127.0.0.1       98      0     98      0     0