ohai 8.8.1 → 8.9.0

data/spec/unit/plugins/java_spec.rb

@@ -1,15 +1,15 @@
 #
-# Author:: Benjamin Black (<bb@opscode.com>)
-# Author:: Theodore Nordsieck (<theo@opscode.com>)
-# Copyright:: Copyright (c) 2009-2013 Opscode, Inc.
+# Author:: Benjamin Black (<bb@chef.io>)
+# Author:: Theodore Nordsieck (<theo@chef.io>)
+# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/plugins/kernel_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,12 +28,14 @@ describe Ohai::System, "plugin kernel" do
     allow(@plugin).to receive(:shell_out).with("uname -v").and_return(mock_shell_out(0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""))
     allow(@plugin).to receive(:shell_out).with("uname -m").and_return(mock_shell_out(0, "i386\n", ""))
     allow(@plugin).to receive(:shell_out).with("uname -o").and_return(mock_shell_out(0, "Linux\n", ""))
+    allow(@plugin).to receive(:shell_out).with("uname -p").and_return(mock_shell_out(0, "i386\n", ""))
   end
 
   it_should_check_from_mash("kernel", "name", "uname -s", [0, "Darwin\n", ""])
   it_should_check_from_mash("kernel", "release", "uname -r", [0, "9.5.0\n", ""])
   it_should_check_from_mash("kernel", "version", "uname -v", [0, "Darwin Kernel Version 9.5.0: Wed Sep  3 11:29:43 PDT 2008; root:xnu-1228.7.58~1\/RELEASE_I386\n", ""])
   it_should_check_from_mash("kernel", "machine", "uname -m", [0, "i386\n", ""])
+  it_should_check_from_mash("kernel", "processor", "uname -p", [0, "i386\n", ""])
 
   describe "when running on windows", :windows_only do
     before do

data/spec/unit/plugins/linux/block_device_spec.rb

@@ -0,0 +1,75 @@
+#
+#  Author:: Jennifer Marie Howard-Brown <jm.howardbrown@gmail.com>
+#  License:: Apache License, Version 2.0
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+
+describe Ohai::System, 'Linux Block Device Plugin' do
+  DISKS = {
+    'sda' => {
+      'size' => '7814037168',
+      'removable' => '0',
+      'model' => 'WDC WD4000F9YZ-0',
+      'rev' => '1A01',
+      'state' => 'running',
+      'timeout' => '30',
+      'queue_depth' => '1',
+      'vendor' => 'ATA'
+    },
+    'dm-0' => {
+      'size' => '7806976',
+      'removable' => '0'
+    }
+  }
+
+  def file_double(value)
+    tmp_double = double
+    expect(tmp_double).to receive(:read_nonblock).and_return(value)
+    tmp_double
+  end
+
+  before(:each) do
+    @plugin = get_plugin('linux/block_device')
+    allow(@plugin).to receive(:collect_os).and_return(:linux)
+
+    allow(File).to receive(:exists?).with('/sys/block').and_return(true)
+    allow(Dir).to receive(:[]).with('/sys/block/*') do
+      DISKS.collect { |disk, _files| "/sys/block/#{disk}" }
+    end
+
+    DISKS.each do |disk, checks|
+      checks.each do |check, value|
+        allow(File).to receive(:open).with(Regexp.new("#{disk}.*#{check}")).and_yield(file_double(value))
+      end
+
+      allow(File).to receive(:exists?).with(Regexp.new(disk)) do |arg|
+        filepath = arg.split('/')
+        checks[filepath.last].nil? ? false : true
+      end
+
+      allow(File).to receive(:basename) do |arg|
+        arg.split('/').last
+      end
+    end
+  end
+
+  it 'should collect all relevant data from disks' do
+    @plugin.run
+    DISKS.each do |disk, checks|
+      expect(@plugin[:block_device][disk.to_sym]).to include(checks)
+    end
+  end
+end

data/spec/unit/plugins/linux/cpu_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008-2015 Chef Software, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/linux/filesystem2_spec.rb

@@ -1,14 +1,14 @@
 #
 # Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -68,7 +68,7 @@ tmpfs                  2030944      2960   2027984       1% /dev/shm
 /dev/md0                960492     36388    875312       4% /boot
 DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @stdout, ""))
-      
+
       @inode_stdout = <<-DFi
 Filesystem      Inodes  IUsed   IFree IUse% Mounted on
 /dev/xvda1     1310720 107407 1203313    9% /
