Merge lp:~bigkevmcd/landscape-client/detect-vmware into lp:~landscape/landscape-client/trunk

[Kevin McDermott]

This is a trivial change to detect vmware...

[Kevin McDermott (bigkevmcd)]

I've confirmed this works as far back as Hardy...

[Alberto Donato (ack)]

+1!

[1]
+ virt_info = u"vmware"

In this case virt_info is unicode, in the others is a string.
It would be better to have the same type for all cases.

review: Approve

[Thomas Herve (therve)]

What Alberto says, plus you can't use "with" on hardy.

review: Approve

[lp:~bigkevmcd/landscape-client/detect-vmware]

335. By Kevin McDermott on 2011-06-20

Don't return a unicode string from get_vm_info

336. By Kevin McDermott on 2011-06-20

Drop use of Python2.5 incompatible 'with'

=== modified file 'landscape/lib/tests/test_vm_info.py'
--- landscape/lib/tests/test_vm_info.py	2011-06-11 00:23:00 +0000
+++ landscape/lib/tests/test_vm_info.py	2011-06-20 06:46:33 +0000
@@ -118,4 +118,15 @@
 
         cpuinfo_path = os.path.join(proc_path, "cpuinfo")
         self.makeFile(path=cpuinfo_path, content="foo")
-        self.assertEqual(u"", get_vm_info(root_path=root_path))
+        self.assertEqual("", get_vm_info(root_path=root_path))
+
+    def test_get_vm_info_with_vmware_sys_vendor(self):
+        """
+        L{get_vm_info} should return "vmware" when we detect the sys_vendor is
+        VMware Inc.
+        """
+        root_path = self.makeDir()
+        dmi_path = os.path.join(root_path, "sys", "class", "dmi", "id")
+        os.makedirs(dmi_path)
+        file(os.path.join(dmi_path, "sys_vendor"), "w+").write("VMware, Inc.")
+        self.assertEqual("vmware", get_vm_info(root_path=root_path))
 
=== modified file 'landscape/lib/vm_info.py'
--- landscape/lib/vm_info.py	2011-06-11 00:23:00 +0000
+++ landscape/lib/vm_info.py	2011-06-20 06:46:33 +0000
@@ -36,4 +36,11 @@
         finally:
             fd.close()
 
+    sys_vendor_path = os.path.join(root_path, "sys", "class", "dmi", "id",
+                                   "sys_vendor")
+    if os.path.exists(sys_vendor_path):
+        file_content = open(sys_vendor_path).read()
+        if "VMware, Inc." in file_content:
+            virt_info = "vmware"
+
     return virt_info