facter 2.2.0-universal-darwin → 2.3.0-universal-darwin

data/lib/facter/util/virtual.rb

@@ -29,7 +29,15 @@ module Facter::Util::Virtual
   ##
   # lspci is a delegating helper method intended to make it easier to stub the
   # system call without affecting other calls to Facter::Core::Execution.exec
-  def self.lspci(command = "lspci 2>/dev/null")
+  def self.lspci(command = nil)
+    if command.nil?
+      if ["FreeBSD", "OpenBSD"].include? Facter.value(:kernel)
+        command = "pciconf -lv 2>/dev/null"
+      else
+        command = "lspci 2>/dev/null"
+      end
+    end
+
     Facter::Core::Execution.exec command
   end
 
@@ -176,7 +184,10 @@ module Facter::Util::Virtual
   # @return [String] or nil if the path does not exist or is unreadable
   def self.read_sysfs_dmi_entries(path="/sys/firmware/dmi/entries/1-0/raw")
     if File.readable?(path)
-      Facter::Util::FileRead.read_binary(path)
+      begin
+        Facter::Util::FileRead.read_binary(path)
+      rescue Errno::EINVAL
+      end
     end
   end
 end

data/lib/facter/version.rb

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

data/lib/facter/virtual.rb

@@ -78,7 +78,7 @@ Facter.add("virtual") do
   setcode do
     next "zone" if Facter::Util::Virtual.zone?
 
-    output = Facter::Core::Execution.exec('prtdiag')
+    output = Facter::Core::Execution.exec('prtdiag 2>/dev/null')
     if output
       lines = output.split("\n")
       next "parallels"  if lines.any? {|l| l =~ /Parallels/ }
@@ -149,6 +149,7 @@ Facter.add("virtual") do
       next "xenhvm"     if lines.any? {|l| l =~ /XenSource/ }
       next "hyperv"     if lines.any? {|l| l =~ /Microsoft Corporation Hyper-V/ }
       next "gce"        if lines.any? {|l| l =~ /Class 8007: Google, Inc/ }
+      next "kvm"        if lines.any? {|l| l =~ /virtio/ }
     end
 
     # Parse dmidecode
@@ -162,6 +163,7 @@ Facter.add("virtual") do
       next "hyperv"     if lines.any? {|l| l =~ /Product Name: Virtual Machine/ }
       next "rhev"       if lines.any? {|l| l =~ /Product Name: RHEV Hypervisor/ }
       next "ovirt"      if lines.any? {|l| l =~ /Product Name: oVirt Node/ }
+      next "bochs"      if lines.any? {|l| l =~ /Bochs/ }
     end
 
     # Default to 'physical'
@@ -304,9 +306,9 @@ Facter.add("is_virtual") do
     physical_types = %w{physical xen0 vmware_server vmware_workstation openvzhn vserver_host}
 
     if physical_types.include? Facter.value(:virtual)
-      "false"
+      false
     else
-      "true"
+      true
     end
   end
 end

data/spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces_and_fe80

@@ -0,0 +1,19 @@
+eth0      Link encap:Ethernet  HWaddr 00:12:3f:be:22:01  
+          inet addr:131.252.209.153  Bcast:131.252.209.255  Mask:255.255.255.0
+          inet6 addr: 2610:10:20:209:212:3fff:fe80:2201/64 Scope:Global
+          inet6 addr: fe80::212:3fff:febe:2201/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:20793317 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:19583281 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:1723593481 (1.7 GB)  TX bytes:283377282 (283.3 MB)
+          Interrupt:16 
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:31809 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:31809 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:2075836 (2.0 MB)  TX bytes:2075836 (2.0 MB)

data/spec/fixtures/ifconfig/linux_ifconfig_all_with_multiple_interfaces_and_no_public_ipv6

@@ -0,0 +1,18 @@
+eth0      Link encap:Ethernet  HWaddr 00:12:3f:be:22:01  
+          inet addr:131.252.209.153  Bcast:131.252.209.255  Mask:255.255.255.0
+          inet6 addr: fe80::212:3fff:febe:2201/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:20793317 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:19583281 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000 
+          RX bytes:1723593481 (1.7 GB)  TX bytes:283377282 (283.3 MB)
+          Interrupt:16 
+
+lo        Link encap:Local Loopback  
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:16436  Metric:1
+          RX packets:31809 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:31809 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0 
+          RX bytes:2075836 (2.0 MB)  TX bytes:2075836 (2.0 MB)