@@ -110,17 +110,17 @@ DFi
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special")
     end
-    
+
     it "should set total_inodes to value from df -iP" do
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:total_inodes]).to eq("124865")
     end
-    
+
     it "should set inodes_used to value from df -iP" do
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:inodes_used]).to eq("380")
     end
-    
+
     it "should set inodes_available to value from df -iP" do
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:inodes_available]).to eq("124485")
@@ -188,7 +188,7 @@ tmpfs                  2030944      2960   2027984       1% /dev/shm
 /dev/md0                960492     36388    875312       4% /boot
 DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
-      
+
       @inode_stdout = <<-DFi
 Filesystem      Inodes  IUsed   IFree IUse% Mounted on
 /dev/xvda1     1310720 107407 1203313    9% /
@@ -205,7 +205,7 @@ DFi
 /dev/sda1: LABEL=\"fuego:0\" UUID=\"bd1197e0-6997-1f3a-e27e-7801388308b5\" TYPE=\"linux_raid_member\"
 /dev/sda2: LABEL=\"fuego:1\" UUID=\"e36d933e-e5b9-cfe5-6845-1f84d0f7fbfa\" TYPE=\"linux_raid_member\"
 /dev/md0: LABEL=\"/boot\" UUID=\"37b8de8e-0fe3-4b5a-b9b4-dde33e19bb32\" TYPE=\"ext3\"
-/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" TYPE=\"LVM2_member\" 
+/dev/md1: UUID=\"YsIe0R-fj1y-LXTd-imla-opKo-OuIe-TBoxSK\" TYPE=\"LVM2_member\"
 /dev/mapper/sys.vg-root.lv: LABEL=\"/\" UUID=\"7742d14b-80a3-4e97-9a32-478be9ea9aea\" TYPE=\"ext4\"
 /dev/mapper/sys.vg-swap.lv: UUID=\"9bc2e515-8ddc-41c3-9f63-4eaebde9ce96\"  TYPE=\"swap\"
 /dev/mapper/sys.vg-tmp.lv: LABEL=\"/tmp\" UUID=\"74cf7eb9-428f-479e-9a4a-9943401e81e5\" TYPE=\"ext4\"
@@ -244,7 +244,7 @@ tmpfs                  2030944      2960   2027984       1% /dev/shm
 /dev/md0                960492     36388    875312       4% /boot
 DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
-      
+
       @inode_stdout = <<-DFi
 Filesystem      Inodes  IUsed   IFree IUse% Mounted on
 /dev/xvda1     1310720 107407 1203313    9% /
@@ -330,12 +330,12 @@ MOUNTS
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount]).to eq("/special")
     end
-  
+
     it "should set fs_type to value from /proc/mounts" do
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:fs_type]).to eq("xfs")
     end
-  
+
     it "should set mount_options to an array of values from /proc/mounts" do
       plugin.run
       expect(plugin[:filesystem2]["by_pair"]["/dev/mapper/sys.vg-special.lv,/special"][:mount_options]).to eq([ "ro", "noatime", "attr2", "noquota" ])
@@ -360,7 +360,7 @@ tmpfs                  2030944      2960   2027984       1% /dev/shm
 /dev/mapper/sys.vg-root.lv  4805760    378716   4182924       9% /var/chroot
 DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
-      
+
       @inode_stdout = <<-DFi
 Filesystem      Inodes  IUsed   IFree IUse% Mounted on
 /dev/mapper/sys.vg-root.lv     1310720 107407 1203313    9% /
@@ -404,7 +404,7 @@ tmpfs                  2030944      2960   2027984       1% /dev/shm
 /dev/sdc1              4805760    378716   4182924       9% /mnt
 DF
       allow(plugin).to receive(:shell_out).with("df -P").and_return(mock_shell_out(0, @dfstdout, ""))
-      
+
       @inode_stdout = <<-DFi
 Filesystem      Inodes  IUsed   IFree IUse% Mounted on
 /dev/mapper/sys.vg-root.lv     1310720 107407 1203313    9% /

