Merge lp:~ack/landscape-client/fix-xen-dom0-container-info into lp:~landscape/landscape-client/trunk

[Alberto Donato]

Fix VM detection for Xen, by returning "xen" only for paravirtualized and HVM hosts, not for dom0.

Fix VM detection for Xen, by returning "xen" only for paravirtualized and HVM hosts, not for dom0.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Fail
Revno: 922
Branch: lp:~ack/landscape-client/fix-xen-dom0-container-info
Jenkins: https://ci.lscape.net/job/latch-test-precise/115/

review: Needs Fixing (test results)

[lp:~ack/landscape-client/fix-xen-dom0-container-info]

923. By Alberto Donato on 2016-09-23

Fix comment.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 923
Branch: lp:~ack/landscape-client/fix-xen-dom0-container-info
Jenkins: https://ci.lscape.net/job/latch-test-precise/116/

review: Approve (test results)

[Geoff Teale (tealeg)]

+1

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 923
Branch: lp:~ack/landscape-client/fix-xen-dom0-container-info
Jenkins: https://ci.lscape.net/job/latch-test-precise/119/

review: Approve (test results)

[Данило Шеган (danilo)]

review: Approve

=== modified file 'landscape/lib/tests/test_vm_info.py'
--- landscape/lib/tests/test_vm_info.py	2015-05-07 07:31:09 +0000
+++ landscape/lib/tests/test_vm_info.py	2016-09-23 15:44:33 +0000
@@ -36,15 +36,6 @@
 
         self.assertEqual("openvz", get_vm_info(root_path=self.root_path))
 
-    def test_get_vm_info_is_xen_when_proc_sys_xen_exists(self):
-        """
-        L{get_vm_info} should return 'xen' when /proc/sys/xen exists.
-        """
-        proc_sys_xen_path = os.path.join(self.proc_sys_path, "xen")
-        self.makeFile(path=proc_sys_xen_path, content="foo")
-
-        self.assertEqual("xen", get_vm_info(root_path=self.root_path))
-
     def test_get_vm_info_is_xen_when_sys_bus_xen_is_non_empty(self):
         """
         L{get_vm_info} should return 'xen' when /sys/bus/xen exists and has
@@ -57,15 +48,6 @@
 
         self.assertEqual("xen", get_vm_info(root_path=self.root_path))
 
-    def test_get_vm_info_is_xen_when_proc_xen_exists(self):
-        """
-        L{get_vm_info} should return 'xen' when /proc/xen exists.
-        """
-        proc_xen_path = os.path.join(self.proc_path, "xen")
-        self.makeFile(path=proc_xen_path, content="foo")
-
-        self.assertEqual("xen", get_vm_info(root_path=self.root_path))
-
     def test_get_vm_info_is_empty_without_xen_devices(self):
         """
         L{get_vm_info} returns an empty string if the /sys/bus/xen/devices

=== modified file 'landscape/lib/vm_info.py'
--- landscape/lib/vm_info.py	2015-05-07 07:31:09 +0000
+++ landscape/lib/vm_info.py	2016-09-23 15:44:33 +0000
@@ -14,9 +14,6 @@
     It loops through some possible configurations and return a string with
     the name of the technology being used or None if there's no match
     """
-    def join_root_path(path):
-        return os.path.join(root_path, path)
-
     if _is_vm_openvz(root_path):
         return "openvz"
     if _is_vm_xen(root_path):
@@ -43,16 +40,8 @@
 
 def _is_vm_xen(root_path):
     """Check if the host is virtualized with Xen."""
-    xen_paths = [
-        os.path.join(root_path, path)
-        for path in ("proc/sys/xen", "proc/xen")]
-
-    if filter(os.path.exists, xen_paths):
-        return True
-
-    # /sys/bus/xen exists on most machines, but only virtual machines have
-    # devices
     sys_xen_path = os.path.join(root_path, "sys/bus/xen/devices")
+    # Paravirtualized and HVM instances have device links under the directory
     return os.path.isdir(sys_xen_path) and os.listdir(sys_xen_path)