Merge lp:~therve/landscape-client/hyper-v-detection into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The detection is not awesome. It came after some investigation on an Azure guest. The only other thing we can do is using the VGA card, but it implies either calling an external tool or hardcode the PCI ids. I think it does the trick for now.

[lp:~therve/landscape-client/hyper-v-detection]

594. By Thomas Herve on 2012-12-06

Don't use with

[Geoff Teale (tealeg)]

+1 I was trying to think of another case where we could get a false positive on the VGA card vendor, but I can't think of one.

review: Approve

[Alberto Donato (ack)]

Looks good, +1!

review: Approve

=== modified file 'landscape/lib/tests/test_vm_info.py'
--- landscape/lib/tests/test_vm_info.py	2012-01-30 09:50:52 +0000
+++ landscape/lib/tests/test_vm_info.py	2012-12-06 10:20:28 +0000
@@ -135,7 +135,9 @@
         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.")
+        fd = file(os.path.join(dmi_path, "sys_vendor"), "w")
+        fd.write("VMware, Inc.")
+        fd.close()
         self.assertEqual("vmware", get_vm_info(root_path=root_path))
 
     def test_get_vm_info_is_empty_without_xen_devices(self):
@@ -157,3 +159,15 @@
         self.makeDir(path=devices_xen_path)
 
         self.assertEqual("", get_vm_info(root_path=root_path))
+
+    def test_get_vm_info_with_microsoft_sys_vendor(self):
+        """
+        L{get_vm_info} returns "hyperv" if the sys_vendor is Microsoft.
+        """
+        root_path = self.makeDir()
+        dmi_path = os.path.join(root_path, "sys", "class", "dmi", "id")
+        os.makedirs(dmi_path)
+        fd = file(os.path.join(dmi_path, "sys_vendor"), "w")
+        fd.write("Microsoft Corporation")
+        fd.close()
+        self.assertEqual("hyperv", get_vm_info(root_path=root_path))

=== modified file 'landscape/lib/vm_info.py'
--- landscape/lib/vm_info.py	2012-01-30 09:27:09 +0000
+++ landscape/lib/vm_info.py	2012-12-06 10:20:28 +0000
@@ -48,6 +48,8 @@
             file_content = fd.read()
             if "VMware, Inc." in file_content:
                 return "vmware"
+            elif "Microsoft Corporation" in file_content:
+                return "hyperv"
         finally:
             fd.close()