Merge lp:~townsend/libertine/consolidate-managers into lp:libertine

[Christopher Townsend]

Optimizations regarding the lx[cd] managers:
- Move start/stop counting into libertined and remove the managers.
- Move all start/stop operations to the respective backends.
- Dynamic bind mounts are now handled during the backend's start_container() method.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:394
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/359/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/696
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/570
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/570
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/570
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/570
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/706
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/687
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/687/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/687
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/687/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/687
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/687/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/687
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/687/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/359/rebuild

review: Approve (continuous-integration)

[lp:~townsend/libertine/consolidate-managers]

395. By Christopher Townsend on 2017-02-01

Don't need to set self._config twice.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:395
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/360/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/697
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/571
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/571
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/571
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/571
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/707
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/688
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/688/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/688
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/688/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/688
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/688/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/688
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/688/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/360/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2017-01-20 20:37:02 +0000
+++ data/CMakeLists.txt	2017-02-01 15:34:03 +0000
@@ -9,6 +9,4 @@
 install(FILES libertine-lxc-sudo libertine-lxd-sudo
         DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sudoers.d)
 install(FILES com.canonical.libertine.Service.service
-              com.canonical.libertine.LxcManager.service
-              com.canonical.libertine.LxdManager.service
         DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)

=== removed file 'data/com.canonical.libertine.LxcManager.service'
--- data/com.canonical.libertine.LxcManager.service	2016-08-19 14:02:31 +0000
+++ data/com.canonical.libertine.LxcManager.service	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.libertine.LxcManager
-Exec=/usr/bin/libertine-lxc-manager

=== removed file 'data/com.canonical.libertine.LxdManager.service'
--- data/com.canonical.libertine.LxdManager.service	2016-12-20 20:23:16 +0000
+++ data/com.canonical.libertine.LxdManager.service	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.libertine.LxdManager
-Exec=/usr/bin/libertine-lxd-manager

=== modified file 'debian/control'
--- debian/control	2017-01-26 16:59:53 +0000
+++ debian/control	2017-02-01 15:34:03 +0000
@@ -177,7 +177,6 @@
          python3-libertine,
          python3-lxc,
          uidmap,
-         python3-gi,
          ${misc:Depends},
          ${python3:Depends}
 Replaces: libertine-tools (<< 1.3)
@@ -195,7 +194,6 @@
          python3-libertine,
          python3-pexpect,
          python3-pylxd,
-         python3-gi,
          ${misc:Depends},
          ${python3:Depends}
 Description: Python3 scripts for the Libertine application sandbox

=== modified file 'debian/python3-libertine-lxc.install'
--- debian/python3-libertine-lxc.install	2016-10-07 21:09:41 +0000
+++ debian/python3-libertine-lxc.install	2017-02-01 15:34:03 +0000
@@ -1,6 +1,4 @@
 etc/sudoers.d/libertine-lxc-sudo
-usr/bin/libertine-lxc-manager
 usr/bin/libertine-lxc-setup
 usr/lib/python*/*/libertine/LxcContainer.py
-usr/share/dbus-1/services/com.canonical.libertine.LxcManager.service
 usr/share/libertine/libertine-lxc.conf

=== modified file 'debian/python3-libertine-lxd.install'
--- debian/python3-libertine-lxd.install	2016-12-21 20:37:57 +0000
+++ debian/python3-libertine-lxd.install	2017-02-01 15:34:03 +0000
@@ -1,5 +1,3 @@
 etc/sudoers.d/libertine-lxd-sudo
 usr/bin/libertine-lxd-setup
-usr/bin/libertine-lxd-manager
 usr/lib/python*/*/libertine/LxdContainer.py
-usr/share/dbus-1/services/com.canonical.libertine.LxdManager.service

