From 43e203c688399ac86d337514aecb6fa0c9def683 Mon Sep 17 00:00:00 2001
From: Stefan Schulte <stefan.schulte@taunusstein.net>
Date: Wed, 3 Nov 2010 21:55:58 +0100
Subject: (#5040) fact virtual should detect hpvm

With HP-UX you can build virtual machines that are often refered to as
HP-VMs.

This patch detecs HP-VMs by introducing a new function hpvm? that will
check the output of /usr/bin/getconf MACHINE_MODEL. This should not
depend on any tools that might be not installed.

If inside a HP-VM the command will say something like
ia64 hp server Integrity Virtual Machine

while on real hardware the output could be
ia64 hp server rx660

so searching for "Virtual Machine" should work.

Currently it only works if the guest is also running HP-UX.
(I guess this is the most common usecase).
---
 lib/facter/util/virtual.rb |  4 ++++
 lib/facter/virtual.rb      | 10 +++++++---
 spec/unit/util/virtual.rb  | 11 +++++++++++
 spec/unit/virtual.rb       | 11 +++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb
index 5f70d42..5a03117 100644
--- a/lib/facter/util/virtual.rb
+++ b/lib/facter/util/virtual.rb
@@ -62,4 +62,8 @@ module Facter::Util::Virtual
         Facter::Util::Resolution.exec("/sbin/sysctl -n security.jail.jailed") == "1"
     end
 
+    def self.hpvm?
+        Facter::Util::Resolution.exec("/usr/bin/getconf MACHINE_MODEL").chomp =~ /Virtual Machine/
+    end
+
 end
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index c14a715..faefb29 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -1,7 +1,7 @@
 require 'facter/util/virtual'
 
 Facter.add("virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX}
 
     result = "physical"
 
@@ -9,6 +9,10 @@ Facter.add("virtual") do
 
         result = "zone" if Facter::Util::Virtual.zone?
 
+        if Facter.value(:kernel)=="HP-UX"
+            result = "hpvm" if Facter::Util::Virtual.hpvm?
+        end
+
         if Facter::Util::Virtual.openvz?
             result = Facter::Util::Virtual.openvz_type()
         end
@@ -76,11 +80,11 @@ Facter.add("virtual") do
 end
   
 Facter.add("is_virtual") do
-    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS}
+    confine :kernel => %w{Linux FreeBSD OpenBSD SunOS HP-UX}
 
     setcode do
         case Facter.value(:virtual)
-        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail"
+        when "xenu", "openvzve", "vmware", "kvm", "vserver", "jail", "zone", "hpvm"
             true
         else 
             false
diff --git a/spec/unit/util/virtual.rb b/spec/unit/util/virtual.rb
index 1e31a2f..57ef440 100644
--- a/spec/unit/util/virtual.rb
+++ b/spec/unit/util/virtual.rb
@@ -116,4 +116,15 @@ describe Facter::Util::Virtual do
         Facter::Util::Virtual.should_not be_jail
     end
 
+    it "should detect hpvm on HP-UX" do
+        Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+        Facter::Util::Resolution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server Integrity Virtual Machine')
+        Facter::Util::Virtual.should be_hpvm
+    end
+
+    it "should not detect hpvm on HP-UX when not in hpvm" do
+        Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+        Facter::Util::Resolution.stubs(:exec).with("/usr/bin/getconf MACHINE_MODEL").returns('ia64 hp server rx660')
+        Facter::Util::Virtual.should_not be_hpvm
+    end
 end
diff --git a/spec/unit/virtual.rb b/spec/unit/virtual.rb
index 8ee843b..ee673be 100644
--- a/spec/unit/virtual.rb
+++ b/spec/unit/virtual.rb
@@ -24,6 +24,11 @@ describe "Virtual fact" do
       Facter.fact(:virtual).value.should == "jail"
   end
 
+  it "should be hpvm on HP-UX when in HP-VM" do
+     Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+     Facter::Util::Virtual.stubs(:hpvm?).returns(true)
+     Facter.fact(:virtual).value.should == "hpvm"
+  end
 end
 
 describe "is_virtual fact" do
@@ -68,4 +73,10 @@ describe "is_virtual fact" do
         Facter.fact(:is_virtual).value.should == true
     end
 
+    it "should be true when running on hp-vm" do
+        Facter.fact(:kernel).stubs(:value).returns("HP-UX")
+        Facter.fact(:virtual).stubs(:value).returns("hpvm")
+        Facter.fact(:is_virtual).value.should == true
+    end
+
 end
-- 
cgit