lxc-ls: Cache groups and show bygroup in autostart

This makes sure we only query lxc.group once and then reuse that list for filtering, listing groups and autostart. When a container is auto-started only as part of a group, autostart will now show by-group instead of yes. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-ls: Cache groups and show bygroup in autostart
52b0a7d9 · Stéphane Graber · 4724cf84 · 52b0a7d9
Unverified Commit 52b0a7d9 authored May 02, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 10 deletions

lxc-ls.in src/lxc/lxc-ls.in +13 -10

No files found.
--- a/src/lxc/lxc-ls.in
+++ b/src/lxc/lxc-ls.in
@@ -235,11 +235,15 @@ def get_containers(fd=None, base="/", root=False):
            except:
                continue
-            if args.groups:
+            if args.groups or "autostart" in args.fancy_format \
+                    or "groups" in args.fancy_format:
                try:
-                    set_has = set(container.get_config_item("lxc.group"))
+                    groups = container.get_config_item("lxc.group")
                except KeyError:
-                    set_has = set()
+                    groups = []
+            if args.groups:
+                set_has = set(groups)
                for group in args.groups:
                    set_must = set(group.split(","))
@@ -275,18 +279,17 @@ def get_containers(fd=None, base="/", root=False):
            if 'groups' in args.fancy_format:
                entry['groups'] = "-"
-                try:
+                if len(groups) > 0:
-                    groups = container.get_config_item("lxc.group")
+                    entry['groups'] = ", ".join(groups)
-                    if len(groups) > 0:
-                        entry['groups'] = ", ".join(groups)
-                except KeyError:
-                    pass
            if 'autostart' in args.fancy_format:
                entry['autostart'] = "NO"
                try:
                    if container.get_config_item("lxc.start.auto") == "1":
-                        entry['autostart'] = "YES"
+                        if len(groups) > 0:
+                            entry['autostart'] = "BY-GROUP"
+                        else:
+                            entry['autostart'] = "YES"
                except KeyError:
                    pass