facter 1.7.2 → 1.7.3.rc1

data/lib/facter/util/macaddress.rb

@@ -33,16 +33,10 @@ module Facter::Util::Macaddress
 
   module Windows
     def macaddress
-      require 'facter/util/wmi'
+      require 'facter/util/ip/windows'
 
-      query = "select MACAddress from Win32_NetworkAdapterConfiguration where IPEnabled = True"
-
-      ether = nil
-      Facter::Util::WMI.execquery(query).each do |nic|
-        ether = nic.MacAddress
-        break
-      end
-      ether
+      adapter = Facter::Util::IP::Windows.get_preferred_ipv4_adapters.first
+      adapter ? adapter.MACAddress : nil
     end
     module_function :macaddress
   end

data/lib/facter/util/netmask.rb

@@ -25,7 +25,7 @@ module Facter::NetMask
       }
     end
 
-    Facter::Util::IP.exec_ifconfig(ops[:ifconfig_opts]).split(/\n/).collect do |line|
+    String(Facter::Util::IP.exec_ifconfig(ops[:ifconfig_opts])).split(/\n/).collect do |line|
       matches = line.match(ops[:regex])
       if !matches.nil?
         if ops[:munge].nil?

data/lib/facter/util/parser.rb

@@ -66,6 +66,19 @@ module Facter::Util::Parser
     end
   end
 
+  module KeyValuePairOutputFormat
+    def self.parse(output)
+      result = {}
+      re = /^(.+?)=(.+)$/
+      output.each_line do |line|
+        if match_data = re.match(line.chomp)
+          result[match_data[1]] = match_data[2]
+        end
+      end
+      result
+    end
+  end
+
   class YamlParser < Base
     def parse_results
       YAML.load(content)
@@ -78,14 +91,7 @@ module Facter::Util::Parser
 
   class TextParser < Base
     def parse_results
-      re = /^(.+?)=(.+)$/
-      result = {}
-      content.each_line do |line|
-        if match_data = re.match(line.chomp)
-          result[match_data[1]] = match_data[2]
-        end
-      end
-      result
+      KeyValuePairOutputFormat.parse content
     end
   end
 
@@ -111,25 +117,30 @@ module Facter::Util::Parser
 
   class ScriptParser < Base
     def results
-      output = Facter::Util::Resolution.exec(filename)
-
-      result = {}
-      re = /^(.+)=(.+)$/
-      output.each_line do |line|
-        if match_data = re.match(line.chomp)
-          result[match_data[1]] = match_data[2]
-        end
-      end
-      result
+      KeyValuePairOutputFormat.parse Facter::Util::Resolution.exec(filename)
     end
   end
 
   register(ScriptParser) do |filename|
-    if not Facter::Util::Config.is_windows?
+    if Facter::Util::Config.is_windows?
+      extension_matches?(filename, %w{bat cmd com exe}) && File.file?(filename)
+    else
       File.executable?(filename) && File.file?(filename)
     end
   end
 
+  # Executes and parses the key value output of Powershell scripts
+  class PowershellParser < Base
+    # Returns a hash of facts from powershell output
+    def results
+      shell_command = "powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -File \"#{filename}\""
+      KeyValuePairOutputFormat.parse Facter::Util::Resolution.exec(shell_command)
+    end
+  end
+
+  register(PowershellParser) do |filename|
+    Facter::Util::Config.is_windows? && extension_matches?(filename, "ps1") && File.file?(filename)
+  end
 
   # A parser that is used when there is no other parser that can handle the file
   # The return from results indicates to the caller the file was not parsed correctly.

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '1.7.2'
+    FACTERVERSION = '1.7.3-rc1'
   end
 
   ##

data/lib/facter/virtual.rb

@@ -46,7 +46,7 @@ end
 
 Facter.add("virtual") do
   confine :kernel => ["FreeBSD", "GNU/kFreeBSD"]
-
+  has_weight 10
   setcode do
     "jail" if Facter::Util::Virtual.jail?
   end
@@ -54,7 +54,7 @@ end
 
 Facter.add("virtual") do
   confine :kernel => 'SunOS'