data/spec/schema/validate_facter_schema.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'facter/util/config'
+
+if !Facter::Util::Config.is_windows?
+  require 'json'
+  require 'json-schema'
+
+  describe 'facter.json schema' do
+    it 'should be valid' do
+      # Read in both the json meta-schema and the facter schema
+      JSON_META_SCHEMA = JSON.parse(File.read('schema/json-meta-schema.json'))
+      FACTER_SCHEMA    = JSON.parse(File.read('schema/facter.json'))
+
+      # Validate that the facter schema itself is valid json
+      JSON::Validator.validate!(JSON_META_SCHEMA, FACTER_SCHEMA)
+    end
+  end
+end

data/spec/unit/ec2_spec.rb

@@ -15,14 +15,14 @@ describe "ec2_metadata" do
 
   subject { Facter.fact(:ec2_metadata).resolution(:rest) }
 
-  it "is unsuitable if the virtual fact is not xen" do
+  it "is unsuitable if the virtual fact is not xen,xenu or kvm" do
     querier.stubs(:reachable?).returns false
-    Facter.fact(:virtual).stubs(:value).returns "kvm"
+    Facter.fact(:virtual).stubs(:value).returns("Not kvm","Not xen","Not xenu")
     expect(subject).to_not be_suitable
   end
 
   it "is unsuitable if ec2 endpoint is not reachable" do
-    Facter.fact(:virtual).stubs(:value).returns "xen"
+    Facter.fact(:virtual).stubs(:value).returns("xen","kvm")
     querier.stubs(:reachable?).returns false
     expect(subject).to_not be_suitable
   end
@@ -39,6 +39,13 @@ describe "ec2_metadata" do
       expect(subject).to be_suitable
     end
 
+    it "is suitable if the virtual fact is kvm" do
+      Facter.fact(:virtual).stubs(:value).returns "kvm"
+      subject.suitable?
+
+      expect(subject).to be_suitable
+    end
+
     it "is suitable if the virtual fact is xenu" do
       Facter.fact(:virtual).stubs(:value).returns "xenu"
       expect(subject).to be_suitable
@@ -65,14 +72,14 @@ describe "ec2_userdata" do
 
   subject { Facter.fact(:ec2_userdata).resolution(:rest) }
 
-  it "is unsuitable if the virtual fact is not xen" do
+  it "is unsuitable if the virtual fact is not xen,xenu or kvm" do
     querier.stubs(:reachable?).returns(true)
-    Facter.fact(:virtual).stubs(:value).returns "kvm"
+    Facter.fact(:virtual).stubs(:value).returns("Not kvm","Not xen","Not xenu")
     expect(subject).to_not be_suitable
   end
 
   it "is unsuitable if ec2 endpoint is not reachable" do
-    Facter.fact(:virtual).stubs(:value).returns "xen"
+    Facter.fact(:virtual).stubs(:value).returns("xen","kvm")
     querier.stubs(:reachable?).returns false
     expect(subject).to_not be_suitable
   end
@@ -87,6 +94,11 @@ describe "ec2_userdata" do
       expect(subject).to be_suitable
     end
 
+    it "is suitable if the virtual fact is kvm" do
+      Facter.fact(:virtual).stubs(:value).returns "kvm"
+      expect(subject).to be_suitable
+    end
+
     it "is suitable if the virtual fact is xenu" do
       Facter.fact(:virtual).stubs(:value).returns "xenu"
       expect(subject).to be_suitable

data/spec/unit/gid_spec.rb

@@ -2,8 +2,9 @@ require 'spec_helper'
 
 describe "gid fact" do
 
-  describe "on systems with id" do
+  describe "on non-SunOS systems with id" do
     it "should return the current group" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
       Facter::Core::Execution.expects(:which).with('id').returns(true)
       Facter::Core::Execution.expects(:exec).once.with('id -ng').returns 'bar'
 