data/spec/unit/plugins/linux/filesystem_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matthew Kent (<mkent@magoazul.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/linux/hostname_spec.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/plugins/linux/kernel_spec.rb

@@ -1,15 +1,15 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Theodore Nordsieck (<theo@opscode.com>)
-# Copyright:: Copyright (c) 2008-2013 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Theodore Nordsieck (<theo@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/spec/unit/plugins/linux/lsb_spec.rb

@@ -1,14 +1,14 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@ describe Ohai::System, "Linux lsb plugin" do
         and_yield("DISTRIB_RELEASE=8.04").
         and_yield("DISTRIB_CODENAME=hardy").
         and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
-      allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file) 
+      allow(File).to receive(:open).with("/etc/lsb-release").and_return(@double_file)
       allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(true)
     end
 
@@ -43,17 +43,17 @@ describe Ohai::System, "Linux lsb plugin" do
       @plugin.run
       expect(@plugin[:lsb][:id]).to eq("Ubuntu")
     end
-  
+
     it "should set lsb[:release]" do
       @plugin.run
       expect(@plugin[:lsb][:release]).to eq("8.04")
     end
-  
+
     it "should set lsb[:codename]" do
       @plugin.run
       expect(@plugin[:lsb][:codename]).to eq("hardy")
     end
-  
+
     it "should set lsb[:description]" do
       @plugin.run
       expect(@plugin[:lsb][:description]).to eq("Ubuntu 8.04")
@@ -64,7 +64,7 @@ describe Ohai::System, "Linux lsb plugin" do
     before(:each) do
       allow(File).to receive(:exists?).with("/etc/lsb-release").and_return(false)
       allow(File).to receive(:exists?).with("/usr/bin/lsb_release").and_return(true)
-  
+
       @stdin = double("STDIN", { :close => true })
       @pid = 10
       @stderr = double("STDERR")
@@ -72,7 +72,7 @@ describe Ohai::System, "Linux lsb plugin" do
       @status = 0
 
     end
-    
+
     describe "on Centos 5.4 correctly" do
       before(:each) do
         @stdout = <<-LSB_RELEASE
@@ -89,17 +89,17 @@ LSB_RELEASE
         @plugin.run
         expect(@plugin[:lsb][:id]).to eq("CentOS")
       end
-    
+
       it "should set lsb[:release]" do
         @plugin.run
         expect(@plugin[:lsb][:release]).to eq("5.4")
       end
-    
+
       it "should set lsb[:codename]" do
         @plugin.run
         expect(@plugin[:lsb][:codename]).to eq("Final")
       end
-    
+
       it "should set lsb[:description]" do
         @plugin.run
         expect(@plugin[:lsb][:description]).to eq("CentOS release 5.4 (Final)")
@@ -117,22 +117,22 @@ Codename:       Laughlin
 LSB_RELEASE
         allow(@plugin).to receive(:shell_out).with("lsb_release -a").and_return(mock_shell_out(0, @stdout, ""))
       end
-  
+
       it "should set lsb[:id]" do
         @plugin.run
         expect(@plugin[:lsb][:id]).to eq("Fedora")
       end
-    
+
       it "should set lsb[:release]" do
         @plugin.run
         expect(@plugin[:lsb][:release]).to eq("14")
       end
-    
+
       it "should set lsb[:codename]" do
         @plugin.run
         expect(@plugin[:lsb][:codename]).to eq("Laughlin")
       end
-    
+
       it "should set lsb[:description]" do
         @plugin.run
         expect(@plugin[:lsb][:description]).to eq("Fedora release 14 (Laughlin)")

data/spec/unit/plugins/linux/network_spec.rb

@@ -1,7 +1,7 @@
 #
 #  Author:: Caleb Tennis <caleb.tennis@gmail.com>
 #  Author:: Chris Read <chris.read@gmail.com>
-#  Copyright:: Copyright (c) 2011 Opscode, Inc.
+#  Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 #  License:: Apache License, Version 2.0
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -298,6 +298,31 @@ fe80::21c:eff:fe12:3456 dev eth0.153 lladdr 00:1c:0e:30:28:00 router REACHABLE
 '
   }
 
+  let(:linux_ethtool) {
+'Settings for eth0:
+        Supported ports: [ FIBRE ]
+        Supported link modes:   1000baseT/Full
+                                10000baseT/Full
+        Supported pause frame use: No
+        Supports auto-negotiation: Yes
+        Advertised link modes:  1000baseT/Full
+                                10000baseT/Full
+        Advertised pause frame use: No
+        Advertised auto-negotiation: Yes
+        Speed: 10000Mb/s
+        Duplex: Full
+        Port: FIBRE
+        PHYAD: 0
+        Transceiver: external
+        Auto-negotiation: on
+        Supports Wake-on: d
+        Wake-on: d
+        Current message level: 0x00000007 (7)
+                               drv probe link
+        Link detected: yes
+'
+  }
+
   before(:each) do
     allow(plugin).to receive(:collect_os).and_return(:linux)
 