-
+  has_weight 10
   setcode do
     next "zone" if Facter::Util::Virtual.zone?
 
@@ -74,7 +74,7 @@ end
 
 Facter.add("virtual") do
   confine :kernel => 'HP-UX'
-
+  has_weight 10
   setcode do
     "hpvm" if Facter::Util::Virtual.hpvm?
   end
@@ -82,7 +82,7 @@ end
 
 Facter.add("virtual") do
   confine :architecture => 's390x'
-
+  has_weight 10
   setcode do
     "zlinux" if Facter::Util::Virtual.zlinux?
   end
@@ -90,7 +90,7 @@ end
 
 Facter.add("virtual") do
   confine :kernel => 'OpenBSD'
-
+  has_weight 10
   setcode do
     output = Facter::Util::Resolution.exec('sysctl -n hw.product 2>/dev/null')
     if output

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

@@ -0,0 +1,18 @@
+lo        Link encap:Boucle locale  
+          inet adr:127.0.0.1  Masque:255.0.0.0
+          adr inet6: ::1/128 Scope:Hote
+          UP LOOPBACK RUNNING  MTU:65536  Metric:1
+          RX packets:1001 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:1001 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 lg file transmission:0 
+          RX bytes:52562 (51.3 KiB)  TX bytes:52562 (51.3 KiB)
+
+wlan0     Link encap:Ethernet  HWaddr ac:81:12:2d:86:25  
+          inet adr:192.168.1.83  Bcast:192.168.1.255  Masque:255.255.255.0
+          adr inet6: fe80::ae81:12ff:fe2d:8625/64 Scope:Lien
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:493220 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:390375 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 lg file transmission:1000 
+          RX bytes:569234568 (542.8 MiB)  TX bytes:69778980 (66.5 MiB)
+

data/spec/lib/facter_spec/windows_network.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+module FacterSpec::WindowsNetwork
+
+  def settingId0
+    '{4AE6B55C-6DD6-427D-A5BB-13535D4BE926}'
+  end
+
+  def settingId1
+    '{38762816-7957-42AC-8DAA-3B08D0C857C7}'
+  end
+
+  def nic_bindings
+    ["\\Device\\#{settingId0}", "\\Device\\#{settingId1}" ]
+  end
+
+  def macAddress0
+    '23:24:df:12:12:00'
+  end
+
+  def macAddress1
+    '00:0C:29:0C:9E:9F'
+  end
+
+  def ipAddress0
+    '12.123.12.12'
+  end
+
+  def ipAddress1
+    '12.123.12.13'
+  end
+
+  def subnet0
+    '255.255.255.0'
+  end
+
+  def subnet1
+    '255.255.0.0'
+  end
+
+  def ipv6Address0
+    '2011:0:4137:9e76:2087:77a:53ef:7527'
+  end
+
+  def ipv6Address1
+    '2013:0:4137:9e76:2087:77a:53ef:7527'
+  end
+
+  def ipv6LinkLocal
+    'fe80::2db2:5b42:4e30:b508'
+  end
+
+  def given_a_valid_windows_nic_with_ipv4_and_ipv6
+    stub('network0', :IPAddress => [ipAddress0, ipv6Address0], :SettingID => settingId0, :IPConnectionMetric => 10,:MACAddress => macAddress0,:IPSubnet => [subnet0, '48','2'])
+  end
+
+  def given_two_valid_windows_nics_with_ipv4_and_ipv6
+    {
+      :nic0 => given_a_valid_windows_nic_with_ipv4_and_ipv6,
+      :nic1 => stub('network1', :IPAddress => [ipAddress1, ipv6Address1], :SettingID => settingId1, :IPConnectionMetric => 10,:MACAddress => macAddress1,:IPSubnet => [subnet1, '48','2'])
+    }
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,10 +1,3 @@
-# Add the projects lib directory to our load path so we can require libraries
-# within it easily.
-dir = File.expand_path(File.dirname(__FILE__))
-
-SPECDIR = dir
-$LOAD_PATH.unshift("#{dir}/../lib")
-
 require 'rubygems'
 require 'mocha'
 require 'rspec'