@@ -11,12 +12,31 @@ describe "gid fact" do
     end
   end
 
-  describe "on systems without id" do
+  describe "on non-SunOS systems without id" do
     it "is not supported" do
+      Facter.fact(:kernel).stubs(:value).returns("Linux")
       Facter::Core::Execution.expects(:which).with('id').returns(false)
 
       Facter.fact(:gid).value.should == nil
     end
   end
 
+  describe "on SunOS systems with /usr/xpg4/bin/id" do
+    it "should return the current group" do
+      Facter.fact(:kernel).stubs(:value).returns("SunOS")
+      File.expects(:exist?).with('/usr/xpg4/bin/id').returns true
+      Facter::Core::Execution.expects(:exec).with('/usr/xpg4/bin/id -ng').returns 'bar'
+
+      Facter.fact(:gid).value.should == 'bar'
+    end
+  end
+
+  describe "on SunOS systems without /usr/xpg4/bin/id" do
+    it "is not supported" do
+      Facter.fact(:kernel).stubs(:value).returns("SunOS")
+      File.expects(:exist?).with('/usr/xpg4/bin/id').returns false
+
+      Facter.fact(:gid).value.should == nil
+    end
+  end
 end

data/spec/unit/interfaces_spec.rb

@@ -50,8 +50,8 @@ describe "Netmask and MTU handling on Linux" do
 
   example_behavior_for "interface netmask and mtu from ifconfig output",
     "Archlinux (net-tools 1.60)", "em1",
-    "255.255.255.0", "1500", "ifconfig_net_tools_1.60.txt"
+    "255.255.255.0", 1500, "ifconfig_net_tools_1.60.txt"
   example_behavior_for "interface netmask and mtu from ifconfig output",
     "Archlinux (net-tools 1.60)", "lo",
-    "255.0.0.0", "16436", "ifconfig_net_tools_1.60.txt"
+    "255.0.0.0", 16436, "ifconfig_net_tools_1.60.txt"
 end

data/spec/unit/ipaddress6_spec.rb

@@ -33,13 +33,31 @@ describe "The IPv6 address fact" do
   end
 
   it "should return ipaddress6 information for Linux with recent net-tools" do
-      Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
-      Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
-      Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
-        returns(ifconfig_fixture('ifconfig_net_tools_1.60.txt'))
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
+    Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
+    Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
+      returns(ifconfig_fixture('ifconfig_net_tools_1.60.txt'))
 
-      Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
-    end
+    Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:febe:2201"
+  end
+
+  it "should return ipaddress6 with fe80 in any other octet than the first for Linux" do
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
+    Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
+    Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
+      returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces_and_fe80'))
+
+    Facter.value(:ipaddress6).should == "2610:10:20:209:212:3fff:fe80:2201"
+  end
+
+  it "should not return ipaddress6 link-local address for Linux" do
+    Facter::Core::Execution.stubs(:exec).with('uname -s').returns('Linux')
+    Facter::Util::IP.stubs(:get_ifconfig).returns("/sbin/ifconfig")
+    Facter::Util::IP.stubs(:exec_ifconfig).with(["2>/dev/null"]).
+      returns(ifconfig_fixture('linux_ifconfig_all_with_multiple_interfaces_and_no_public_ipv6'))
+
+    Facter.value(:ipaddress6).should be_false
+  end
 
   it "should return ipaddress6 information for Solaris" do
     Facter::Core::Execution.stubs(:exec).with('uname -s').returns('SunOS')

data/spec/unit/ldom_spec.rb

@@ -15,6 +15,7 @@ describe "ldom fact" do
     before :each do
       # For virtinfo documentation:
       # http://docs.oracle.com/cd/E23824_01/html/821-1462/virtinfo-1m.html
+      Facter.fact(:hardwareisa).stubs(:value).returns("sparc")
       Facter::Core::Execution.stubs(:which).with("virtinfo").returns 'virtinfo'
       Facter::Core::Execution.stubs(:exec).with("virtinfo -ap").
         returns(ldom_fixtures('ldom_v1'))