=== modified file 'debian/python3-libertine.install'
--- debian/python3-libertine.install	2017-01-20 18:43:08 +0000
+++ debian/python3-libertine.install	2017-02-01 15:34:03 +0000
@@ -4,5 +4,4 @@
 usr/lib/python*/*/libertine/Libertine.py
 usr/lib/python*/*/libertine/__init__.py
 usr/lib/python*/*/libertine/launcher
-usr/lib/python*/*/libertine/lifecycle
 usr/lib/python*/*/libertine/utils.py

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2017-01-25 18:48:36 +0000
+++ python/libertine/LxcContainer.py	2017-02-01 15:34:03 +0000
@@ -22,17 +22,15 @@
 import subprocess
 import sys
 import tempfile
+import time
 
-from .lifecycle import LifecycleResult
 from .Libertine import BaseContainer
+from .service.manager import LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH
 from . import utils, HostInfo
 
 
 home_path = os.environ['HOME']
 
-LIBERTINE_LXC_MANAGER_NAME = "com.canonical.libertine.LxcManager"
-LIBERTINE_LXC_MANAGER_PATH = "/LxcManager"
-
 
 def _check_lxc_net_entry(entry):
     lxc_net_file = open('/etc/lxc/lxc-usernet')
@@ -57,14 +55,6 @@
     return os.path.join(home_path, '.config', 'lxc')
 
 
-def get_lxc_manager_dbus_name():
-    return LIBERTINE_LXC_MANAGER_NAME
-
-
-def get_lxc_manager_dbus_path():
-    return LIBERTINE_LXC_MANAGER_PATH
-
-
 def lxc_container(container_id):
     config_path = utils.get_libertine_containers_dir_path()
     if not os.path.exists(config_path):
@@ -103,19 +93,23 @@
 
     if container.state == 'STOPPED':
         if not container.start():
-            return LifecycleResult("Container failed to start.")
+            utils.get_logger().error("Container failed to start.")
+            return False
     elif container.state == 'FROZEN':
         if not container.unfreeze():
-            return LifecycleResult("Container failed to unfreeze.")
+            utils.get_logger().error("Container failed to unfreeze.")
+            return False
 
     if not container.wait("RUNNING", 10):
-        return LifecycleResult("Container failed to enter the RUNNING state.")
+        utils.get_logger().error("Container failed to enter the RUNNING state.")
+        return False
 
     if not container.get_ips(timeout=30):
         lxc_stop(container)
-        return LifecycleResult("Not able to connect to the network.")
+        utils.get_logger().error("Not able to connect to the network.")
+        return False
 
-    return LifecycleResult()
+    return True
 
 
 def lxc_stop(container, freeze_on_stop=False):
@@ -169,27 +163,85 @@
         if utils.set_session_dbus_env_var():
             try:
                 bus = dbus.SessionBus()
-                self.lxc_manager_interface = bus.get_object(get_lxc_manager_dbus_name(), get_lxc_manager_dbus_path())
+                self.lxc_manager_interface = bus.get_object(LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH)
             except dbus.exceptions.DBusException:
                 pass
 
+    def _setup_pulse(self):
+        pulse_socket_path = os.path.join(utils.get_libertine_runtime_dir(), 'pulse_socket')
+
+        os.environ['PULSE_SERVER'] = pulse_socket_path
+
+        lsof_cmd = 'lsof -n %s' % pulse_socket_path
+        args = shlex.split(lsof_cmd)
+        lsof = subprocess.Popen(args, stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
+        lsof.wait()
+
+        if not os.path.exists(pulse_socket_path) or lsof.returncode == 1:
+            pactl_cmd = (
+                'pactl load-module module-native-protocol-unix auth-anonymous=1 socket=%s'
+                % pulse_socket_path)
+            args = shlex.split(pactl_cmd)
+            subprocess.Popen(args).wait()
+
+    def _dynamic_bind_mounts(self):
+        self._config.refresh_database()
+        mounts = self._sanitize_bind_mounts(utils.get_common_xdg_user_directories() + \
+                                            self._config.get_container_bind_mounts(self.container_id))
+
+        data_dir = utils.get_libertine_container_home_dir(self.container_id)
+        for user_dir in utils.generate_binding_directories(mounts, home_path):
+            if os.path.isabs(user_dir[1]):
+                path = user_dir[1].strip('/')
+                fullpath = os.path.join(utils.get_libertine_container_rootfs_path(self.container_id), path)
+            else:
+                path = "{}/{}".format(home_path.strip('/'), user_dir[1])
+                fullpath = os.path.join(data_dir, user_dir[1])
+
+            os.makedirs(fullpath, exist_ok=True)
+
+            utils.get_logger().debug("Mounting {}:{} in container {}".format(user_dir[0], path, self.container_id))
+            xdg_user_dir_entry = (
+                "%s %s none bind,create=dir,optional"
+                % (user_dir[0], path)
+            )
+            self.container.append_config_item("lxc.mount.entry", xdg_user_dir_entry)
+
+    def _sanitize_bind_mounts(self, mounts):
+        return [mount.replace(" ", "\\040") for mount in mounts]
+
     def timezone_needs_update(self):
         with open(os.path.join(self.root_path, 'etc', 'timezone'), 'r') as fd:
             return fd.read().strip('\n') != self.host_info.get_host_timezone()
 
     def start_container(self):
         if self.lxc_manager_interface:
-            result = LifecycleResult.from_dict(self.lxc_manager_interface.container_service_start(self.container_id))
-        else:
-            result = lxc_start(self.container)
-
-        if not result.success:
+            retries = 0
+            while not self.lxc_manager_interface.container_operation_start(self.container_id):
+                retries += 1
+                if retries > 5:
+                    return False
+                time.sleep(.5)
+             
+        if self.container.state == 'RUNNING':
+            return True
+
+        if self.container.state == 'STOPPED':
+            self._dynamic_bind_mounts()
+            self._setup_pulse()
+
+        if not lxc_start(self.container):
             _dump_lxc_log(result.logfile)
-            raise RuntimeError(result.error)
+            return False
+
+        return True
 
     def stop_container(self):
         if self.lxc_manager_interface:
-            self.lxc_manager_interface.container_service_stop(self.container_id, {'freeze': self._freeze_on_stop})
+            stop = self.lxc_manager_interface.container_operation_finished(self.container_id)
+            if stop: 
+                lxc_stop(self.container, self._freeze_on_stop)
+                self.lxc_manager_interface.container_stopped(self.container_id)
         else:
             lxc_stop(self.container, self._freeze_on_stop)
 
@@ -261,10 +313,7 @@
         self.create_libertine_config()
 
         utils.get_logger().info("starting container ...")
-        try:
-            self.start_container()
-        except RuntimeError as e:
-            utils.get_logger().error("Container failed to start: %s" % e)
+        if not self.start_container():
             self.destroy_libertine_container()
             return False
 
@@ -333,11 +382,8 @@
         os.environ.clear()
         os.environ.update(environ)
 
-        result = LifecycleResult.from_dict(self.lxc_manager_interface.container_service_start(self.container_id))
-
-        if not result.success:
-            _dump_lxc_log(get_logfile(self.container))
-            utils.get_logger().error("%s" % result.error)
+        if not self.start_container():
+            self.lxc_manager_interface.container_stopped(self.container_id)
             return
 
         self.window_manager = self.container.attach(lxc.attach_run_command,
@@ -357,5 +403,4 @@
 
         utils.terminate_window_manager(psutil.Process(self.window_manager))
 
-        # Tell libertine-lxc-manager that the app has stopped.
-        self.lxc_manager_interface.container_service_stop(self.container_id, {'freeze': self._freeze_on_stop})
+        self.stop_container()

=== modified file 'python/libertine/LxdContainer.py'
--- python/libertine/LxdContainer.py	2017-01-27 16:43:53 +0000
+++ python/libertine/LxdContainer.py	2017-02-01 15:34:03 +0000
@@ -22,20 +22,8 @@
 import subprocess
 import time
 
-from .lifecycle import LifecycleResult
 from libertine import Libertine, utils, HostInfo
-
-
-LIBERTINE_LXC_MANAGER_NAME = "com.canonical.libertine.LxdManager"
-LIBERTINE_LXC_MANAGER_PATH = "/LxdManager"
-
-
-def get_lxd_manager_dbus_name():
-    return LIBERTINE_LXC_MANAGER_NAME
-
-
-def get_lxd_manager_dbus_path():
-    return LIBERTINE_LXC_MANAGER_PATH
+from .service.manager import LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH
 
 
 def _get_devices_map():
@@ -148,14 +136,15 @@
     container.sync(rollback=True) # required for pylxd=2.0.x
 
     if container.status != 'Running':
-        return LifecycleResult("Container {} failed to start".format(container.name))
+        utils.get_logger().error("Container {} failed to start".format(container.name))
+        return False
 
-    return LifecycleResult()
+    return True
 
 
 def lxd_stop(container, wait=True, freeze_on_stop=False):
     if container.status == 'Stopped':
-        return LifecycleResult()
+        return True
 
     if freeze_on_stop:
         container.freeze(wait=wait)
@@ -166,11 +155,13 @@
 
     if wait:
         if freeze_on_stop and container.status != 'Frozen':
-            return LifecycleResult("Container {} failed to freeze".format(container.name))
-        elif container.status != 'Stopped':
-            return LifecycleResult("Container {} failed to stop".format(container.name))
+            utils.get_logger().error("Container {} failed to freeze".format(container.name))
+            return False
+        elif not freeze_on_stop and container.status != 'Stopped':
+            utils.get_logger().error("Container {} failed to stop".format(container.name))
+            return False
 
-    return LifecycleResult()
+    return True
 
 
 def _lxd_save(entity, error, wait=True):
@@ -318,7 +309,7 @@
             try:
                 if utils.set_session_dbus_env_var():
                     bus = dbus.SessionBus()
-                    self._manager = bus.get_object(get_lxd_manager_dbus_name(), get_lxd_manager_dbus_path())
+                    self._manager = bus.get_object(LIBERTINE_MANAGER_NAME, LIBERTINE_STORE_PATH)
             except PermissionError as e:
                 utils.get_logger().warning("Failed to set dbus session env var")
             except dbus.exceptions.DBusException:
@@ -417,37 +408,52 @@
         proc = subprocess.Popen(self._lxc_args(command))
         return proc.wait()
 
-    def start_container(self):
+    def start_container(self, home=env_home_path()):
         if not self._try_get_container():
             return False
 
         if self._manager:
-            result = LifecycleResult.from_dict(self._manager.container_service_start(self.container_id))
-        else:
-            result = lxd_start(self._container)
-
-        if not result.success:
-            utils.get_logger().error(result.error)
+            retries = 0
+            while not self._manager.container_operation_start(self.container_id):
+                retries += 1
+                if retries > 5:
+                    return False
+                time.sleep(.5)
+
+        if self._container.status == 'Running':
+            return True
+
+        requires_remount = self._container.status == 'Stopped'
+
+        if requires_remount:
+            update_libertine_profile(self._client)
+            update_bind_mounts(self._container, self._config, home)
+
+        if not lxd_start(self._container):
             return False
 
         if not _wait_for_network(self._container):
             utils.get_logger().warning("Network unavailable in container '{}'".format(self.container_id))
 
-        return result.success
+        if requires_remount:
+            self.run_in_container("/usr/bin/libertine-lxd-mount-update")
+
+        return True
 
     def stop_container(self, wait=False):
         if not self._try_get_container():
             return False
 
         if self._manager:
-            result = LifecycleResult.from_dict(self._manager.container_service_stop(self.container_id, {'wait': wait, 'freeze': self._freeze_on_stop}))
+            stop = self._manager.container_operation_finished(self.container_id)
+            if stop:
+                if not lxd_stop(self._container, freeze_on_stop=self._freeze_on_stop):
+                    return False
+                self._manager.container_stopped(self.container_id)
         else:
-            result = lxd_stop(self._container, wait, self._freeze_on_stop)
-
-        if not result.success:
-            utils.get_logger().error(result.error)
-
-        return result.success
+            return lxd_stop(self._container, freeze_on_stop=self._freeze_on_stop)
+
+        return True
 
     def _get_matchbox_pids(self):
         p = subprocess.Popen(self._lxc_args('pgrep matchbox'), stdout=subprocess.PIPE)
@@ -481,22 +487,11 @@
         if utils.is_snap_environment():
             environ['HOME'] = '/home/{}'.format(environ['USER'])
 
-        requires_remount = self._container.status != 'Running'
-
-        if self._manager:
-            result = LifecycleResult.from_dict(self._manager.container_service_start(self.container_id))
-        else:
-            update_libertine_profile(self._client)
-            update_bind_mounts(self._container, self._config, environ['HOME'])
-            result = lxd_start(self._container)
-
-        if not result.success:
-            utils.get_logger().error(result.error)
+        if not self.start_container(home=environ['HOME']):
+            if self._manager:
+                self.lxc_manager_interface.container_stopped(self.container_id)
             return False
 
-        if requires_remount:
-            self.run_in_container("/usr/bin/libertine-lxd-mount-update")
-
         args = self._lxc_args("sudo -E -u {} env PATH={}".format(environ['USER'], environ['PATH']), environ)
 
         self._start_window_manager(args.copy())
@@ -518,10 +513,7 @@
 
         app.wait()
 
-        if self._manager:
-            self._manager.container_service_stop(self.container_id, {'freeze': self._freeze_on_stop})
-        else:
-            lxd_stop(self._container, False, self._freeze_on_stop)
+        self.stop_container()
 
     def copy_file_to_container(self, source, dest):
         with open(source, 'rb') as f:

=== removed directory 'python/libertine/lifecycle'
=== removed file 'python/libertine/lifecycle/ContainerLifecycleService.py'
--- python/libertine/lifecycle/ContainerLifecycleService.py	2017-01-19 15:01:38 +0000
+++ python/libertine/lifecycle/ContainerLifecycleService.py	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import dbus.exceptions
-import dbus.service
-
-from .LifecycleResult import LifecycleResult
-from collections import Counter
-from dbus.mainloop.glib import DBusGMainLoop
-from libertine import utils
-
-
-LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE = 'com.canonical.libertine.ContainerLifecycle'
-
-
-class ContainerLifecycleService(dbus.service.Object):
-    def __init__(self, service_name, service_path):
-        self._operations = Counter()
-
-        DBusGMainLoop(set_as_default=True)
-        try:
-            bus_name = dbus.service.BusName(service_name,
-                                            bus=dbus.SessionBus(),
-                                            do_not_queue=True)
-        except dbus.exceptions.NameExistsException:
-            utils.get_logger().error("service is already running")
-            raise
-        super().__init__(bus_name, service_path)
-
-    def start(self, container):
-        raise NotImplementedError("Subclasses must implement start(container)")
-
-    def stop(self, container, options={}):
-        raise NotImplementedError("Subclasses must implement stop(container)")
-
-    @dbus.service.method(LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE,
-                         in_signature='s',
-                         out_signature='a{ss}')
-    def container_service_start(self, container):
-        utils.get_logger().debug("container_service_start({})".format(container))
-
-        result = self.start(container)
-
-        if result.success:
-            self._operations[container] += 1
-
-        return result.to_dict()
-
-    @dbus.service.method(LIBERTINE_CONTAINER_LIFECYCLE_INTERFACE,
-                         in_signature='sa{ss}',
-                         out_signature='a{ss}')
-    def container_service_stop(self, container, options={}):
-        utils.get_logger().debug("container_service_stop({}, {})".format(container, options))
-        self._operations[container] -= 1
-        result = LifecycleResult()
-
-        if self._operations[container] == 0:
-            result = self.stop(container, options)
-            del self._operations[container]
-
-        return result.to_dict()

=== removed file 'python/libertine/lifecycle/ContainerLifecycleServiceRunner.py'
--- python/libertine/lifecycle/ContainerLifecycleServiceRunner.py	2016-12-21 20:39:40 +0000
+++ python/libertine/lifecycle/ContainerLifecycleServiceRunner.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import signal
-
-from gi.repository import GLib
-from libertine import utils
-
-
-class ContainerLifecycleServiceRunner(object):
-    def __init__(self, service):
-        self._service = service
-
-    def _sigterm(self, sig):
-        utils.get_logger().warning("Received SIGTERM")
-        self._shutdown()
-
-    def _shutdown(self):
-        utils.get_logger().info("Shutting down")
-        GLib.MainLoop().quit()
-
-    def run(self):
-        GLib.unix_signal_add(GLib.PRIORITY_HIGH,
-                             signal.SIGTERM,
-                             self._sigterm,
-                             None)
-
-        try:
-            utils.get_logger().info("Starting main loop")
-            GLib.MainLoop().run()
-        except KeyboardInterrupt:
-            self._shutdown()

=== removed file 'python/libertine/lifecycle/LifecycleResult.py'
--- python/libertine/lifecycle/LifecycleResult.py	2016-12-21 18:26:51 +0000
+++ python/libertine/lifecycle/LifecycleResult.py	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-class LifecycleResult(object):
-    def __init__(self, error=''):
-        self._error = error
-
-    @property
-    def error(self):
-        return self._error or ''
-
-    @property
-    def success(self):
-        return self.error == ''
-
-    @classmethod
-    def from_dict(kls, d):
-        return LifecycleResult(d.get('error', None))
-
-    def to_dict(self):
-        return {
-            'error': self.error
-        }

=== removed file 'python/libertine/lifecycle/__init__.py'
--- python/libertine/lifecycle/__init__.py	2016-12-21 18:26:51 +0000
+++ python/libertine/lifecycle/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from .ContainerLifecycleServiceRunner import ContainerLifecycleServiceRunner
-from .ContainerLifecycleService import ContainerLifecycleService
-from .LifecycleResult import LifecycleResult
-
-__all__ = [
-          'ContainerLifecycleServiceRunner',
-          'ContainerLifecycleService',
-          'LifecycleResult'
-          ]

=== modified file 'python/libertine/service/manager.py'
--- python/libertine/service/manager.py	2017-01-24 18:00:57 +0000
+++ python/libertine/service/manager.py	2017-02-01 15:34:03 +0000
@@ -15,6 +15,7 @@
 import dbus
 import dbus.service
 import libertine.service.task_dispatcher
+from collections import Counter
 from dbus.mainloop.glib import DBusGMainLoop
 from libertine.service import container
 from libertine import utils
@@ -28,6 +29,7 @@
 class Manager(dbus.service.Object):
     def __init__(self):
         utils.get_logger().debug("creating service")
+        self._operations = Counter()
         DBusGMainLoop(set_as_default=True)
         try:
             bus_name = dbus.service.BusName(LIBERTINE_MANAGER_NAME,
@@ -120,3 +122,37 @@
     def remove(self, container_id, package_name):
         utils.get_logger().debug("remove('%s', '%s')" % (container_id, package_name))
         return self._dispatcher.remove(container_id, package_name)
+
+    # Container Lifecycle
+
+    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
+                         in_signature='s',
+                         out_signature='b')
+    def container_operation_start(self, container):
+        utils.get_logger().debug("container_operation_start({})".format(container))
+
+        if self._operations[container] == -1:
+            return False
+
+        self._operations[container] += 1
+        return True
+
+    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
+                         in_signature='s',
+                         out_signature='b')
+    def container_operation_finished(self, container):
+        utils.get_logger().debug("container_operation_finished({})".format(container))
+        stop = False
+        self._operations[container] -= 1
+
+        if self._operations[container] == 0:
+            self._operations[container] -= 1
+            stop = True
+
+        return stop
+
+    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
+                         in_signature='s')
+    def container_stopped(self, container):
+        utils.get_logger().debug("container_stopped({})".format(container))
+        del self._operations[container]

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-12-21 20:57:15 +0000
+++ tools/CMakeLists.txt	2017-02-01 15:34:03 +0000
@@ -1,8 +1,8 @@
-install(PROGRAMS libertine-container-manager libertine-launch libertine-lxc-manager libertine-lxd-manager
+install(PROGRAMS libertine-container-manager libertine-launch
                  libertine-xmir libertine-lxc-setup libertine-lxd-setup libertined
         DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES libertine-launch.1 libertine-container-manager.1 libertine-lxc-manager.1
-              libertine-lxd-manager.1 libertine-xmir.1
+install(FILES libertine-launch.1 libertine-container-manager.1
+              libertine-xmir.1
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 install(FILES completions/libertine-container-manager

=== removed file 'tools/libertine-lxc-manager'
--- tools/libertine-lxc-manager	2017-01-25 18:48:36 +0000
+++ tools/libertine-lxc-manager	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016-2017 Canonical Ltd.
-# Author: Christopher Townsend <[e-mail]>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import libertine.LxcContainer
-import libertine.utils
-import os
-import shlex
-import subprocess
-
-from libertine.ContainersConfig import ContainersConfig
-from libertine.lifecycle import *
-
-
-LIBERTINE_LXC_MANAGER_NAME = libertine.LxcContainer.get_lxc_manager_dbus_name()
-LIBERTINE_LXC_MANAGER_PATH = libertine.LxcContainer.get_lxc_manager_dbus_path()
-
-
-class Service(ContainerLifecycleService):
-
-    def __init__(self):
-        super().__init__(LIBERTINE_LXC_MANAGER_NAME, LIBERTINE_LXC_MANAGER_PATH)
-        self._home = os.environ['HOME']
-        self._containers_config = ContainersConfig()
-        self._is_pulse_setup = False
-
-    def start(self, container_id):
-        container = libertine.LxcContainer.lxc_container(container_id)
-
-        if not container.defined:
-            return LifecycleResult("Container {} is not valid".format(container_id))
-
-        if not self._is_pulse_setup:
-            self._setup_pulse()
-
-        if container.state == 'STOPPED':
-            self._dynamic_bind_mounts(container, container_id)
-
-        libertine.LxcContainer.lxc_start(container)
-
-        return LifecycleResult()
-
-    def stop(self, container_id, options={}):
-        container = libertine.LxcContainer.lxc_container(container_id)
-        
-        libertine.LxcContainer.lxc_stop(container, options.get('freeze', False))
-
-        return LifecycleResult() # no error case
-
-    def _setup_pulse(self):
-        pulse_socket_path = os.path.join(libertine.utils.get_libertine_runtime_dir(), 'pulse_socket')
-
-        lsof_cmd = 'lsof -n %s' % pulse_socket_path
-        args = shlex.split(lsof_cmd)
-        lsof = subprocess.Popen(args, stderr=subprocess.DEVNULL, stdout=subprocess.DEVNULL)
-        lsof.wait()
-
-        if not os.path.exists(pulse_socket_path) or lsof.returncode == 1:
-            pactl_cmd = (
-                'pactl load-module module-native-protocol-unix auth-anonymous=1 socket=%s'
-                % pulse_socket_path)
-            args = shlex.split(pactl_cmd)
-            subprocess.Popen(args).wait()
-
-        self.is_pulse_setup = True
-
-    def _dynamic_bind_mounts(self, container, container_id):
-        self._containers_config.refresh_database()
-        mounts = self._sanitize_bind_mounts(libertine.utils.get_common_xdg_user_directories() + \
-                                            self._containers_config.get_container_bind_mounts(container_id))
-
-        data_dir = libertine.utils.get_libertine_container_home_dir(container_id)
-        for user_dir in libertine.utils.generate_binding_directories(mounts, self._home):
-            if os.path.isabs(user_dir[1]):
-                path = user_dir[1].strip('/')
-                fullpath = os.path.join(libertine.utils.get_libertine_container_rootfs_path(container_id), path)
-            else:
-                path = "{}/{}".format(self._home.strip('/'), user_dir[1])
-                fullpath = os.path.join(data_dir, user_dir[1])
-
-            os.makedirs(fullpath, exist_ok=True)
-
-            libertine.utils.get_logger().debug("Mounting {}:{} in container {}".format(user_dir[0], path, container_id))
-            xdg_user_dir_entry = (
-                "%s %s none bind,create=dir,optional"
-                % (user_dir[0], path)
-            )
-            container.append_config_item("lxc.mount.entry", xdg_user_dir_entry)
-
-    def _sanitize_bind_mounts(self, mounts):
-        return [mount.replace(" ", "\\040") for mount in mounts]
-
-
-if __name__ == '__main__':
-    ContainerLifecycleServiceRunner(Service()).run()

=== removed file 'tools/libertine-lxc-manager.1'
--- tools/libertine-lxc-manager.1	2016-04-06 12:31:26 +0000
+++ tools/libertine-lxc-manager.1	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-.TH libertine-lxc-manager "1" "April 2016" "libertine-lxc-manager 0.99" "User Commands"
-
-.SH NAME
-libertine-lxc-manager \- monitors LXC activity performed by libertine
-
-.SH DESCRIPTION
-usage: libertine\-lxc\-manager
-.PP
-monitors LXC activity performed by libertine

=== removed file 'tools/libertine-lxd-manager'
--- tools/libertine-lxd-manager	2017-01-24 20:21:16 +0000
+++ tools/libertine-lxd-manager	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-
-# Copyright (C) 2016-2017 Canonical Ltd.
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import libertine.LxdContainer
-import libertine.utils
-import pylxd
-
-from libertine.ContainersConfig import ContainersConfig
-from libertine.lifecycle import *
-
-
-LIBERTINE_LXD_MANAGER_NAME = libertine.LxdContainer.get_lxd_manager_dbus_name()
-LIBERTINE_LXD_MANAGER_PATH = libertine.LxdContainer.get_lxd_manager_dbus_path()
-
-
-class Service(ContainerLifecycleService):
-
-    def __init__(self):
-        super().__init__(LIBERTINE_LXD_MANAGER_NAME, LIBERTINE_LXD_MANAGER_PATH)
-        self._config = ContainersConfig()
-        self._client = pylxd.Client()
-
-    def start(self, container_id):
-        container = libertine.LxdContainer.lxd_container(self._client, container_id)
-
-        if not container:
-            return LifecycleResult("Container {} is not valid".format(container_id))
-
-        if container.status != 'Running':
-            libertine.LxdContainer.update_libertine_profile(self._client)
-
-            libertine.LxdContainer.update_bind_mounts(container, self._config, libertine.LxdContainer.env_home_path())
-
-            return libertine.LxdContainer.lxd_start(container)
-
-        return LifecycleResult()
-
-    def stop(self, container_id, options={}):
-        return libertine.LxdContainer.lxd_stop(libertine.LxdContainer.lxd_container(self._client, container_id),
-                                               options.get('wait', False), options.get('freeze', False))
-
-
-if __name__ == '__main__':
-    ContainerLifecycleServiceRunner(Service()).run()

=== removed file 'tools/libertine-lxd-manager.1'
--- tools/libertine-lxd-manager.1	2016-12-21 20:57:15 +0000
+++ tools/libertine-lxd-manager.1	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-.TH libertine-lxd-manager "1" "Dec 2016" "libertine-lxd-manager 0.99" "User Commands"
-
-.SH NAME
-libertine-lxd-manager \- monitors LXD activity performed by libertine
-
-.SH DESCRIPTION
-usage: libertine\-lxd\-manager
-.PP
-monitors LXD activity performed by libertine