@@ -13,10 +6,35 @@ require 'fileutils'
 require 'puppetlabs_spec_helper'
 require 'pathname'
 
+# load shared_context within this project's spec directory
+dir = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.join(dir, 'lib')
+
 Pathname.glob("#{dir}/shared_contexts/*.rb") do |file|
   require file.relative_path_from(Pathname.new(dir))
 end
 
+module LogSpecOrder
+  # Log the spec order to a file, but only if the LOG_SPEC_ORDER environment
+  # variable is set.  This could be enabled on Jenkins runs, as it can
+  # be used with Nick L.'s bisect script to help identify and debug
+  # order-dependent spec failures.
+  #
+  # jpartlow 2013-07-05: this was in puppet and I pulled it into facter because
+  # I was seeing similar ordering issues in the specs...and needed to bisect them :/
+  def self.log_spec_order
+    if ENV['LOG_SPEC_ORDER']
+      File.open("./spec_order.txt", "w") do |logfile|
+        RSpec.configuration.files_to_run.each { |f| logfile.puts f }
+      end
+    end
+  end
+end
+
+# Executing here rather than after :suite, so that we can get the order output
+# even when the issue breaks rspec when specs are first loaded.
+LogSpecOrder.log_spec_order
+
 RSpec.configure do |config|
   config.mock_with :mocha
 

data/spec/unit/architecture_spec.rb

@@ -22,6 +22,7 @@ describe "Architecture fact" do
     ["Gentoo","i686"] => "x86",
     ["Gentoo","pentium"] => "x86",
     ["windows","i386"] => "x86",
+    ["windows","i686"] => "x86",
     ["windows","x64"] => "x64",
   }
   generic_archs = Hash.new

data/spec/unit/domain_spec.rb

@@ -160,18 +160,49 @@ describe "Domain name facts" do
         Facter::Util::Registry.stubs(:hklm_read).returns('')
       end
 
-      it "should use the DNSDomain for the first nic where ip is enabled" do
-        nic = stubs 'nic'
-        nic.stubs(:DNSDomain).returns("foo.com")
+      def expects_dnsdomains(domains)
+        nics = []
 
-        nic2 = stubs 'nic'
-        nic2.stubs(:DNSDomain).returns("bar.com")
+        domains.each do |domain|
+          nic = stubs 'nic'
+          nic.stubs(:DNSDomain).returns(domain)
+          nics << nic
+        end
 
         require 'facter/util/wmi'
-        Facter::Util::WMI.stubs(:execquery).with("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").returns([nic, nic2])
+        Facter::Util::WMI.stubs(:execquery).with("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").returns(nics)
+      end
+
+      it "uses the first DNSDomain" do
+        expects_dnsdomains(['foo.com', 'bar.com'])
 
         Facter.fact(:domain).value.should == 'foo.com'
       end
+
+      it "uses the first non-nil DNSDomain" do
+        expects_dnsdomains([nil, 'bar.com'])
+
+        Facter.fact(:domain).value.should == 'bar.com'
+      end
+
+      it "uses the first non-empty DNSDomain" do
+        expects_dnsdomains(['', 'bar.com'])
+
+        Facter.fact(:domain).value.should == 'bar.com'
+      end
+
+      context "without any network adapters with a specified DNSDomain" do
+        let(:hostname_command) { 'hostname > NUL' }
+
+        it "should return nil" do
+          expects_dnsdomains([nil])
+
+          Facter::Util::Resolution.stubs(:exec).with(hostname_command).returns('sometest')
+          FileTest.stubs(:exists?).with("/etc/resolv.conf").returns(false)
+
+          Facter.fact(:domain).value.should be_nil
+        end
+      end
     end
   end
 

data/spec/unit/ec2_spec.rb

@@ -136,7 +136,7 @@ describe "ec2 facts" do
     end
 
     it "should return nil if open fails" do
-      Facter.expects(:warn).with('Could not retrieve ec2 metadata: host unreachable').twice
+      Facter.expects(:warn).with('Could not retrieve ec2 metadata: host unreachable')
       Facter::Util::Resolution.any_instance.stubs(:warn) # do not pollute test output
 
       Object.any_instance.expects(:open).