@@ -64,6 +65,7 @@ describe "ldom fact" do
 
   describe "when running on non ldom hardware" do
     before :each do
+      Facter.fact(:hardwareisa).stubs(:value).returns("sparc")
       Facter::Core::Execution.stubs(:which).with("virtinfo").returns(nil)
       Facter.collection.internal_loader.load(:ldom)
     end
@@ -72,4 +74,15 @@ describe "ldom fact" do
       Facter.fact(:ldom_domainrole_impl).should == nil
     end
   end
+
+  describe "when running on non-sparc hardware" do
+    before :each do
+      Facter.fact(:hardwareisa).stubs(:value).returns("i386")
+      Facter::Core::Execution.stubs(:which).with("virtinfo").returns 'virtinfo'
+    end
+
+    it "should not try to resolve the ldom facts" do
+      Facter.fact(:ldom_domainrole_impl).should == nil
+    end
+  end
 end

data/spec/unit/operatingsystem/linux_spec.rb

@@ -29,6 +29,7 @@ describe Facter::Operatingsystem::Linux do
 
     describe "When lsbdistid is not available" do
      {
+        "AristaEOS"   => "/etc/Eos-release",
         "Debian"      => "/etc/debian_version",
         "Gentoo"      => "/etc/gentoo-release",
         "Fedora"      => "/etc/fedora-release",
@@ -37,6 +38,7 @@ describe Facter::Operatingsystem::Linux do
         "Mandrake"    => "/etc/mandrake-release",
         "MeeGo"       => "/etc/meego-release",
         "Archlinux"   => "/etc/arch-release",
+        "Manjarolinux"=> "/etc/manjaro-release",
         "OracleLinux" => "/etc/oracle-release",
         "OpenWrt"     => "/etc/openwrt_release",
         "Alpine"      => "/etc/alpine-release",
@@ -152,6 +154,7 @@ describe Facter::Operatingsystem::Linux do
   describe "Osfamily fact" do
     {
       'Archlinux'    => 'Archlinux',
+      "Manjarolinux" => "Archlinux",
       'Ubuntu'       => 'Debian',
       'Debian'       => 'Debian',
       'LinuxMint'    => 'Debian',
@@ -191,6 +194,7 @@ describe Facter::Operatingsystem::Linux do
       'Slamd64',
       'Slackware',
       'Alpine',
+      'AristaEOS',
     ].each do |os|
       it "should return the kernel fact on operatingsystem #{os}" do
         Facter.expects(:value).with("kernel").returns "Linux"
@@ -210,17 +214,18 @@ describe Facter::Operatingsystem::Linux do
 
   describe "Operatingsystemrelease fact" do
     test_cases = {
-      "OpenWrt"    => "/etc/openwrt_version",
-      "CentOS"    => "/etc/redhat-release",
-      "RedHat"    => "/etc/redhat-release",
+      "AristaEOS"   => "/etc/Eos-release",
+      "OpenWrt"     => "/etc/openwrt_version",
+      "CentOS"      => "/etc/redhat-release",
+      "RedHat"      => "/etc/redhat-release",
       "LinuxMint"   => "/etc/linuxmint/info",
       "Scientific"  => "/etc/redhat-release",
-      "Fedora"    => "/etc/fedora-release",
-      "MeeGo"     => "/etc/meego-release",
-      "OEL"     => "/etc/enterprise-release",
-      "oel"     => "/etc/enterprise-release",
-      "OVS"     => "/etc/ovs-release",
-      "ovs"     => "/etc/ovs-release",
+      "Fedora"      => "/etc/fedora-release",
+      "MeeGo"       => "/etc/meego-release",
+      "OEL"         => "/etc/enterprise-release",
+      "oel"         => "/etc/enterprise-release",
+      "OVS"         => "/etc/ovs-release",
+      "ovs"         => "/etc/ovs-release",
       "OracleLinux" => "/etc/oracle-release",
       "Ascendos"    => "/etc/redhat-release",
     }
@@ -258,6 +263,13 @@ describe Facter::Operatingsystem::Linux do
       expect(release).to eq "foo"
     end
 
+    it "should use the contents of /etc/Eos-release in AristaEOS" do
+      subject.expects(:get_operatingsystem).returns("AristaEOS")
+      File.expects(:read).with("/etc/Eos-release").returns("Arista Networks EOS 4.13.7M")
+      release = subject.get_operatingsystemrelease
+      expect(release).to eq "4.13.7M"
+    end
+
     it "should fall back to parsing /etc/system-release if lsb facts are not available in Amazon" do
       subject.expects(:get_operatingsystem).returns("Amazon")
       subject.expects(:get_lsbdistrelease).returns(nil)
@@ -286,7 +298,7 @@ describe Facter::Operatingsystem::Linux do
   end
 
   describe "Operatingsystemmajrelease key" do
-    ['Amazon','CentOS','CloudLinux','Debian','Fedora','OEL','OracleLinux','OVS','RedHat','Scientific','SLC','CumulusLinux'].each do |operatingsystem|
+    ['Amazon' 'AristaEOS', 'CentOS','CloudLinux','Debian','Fedora','OEL','OracleLinux','OVS','RedHat','Scientific','SLC','CumulusLinux'].each do |operatingsystem|
       describe "on #{operatingsystem} operatingsystems" do
         it "should be derived from operatingsystemrelease" do
           subject.stubs(:get_operatingsystem).returns(operatingsystem)

data/spec/unit/operatingsystem/sunos_spec.rb

@@ -125,19 +125,19 @@ describe Facter::Operatingsystem::SunOS do
 
     it "should correctly derive from operatingsystemrelease on solaris 10" do
       subject.expects(:get_operatingsystemrelease).returns("10_u8")
-      release = subject.get_operatingsystemmajrelease
+      release = subject.get_operatingsystemmajorrelease
       expect(release).to eq "10"
     end
 
     it "should correctly derive from operatingsystemrelease on solaris 11 (old version scheme)" do
       subject.expects(:get_operatingsystemrelease).returns("11 11/11")
-      release = subject.get_operatingsystemmajrelease
+      release = subject.get_operatingsystemmajorrelease
       expect(release).to eq "11"
     end
 
     it "should correctly derive from operatingsystemrelease on solaris 11 (new version scheme)" do
       subject.expects(:get_operatingsystemrelease).returns("11.1")
-      release = subject.get_operatingsystemmajrelease
+      release = subject.get_operatingsystemmajorrelease
       expect(release).to eq "11"
     end
   end

data/spec/unit/operatingsystem/windows_spec.rb

@@ -21,6 +21,10 @@ describe Facter::Operatingsystem::Windows do
       ['6.2.9200', 1] => "8",
       ['6.2.9200', 2] => "2012",
       ['6.2.9200', 3] => "2012",
+      ['6.3.9600', 1] => "8.1",
+      ['6.3.9600', 2] => "2012 R2",
+      ['6.3.9600', 3] => "2012 R2",
+      ['6.4.9841', 1] => "10",     # Kernel version for Windows 10 preview. Subject to change.
     }.each do |os_values, expected_output|
       it "should be #{expected_output}  with Version #{os_values[0]}  and ProductType #{os_values[1]}" do
         os = mock('os', :version => os_values[0], :producttype => os_values[1])
@@ -30,6 +34,23 @@ describe Facter::Operatingsystem::Windows do
       end
     end
 
+    {
+      # Note: this is the kernel version for the Windows 10 technical preview,
+      # which is subject to change. These tests cover any future Windows server
+      # releases with a kernel version of 6.4.x, none of which have been released
+      # as of October 2014.
+      ['6.4.9841', 2] => "6.4.9841",
+      ['6.4.9841', 3] => "6.4.9841",
+    }.each do |os_values, expected_output|
+      it "should be the kernel release for unknown future server releases" do
+        Facter.fact(:kernelrelease).stubs(:value).returns("6.4.9841")
+        os = mock('os', :version => os_values[0], :producttype => os_values[1])
+        Facter::Util::WMI.expects(:execquery).returns([os])
+        release = subject.get_operatingsystemrelease
+        expect(release).to eq expected_output
+      end
+    end
+
     {
       ['5.2.3790', 2, ""]   => "2003",
       ['5.2.3790', 2, "R2"] => "2003 R2",