Merge lp:~townsend/libertine/configure-freeze into lp:libertine

[Christopher Townsend]

Add ability to enable and disable the freezing of LXC/LXD containers when not in use.

The second in the series of MP's to allow freezing and unfreezing of LXC/LXD containers.

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

PASSED: Continuous integration, rev:385
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/342/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/671
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/551
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/551
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/551
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/551
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/681
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/662
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/662
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/662
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/662/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/662
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/662/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Larry Price (larryprice)]

one inline

review: Needs Information

[lp:~townsend/libertine/configure-freeze]

386. By Christopher Townsend on 2017-01-24

Merge in prerequisite branch.

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

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

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Commented on your comment:)

[Larry Price (larryprice)]

lgtm

review: Approve

=== modified file 'tools/completions/libertine-container-manager'
--- tools/completions/libertine-container-manager	2016-10-14 14:44:17 +0000
+++ tools/completions/libertine-container-manager	2017-01-24 20:57:04 +0000
@@ -1,5 +1,6 @@
-# Copyright (C) 2016 Canonical Ltd.
-# Author: Larry Price <[e-mail]>
+# Copyright (C) 2016-2017 Canonical Ltd.
+# Authors: Larry Price <[e-mail]>
+#          Chris 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
@@ -48,7 +49,7 @@
         opts="--help"
         ;;
       "configure" )
-        opts="--help --id --multiarch --archive --bind-mount"
+        opts="--help --id --multiarch --archive --bind-mount --freeze"
         ;;
       "set-default" )
         opts="--help --id --clear"
@@ -60,7 +61,7 @@
     fi
 
     if [[ ${cmd} == "configure" ]]; then
-      if [[ "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]]; then
+      if [[ "${COMP_WORDS[COMP_CWORD-1]}" == "--multiarch" ]] || [ "${COMP_WORDS[COMP_CWORD-1]}" == "--freeze" ]; then
         opts="enable disable"
       elif [ "${COMP_WORDS[COMP_CWORD-1]}" == "--archive" ] || [ "${COMP_WORDS[COMP_CWORD-1]}" == "--bind-mount" ]; then
         opts="add remove"

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2017-01-18 15:19:23 +0000
+++ tools/libertine-container-manager	2017-01-24 20:57:04 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2014-2016 Canonical Ltd.
+# Copyright (C) 2014-2017 Canonical Ltd.
 # Author: Christopher Townsend <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
@@ -328,6 +328,19 @@
                     sys.exit(1)
                 self.containers_config.delete_bind_mount(container_id, mount_path)
 
+        elif args.freeze is not None:
+            container_type = self.containers_config.get_container_type(container_id)
+
+            if container_type != 'lxc' and container_type != 'lxd':
+                libertine.utils.get_logger().error("Configuring freeze is only valid on LXC and LXD container types.")
+                sys.exit(1)
+
+            current_freeze = self.containers_config.get_freeze_on_stop(container_id)
+            config_freeze = args.freeze == 'enable'
+
+            if current_freeze != config_freeze:
+               self.containers_config.update_freeze_on_stop(container_id, config_freeze)
+
         else:
             libertine.utils.get_logger().error("Configure called with no subcommand. See configure --help for usage.")
             sys.exit(1)
@@ -552,6 +565,14 @@
       metavar='Mount path',
       help=("The absolute host path to bind-mount."))
 
+    freeze_group = parser_configure.add_argument_group("Freeze container support",
+                   "Enable or disable freezing LXC/LXD containers when not in use.")
+    freeze_group.add_argument(
+        '-f', '--freeze',
+        choices=['enable', 'disable'],
+        help=("Enables or disables freezing of LXC/LXD containers when not in use."
+              " When disabled, the container will stop."))
+
     parser_configure.set_defaults(func=container_manager.configure)
 
     # Handle merging another ContainersConfig.json file into the main ContainersConfig.json file

=== modified file 'tools/libertine-container-manager.1'
--- tools/libertine-container-manager.1	2017-01-12 20:46:05 +0000
+++ tools/libertine-container-manager.1	2017-01-24 20:57:04 +0000
@@ -1,4 +1,4 @@
-.TH libertine-container-manager "1" " April 2016" "libertine-container-manager 0.99" "User Commands"
+.TH libertine-container-manager "1" " January 2017" "libertine-container-manager 1.5.1" "User Commands"
 
 .SH NAME
 libertine-container-manager \- Manage Libertine containers for supporting legacy X applications on Unity 8
@@ -275,7 +275,7 @@
 Enable i386 support.
 .RE
 .IP
-.BR \-a " {add,remove}, " \-\-archive "{add,remove}" ""
+.BR \-a " {add,remove}, " \-\-archive " {add,remove}" ""
 .RS 14
 Adds or removes an archive in the specified container.
 .RE
@@ -290,7 +290,7 @@
 File containing public key used to sign new archive.
 .RE
 .IP
-.BR \-b " {add,remove}, " \-\-bind-mount "{add,remove}" ""
+.BR \-b " {add,remove}, " \-\-bind-mount " {add,remove}" ""
 .RS 14
 Adds or removes a bind-mount in the specified container.
 .RE
@@ -299,6 +299,11 @@
 .RS 14
 Absolute host path to be added or removed.
 .RE
+.IP
+.BR \-f " {enable,disable}, " \-\-freeze " {enable,disable}" ""
+.RS 14
+Enable or disable freezing LXC/LXD containers when not in use.
+.RE
 .TP
 
 .B libertine-container-manager set-default [options]