data/spec/unit/facter_spec.rb

@@ -102,13 +102,13 @@ describe Facter do
     end
   end
 
-  describe Facter[:hostname] do
+  describe "Facter[:hostname]" do
     it "should have its ldapname set to 'cn'" do
       Facter[:hostname].ldapname.should == "cn"
     end
   end
 
-  describe Facter[:ipaddress] do
+  describe "Facter[:ipaddress]" do
     it "should have its ldapname set to 'iphostnumber'" do
       Facter[:ipaddress].ldapname.should == "iphostnumber"
     end

data/spec/unit/hardwaremodel_spec.rb

@@ -17,6 +17,14 @@ describe "Hardwaremodel fact" do
       Facter.fact(:kernel).stubs(:value).returns("windows")
     end
 
+    it "should detect i486" do
+      cpu = mock('cpu', :Architecture => 0)
+      cpu.expects(:Level).returns(4).twice
+      Facter::Util::WMI.expects(:execquery).returns([cpu])
+
+      Facter.fact(:hardwaremodel).value.should == "i486"
+    end    
+
     it "should detect i686" do
       cpu = mock('cpu', :Architecture => 0, :Level => 6)
       Facter::Util::WMI.expects(:execquery).returns([cpu])
@@ -25,7 +33,7 @@ describe "Hardwaremodel fact" do
     end
 
     it "should detect x64" do
-      cpu = mock('cpu', :Architecture => 9, :AddressWidth => 64)
+      cpu = mock('cpu', :Architecture => 9, :AddressWidth => 64, :Level => 6)
       Facter::Util::WMI.expects(:execquery).returns([cpu])
 
       Facter.fact(:hardwaremodel).value.should == "x64"
@@ -37,5 +45,12 @@ describe "Hardwaremodel fact" do
 
       Facter.fact(:hardwaremodel).value.should == "i686"
     end
+
+    it "(#20989) should report i686 when a 32 bit OS is running on a 64 bit CPU and when level is greater than 6 (and not something like i1586)" do
+      cpu = mock('cpu', :Architecture => 9, :AddressWidth => 32, :Level => 15)
+      Facter::Util::WMI.expects(:execquery).returns([cpu])
+
+      Facter.fact(:hardwaremodel).value.should == "i686"
+    end
   end
 end

data/spec/unit/ipaddress6_spec.rb

@@ -7,12 +7,7 @@ def ifconfig_fixture(filename)
   File.read(fixtures('ifconfig', filename))
 end
 
-def netsh_fixture(filename)
-  File.read(fixtures('netsh', filename))
-end
-
-
-describe "IPv6 address fact" do
+describe "The IPv6 address fact" do
   include FacterSpec::ConfigHelper
 
   before do
@@ -55,14 +50,112 @@ 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')
-    given_a_configuration_of(:is_windows => true)
+  context "on Windows" do
+    require 'facter/util/wmi'
+    require 'facter/util/registry'
+    require 'facter/util/ip/windows'
+    require 'facter_spec/windows_network'
+
+    include FacterSpec::WindowsNetwork
+
+    before :each do
+      Facter.fact(:kernel).stubs(:value).returns(:windows)
+      Facter::Util::Registry.stubs(:hklm_read).returns(nic_bindings)
+      given_a_configuration_of(:is_windows => true)
+    end
+
+    it "should do what when VPN is turned on?"
+
+    context "when you have no active network adapter" do
+      it "should return nil if there are no active (or any) network adapters" do
+        Facter::Util::WMI.expects(:execquery).with(Facter::Util::IP::Windows::WMI_IP_INFO_QUERY).returns([])
+
+        Facter.value(:ipaddress6).should == nil
+      end
+    end
+
+    it "should return nil if the system doesn't have ipv6 installed", :if => Facter::Util::Config.is_windows? do
+      Facter::Util::Resolution.any_instance.expects(:warn).never
+      Facter::Util::Registry.stubs(:hklm_read).raises(Win32::Registry::Error, 2)
 
