From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Wed, 10 Mar 2021 17:15:19 +0000 (+0000)
Subject: cgroup.py: Add support for cgset --copy-from flag
X-Git-Tag: v2.0.3~11^2^2~22^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44a4ed8dc967e9586b43431092a5e53cb0e34d7b;p=thirdparty%2Flibcgroup.git

cgroup.py: Add support for cgset --copy-from flag

Add support for cgset's --copy-from flag to Cgroup.set().

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/ftests/cgroup.py b/ftests/cgroup.py
index c7213077..bd4a7a5c 100644
--- a/ftests/cgroup.py
+++ b/ftests/cgroup.py
@@ -141,23 +141,31 @@ class Cgroup(object):
             Run.run(cmd)
 
     @staticmethod
-    def set(config, cgname, setting, value):
+    def set(config, cgname, setting=None, value=None, copy_from=None):
         cmd = list()
 
         if not config.args.container:
             cmd.append('sudo')
         cmd.append(Cgroup.build_cmd_path('cgset'))
 
-        if isinstance(setting, str) and isinstance(value, str):
-            cmd.append('-r')
-            cmd.append('{}={}'.format(setting, value))
-        elif isinstance(setting, list) and isinstance(value, list):
-            if len(setting) != len(value):
-                raise ValueError('Settings list length must equal values list length')
-
-            for idx, stg in enumerate(setting):
+        if setting is not None or value is not None:
+            if isinstance(setting, str) and isinstance(value, str):
                 cmd.append('-r')
-                cmd.append('{}={}'.format(stg, value[idx]))
+                cmd.append('{}={}'.format(setting, value))
+            elif isinstance(setting, list) and isinstance(value, list):
+                if len(setting) != len(value):
+                    raise ValueError('Settings list length must equal values list length')
+
+                for idx, stg in enumerate(setting):
+                    cmd.append('-r')
+                    cmd.append('{}={}'.format(stg, value[idx]))
+            else:
+                raise ValueError('Invalid inputs to cgget:\nsetting: {}\n' \
+                                 'value{}'.format(setting, value))
+
+        if copy_from is not None:
+            cmd.append('--copy-from')
+            cmd.append(copy_from)
 
         cmd.append(cgname)