@@ -305,12 +330,13 @@ fe80::21c:eff:fe12:3456 dev eth0.153 lladdr 00:1c:0e:30:28:00 router REACHABLE
     allow(plugin).to receive(:shell_out).with("ip -d -s link").and_return(mock_shell_out(0, linux_ip_link_s_d, ""))
     allow(plugin).to receive(:shell_out).with("ip -f inet neigh show").and_return(mock_shell_out(0, linux_ip_neighbor_show, ""))
     allow(plugin).to receive(:shell_out).with("ip -f inet6 neigh show").and_return(mock_shell_out(0, linux_ip_inet6_neighbor_show, ""))
-    allow(plugin).to receive(:shell_out).with("ip -o -f inet route show").and_return(mock_shell_out(0, linux_ip_route, ""))
-    allow(plugin).to receive(:shell_out).with("ip -o -f inet6 route show").and_return(mock_shell_out(0, linux_ip_route_inet6, ""))
+    allow(plugin).to receive(:shell_out).with("ip -o -f inet route show table main").and_return(mock_shell_out(0, linux_ip_route, ""))
+    allow(plugin).to receive(:shell_out).with("ip -o -f inet6 route show table main").and_return(mock_shell_out(0, linux_ip_route_inet6, ""))
 
     allow(plugin).to receive(:shell_out).with("route -n").and_return(mock_shell_out(0, linux_route_n, ""))
     allow(plugin).to receive(:shell_out).with("ifconfig -a").and_return(mock_shell_out(0, linux_ifconfig, ""))
     allow(plugin).to receive(:shell_out).with("arp -an").and_return(mock_shell_out(0, linux_arp_an, ""))
+    allow(plugin).to receive(:shell_out).with(/ethtool/).and_return(mock_shell_out(0, linux_ethtool, ""))
   end
 
   describe "#iproute2_binary_available?" do
@@ -323,11 +349,23 @@ fe80::21c:eff:fe12:3456 dev eth0.153 lladdr 00:1c:0e:30:28:00 router REACHABLE
     end
   end
 
+  describe "#find_ethtool_binary" do
+    ["/sbin/ethtool", "/usr/sbin/ethtool"].each do |path|
+      it "accepts #{path}" do
+        allow(File).to receive(:exist?).and_return(false)
+        allow(File).to receive(:exist?).with(path).and_return(true)
+        expect(plugin.find_ethtool_binary).to end_with("/ethtool")
+      end
+    end
+  end
+
+
   ["ifconfig","iproute2"].each do |network_method|
 
     describe "gathering IP layer address info via #{network_method}" do
       before(:each) do
         allow(plugin).to receive(:iproute2_binary_available?).and_return( network_method == "iproute2" )
+        allow(plugin).to receive(:find_ethtool_binary).and_return( '/sbin/ethtool' )
         plugin.run
       end
 
@@ -340,6 +378,15 @@ fe80::21c:eff:fe12:3456 dev eth0.153 lladdr 00:1c:0e:30:28:00 router REACHABLE
         expect(plugin['network']['interfaces'].keys.sort).to eq(["eth0", "eth0.11", "eth0.151", "eth0.152", "eth0.153", "eth0:5", "eth3", "foo:veth0@eth0", "lo", "ovs-system",  "tun0", "venet0", "venet0:0", "xapi1"])
       end
 
+      it "detects the layer one details of an ethernet interface" do
+        expect(plugin['network']['interfaces']['eth0']['link_speed']).to eq(10000)
+        expect(plugin['network']['interfaces']['eth0']['duplex']).to eq('Full')
+        expect(plugin['network']['interfaces']['eth0']['port']).to eq('FIBRE')
+        expect(plugin['network']['interfaces']['eth0']['transceiver']).to eq('external')
+        expect(plugin['network']['interfaces']['eth0']['auto_negotiation']).to eq('on')
+        expect(plugin['network']['interfaces']['eth0']['mdi_x']).to be_nil
+      end
+
       it "detects the ipv4 addresses of the ethernet interface" do
         expect(plugin['network']['interfaces']['eth0']['addresses'].keys).to include('10.116.201.76')
         expect(plugin['network']['interfaces']['eth0']['addresses']['10.116.201.76']['netmask']).to eq('255.255.255.0')
