Merge lp:~ack/landscape-client/fix-vivid-lxc-detection into lp:~landscape/landscape-client/trunk

[Alberto Donato]

This fixes container detection on Vivid hosts.
With the switch to systemd, the /run/container_type is no longer created (unless init-system-helpers is installed), so container detection fails.

The same information is also available in /run/systemd/container, so the branch also checks for that file.

This fixes container detection on Vivid hosts.
With the switch to systemd, the /run/container_type is no longer created (unless init-system-helpers is installed), so container detection fails.

The same information is also available in /run/systemd/container, so the branch also checks for that file.

[Fernando Correa Neto (fcorrea)]

Looks great! (and it works too) +1

review: Approve

[Geoff Teale (tealeg)]

+1 great, thanks!

review: Approve

=== modified file 'landscape/lib/tests/test_vm_info.py'
--- landscape/lib/tests/test_vm_info.py	2014-10-01 09:05:23 +0000
+++ landscape/lib/tests/test_vm_info.py	2015-05-07 11:09:58 +0000
@@ -1,7 +1,6 @@
 import os
 
 from landscape.tests.helpers import LandscapeTest
-
 from landscape.lib.vm_info import get_vm_info, get_container_info
 
 
@@ -162,16 +161,35 @@
 
 class GetContainerInfoTest(LandscapeTest):
 
+    def setUp(self):
+        super(GetContainerInfoTest, self).setUp()
+        self.run_path = self.makeDir()
+
     def test_no_container(self):
         """If not running in a container, an empty string is returned."""
-        self.assertEqual("", get_container_info(path="/does/not/exist"))
-
-    def test_in_container(self):
-        """If running in a container, the container type is returned."""
-        path = self.makeFile(content="lxc")
-        self.assertEqual("lxc", get_container_info(path=path))
+        self.assertEqual("", get_container_info(self.run_path))
+
+    def test_in_container_with_container_type_file(self):
+        """
+        If the /run/container_type file is found, the content is returned as
+        container type.
+        """
+        container_type_file = os.path.join(self.run_path, "container_type")
+        self.makeFile(content="lxc", path=container_type_file)
+        self.assertEqual("lxc", get_container_info(run_path=self.run_path))
+
+    def test_in_container_with_systemd_container_file(self):
+        """
+        If the /run/systemd/container file is found, the content is returned as
+        container type.
+        """
+        os.mkdir(os.path.join(self.run_path, "systemd"))
+        container_type_file = os.path.join(self.run_path, "systemd/container")
+        self.makeFile(content="lxc", path=container_type_file)
+        self.assertEqual("lxc", get_container_info(run_path=self.run_path))
 
     def test_strip_newline(self):
         """The container type doesn't contain newlines."""
-        path = self.makeFile(content="lxc\n")
-        self.assertEqual("lxc", get_container_info(path=path))
+        container_type_file = os.path.join(self.run_path, "container_type")
+        self.makeFile(content="lxc\n", path=container_type_file)
+        self.assertEqual("lxc", get_container_info(run_path=self.run_path))

=== modified file 'landscape/lib/vm_info.py'
--- landscape/lib/vm_info.py	2014-10-01 09:05:23 +0000
+++ landscape/lib/vm_info.py	2015-05-07 11:09:58 +0000
@@ -29,12 +29,16 @@
         return _get_vm_legacy(root_path)
 
 
-def get_container_info(path="/run/container_type"):
+def get_container_info(run_path="/run"):
     """
     Return a string with the type of container the client is running in, if
     any, an empty string otherwise.
     """
-    return read_file(path).strip() if os.path.exists(path) else ""
+    for filename in ("container_type", "systemd/container"):
+        path = os.path.join(run_path, filename)
+        if os.path.exists(path):
+            return read_file(path).strip()
+    return ""
 
 
 def _is_vm_xen(root_path):