ohai 0.6.8.rc.0 → 0.6.8.rc.1

data/lib/ohai/plugins/linux/virtualization.rb

@@ -24,21 +24,24 @@ virtualization Mash.new
 # virtualization[:mechanism]
 
 ## Xen
-# This file should exists on most Xen systems
-if File.exists?("/proc/xen/capabilities")
-  virtualization[:system] = "xen"
-  if File.read("/proc/xen/capabilities") =~ /control_d/i
-    virtualization[:role] = "host"
-  else
-    virtualization[:role] = "guest"
-  end
-# Guests do not always have this file, but may
-elsif File.exists?("/proc/sys/xen/independent_wallclock")
+# Empty dir for EL6 guests
+if File.exists?("/proc/xen")
   virtualization[:system] = "xen"
+  # Assume guest
   virtualization[:role] = "guest"
+
+  # This file should exist on most Xen systems, normally empty for guests
+  if File.exists?("/proc/xen/capabilities")
+    if File.read("/proc/xen/capabilities") =~ /control_d/i
+      virtualization[:role] = "host"
+    end
+  end
 end
-# cpuid of guests, if we could get it, would also be a clue
-# may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
+
+# Xen Notes:
+# - cpuid of guests, if we could get it, would also be a clue
+# - may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
+# - EL6 guests carry a 'hypervisor' cpu flag
 
 # Detect from kernel module
 if File.exists?("/proc/modules")

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '0.6.8.rc.0'
+  VERSION = '0.6.8.rc.1'
 end
 

data/spec/ohai/plugins/linux/virtualization_spec.rb

@@ -26,8 +26,8 @@ describe Ohai::System, "Linux virtualization platform" do
     @ohai.extend(SimpleFromFile)
 
     # default to all requested Files not existing
+    File.stub!(:exists?).with("/proc/xen").and_return(false)
     File.stub!(:exists?).with("/proc/xen/capabilities").and_return(false)
-    File.stub!(:exists?).with("/proc/sys/xen/independent_wallclock").and_return(false)
     File.stub!(:exists?).with("/proc/modules").and_return(false)
     File.stub!(:exists?).with("/proc/cpuinfo").and_return(false)
     File.stub!(:exists?).with("/usr/sbin/dmidecode").and_return(false)
@@ -36,7 +36,16 @@ describe Ohai::System, "Linux virtualization platform" do
   end
 
   describe "when we are checking for xen" do
+    it "should set xen guest if /proc/xen exists but /proc/xen/capabilities does not" do
+      File.should_receive(:exists?).with("/proc/xen").and_return(true)
+      File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(false)
+      @ohai._require_plugin("linux::virtualization")
+      @ohai[:virtualization][:system].should == "xen"
+      @ohai[:virtualization][:role].should == "guest"
+    end
+
     it "should set xen host if /proc/xen/capabilities contains control_d " do
+      File.should_receive(:exists?).with("/proc/xen").and_return(true)
       File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
       File.stub!(:read).with("/proc/xen/capabilities").and_return("control_d")
       @ohai._require_plugin("linux::virtualization")
@@ -45,6 +54,7 @@ describe Ohai::System, "Linux virtualization platform" do
     end
 
     it "should set xen guest if /proc/xen/capabilities exists but is empty" do
+      File.should_receive(:exists?).with("/proc/xen").and_return(true)
       File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
       File.stub!(:read).with("/proc/xen/capabilities").and_return("")
       @ohai._require_plugin("linux::virtualization")
@@ -52,13 +62,6 @@ describe Ohai::System, "Linux virtualization platform" do
       @ohai[:virtualization][:role].should == "guest"
     end
 
-    it "should set xen guest if /proc/sys/xen/independent_wallclock exists" do
-      File.should_receive(:exists?).with("/proc/sys/xen/independent_wallclock").and_return(true)
-      @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "xen"
-      @ohai[:virtualization][:role].should == "guest"
-    end
-
     it "should not set virtualization if xen isn't there" do
       File.should_receive(:exists?).at_least(:once).and_return(false)
       @ohai._require_plugin("linux::virtualization")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 15424053
+  hash: 15424055
   prerelease: 6
   segments: 
   - 0
   - 6
   - 8
   - rc
-  - 0
-  version: 0.6.8.rc.0
+  - 1
+  version: 0.6.8.rc.1
 platform: ruby
 authors: 
 - Adam Jacob