@@ -547,6 +594,7 @@ Destination     Gateway         Genmask         Flags Metric Ref    Use Iface
     before(:each) do
       allow(File).to receive(:exist?).with("/sbin/ip").and_return(true) # iproute2 only
       allow(File).to receive(:exist?).with("/proc/net/if_inet6").and_return(true) # ipv6 is enabled
+      allow(File).to receive(:exist?).with("/sbin/ethtool").and_return(true) # ethtool is available
       plugin.run
     end
 
@@ -615,7 +663,14 @@ Destination     Gateway         Genmask         Flags Metric Ref    Use Iface
         expect(plugin['network']['interfaces']['eth0.11']['routes']).to include Mash.new( :destination => "default", :via => "1111:2222:3333:4444::1", :metric => "1024", :family => "inet6")
       end
 
-      describe "when there isn't a source field in route entries " do
+      describe "when there isn't a source field in route entries and no ipv6 default routes" do
+        let(:linux_ip_route_inet6) {
+'fe80::/64 dev eth0  proto kernel  metric 256
+fe80::/64 dev eth0.11  proto kernel  metric 256
+1111:2222:3333:4444::/64 dev eth0.11  metric 1024  expires 86023sec
+'
+        }
+
         before(:each) do
           plugin.run
         end
@@ -750,7 +805,7 @@ default via 1111:2222:3333:4444::ffff dev eth0.11  metric 1023 src 1111:2222:333
         end
       end
 
-      describe "when there's a source field in a local route entry " do
+      describe "when there's a source field in a local route entry but it isnt in the default route" do
         let(:linux_ip_route) {
 '10.116.201.0/24 dev eth0  proto kernel  src 10.116.201.76
 192.168.5.0/24 dev eth0  proto kernel  src 192.168.5.1
@@ -780,18 +835,34 @@ default via 1111:2222:3333:4444::1 dev eth0.11  metric 1024
           expect(plugin['ipaddress']).to eq("10.116.201.76")
         end
 
+        # without a source address on the default route we cannot pick the an ipv6 address from the interface
+        # In the future an RFC6724 compliant process should choose ip6address in the network plugin
+        it "does not set ip6address" do
+          plugin.run
+          expect(plugin['ip6address']).to eq(nil)
+        end
+
+        context "with only ipv6 routes" do
+          let(:linux_ip_route) { '' }
+
+          it "sets macaddress to the mac address of the ip6 default interface" do
+            expect(plugin['macaddress']).to eq("00:AA:BB:CC:DD:EE")
+          end
+        end
+
         describe "when about to set macaddress" do
           it "sets macaddress" do
             plugin.run
             expect(plugin['macaddress']).to eq("12:31:3D:02:BE:A2")
           end
 
-          describe "when then interface has the NOARP flag" do
+          context "when then ipv4 interface has the NOARP flag and no ipv6 routes exist" do
             let(:linux_ip_route) {
 '10.118.19.1 dev tun0 proto kernel  src 10.118.19.39
 default via 172.16.19.1 dev tun0
 '
             }
+            let(:linux_ip_route_inet6) { '' }
 
             it "completes the run" do
               expect(Ohai::Log).not_to receive(:debug).with(/Plugin linux::network threw exception/)
@@ -805,11 +876,6 @@ default via 172.16.19.1 dev tun0
             end
           end
         end
-
-        it "sets ip6address" do
-          plugin.run
-          expect(plugin['ip6address']).to eq("1111:2222:3333:4444::3")
-        end
       end
 
       describe "with a link level default route" do
@@ -902,6 +968,9 @@ fe80::/64 dev eth0.11  proto kernel  metric 256
     inet6 2001:44b8:4160:8f00:a00:27ff:fe13:eacd/64 scope global dynamic
        valid_lft 6128sec preferred_lft 2526sec
 '}
+        # We don't have the corresponding ipv6 data for these tests
+        let(:linux_ip_route_inet6) { '' }
+        let(:linux_ip_inet6_neighbor_show) { '' }
 
         before(:each) do
           allow(plugin).to receive(:is_openvz?).and_return true