-    fixture = netsh_fixture('windows_netsh_addresses_with_multiple_interfaces')
-    Facter::Util::Resolution.stubs(:exec).with('d:/windows/system32/netsh.exe interface ipv6 show address level=verbose').
-      returns(fixture)
+      Facter.value(:ipaddress6).should == nil
+    end
+
+    context "when you have one network adapter" do
+      it "should return empty if ipv6 is not on" do
+        nic = given_a_valid_windows_nic_with_ipv4_and_ipv6
+        nic.expects(:IPAddress).returns([ipAddress1])
+        Facter::Util::WMI.expects(:execquery).returns([nic])
+
+        Facter.value(:ipaddress6).should == nil
+      end
+
+      it "should return the ipv6 address properly" do
+        Facter::Util::WMI.expects(:execquery).returns([given_a_valid_windows_nic_with_ipv4_and_ipv6])
+
+        Facter.value(:ipaddress6).should == ipv6Address0
+      end
+
+      it "should return the first ipv6 address if there is more than one (multi-homing)" do
+        nic = given_a_valid_windows_nic_with_ipv4_and_ipv6
+        nic.expects(:IPAddress).returns([ipAddress0, ipv6Address0,ipv6Address1])
+        Facter::Util::WMI.expects(:execquery).returns([nic])
 
-    Facter.value(:ipaddress6).should == "2001:0:4137:9e76:2087:77a:53ef:7527"
+        Facter.value(:ipaddress6).should == ipv6Address0
+      end
+
+      it "should return return nil if the ipv6 address is link local" do
+        nic = given_a_valid_windows_nic_with_ipv4_and_ipv6
+        nic.expects(:IPAddress).returns([ipAddress0, ipv6LinkLocal])
+        Facter::Util::WMI.expects(:execquery).returns([nic])
+
+        Facter.value(:ipaddress6).should == nil
+      end
+    end
+
+    context "when you have more than one network adapter" do
+      it "should return empty if ipv6 is not on" do
+        nics = given_two_valid_windows_nics_with_ipv4_and_ipv6
+        nics[:nic0].expects(:IPAddress).returns([ipAddress0])
+        nics[:nic1].expects(:IPAddress).returns([ipAddress1])
+        Facter::Util::WMI.expects(:execquery).returns(nics.values)
+
+        Facter.value(:ipaddress6).should == nil
+      end
+
+      it "should return the ipv6 of the adapter with the lowest IP connection metric (best connection)" do
+        nics = given_two_valid_windows_nics_with_ipv4_and_ipv6
+        nics[:nic1].expects(:IPConnectionMetric).returns(5)
+        Facter::Util::WMI.expects(:execquery).returns(nics.values)
+
+        Facter.value(:ipaddress6).should == ipv6Address1
+      end
+
+      it "should return the ipv6 of the adapter with the lowest IP connection metric (best connection) that has ipv6 enabled" do
+        nics = given_two_valid_windows_nics_with_ipv4_and_ipv6
+        nics[:nic1].expects(:IPConnectionMetric).returns(5)
+        nics[:nic1].expects(:IPAddress).returns([ipAddress1])
+        Facter::Util::WMI.expects(:execquery).returns(nics.values)
+
+        Facter.value(:ipaddress6).should == ipv6Address0
+      end
+
+      context "when the IP connection metric is the same" do
+        it "should return the ipv6 of the adapter with the lowest binding order" do
+          nics = given_two_valid_windows_nics_with_ipv4_and_ipv6
+          Facter::Util::WMI.expects(:execquery).returns(nics.values)
+
+          Facter.value(:ipaddress6).should == ipv6Address0
+        end
+
+        it "should return the ipv6 of the adapter with the lowest binding order even if the adapter is not first" do
+          nics = given_two_valid_windows_nics_with_ipv4_and_ipv6
+          Facter::Util::Registry.stubs(:hklm_read).returns(["\\Device\\#{settingId1}", "\\Device\\#{settingId0}" ])
+          Facter::Util::WMI.expects(:execquery).returns(nics.values)
+
+          Facter.value(:ipaddress6).should == ipv6Address1
+        end
+      end
+    end
   end
 end