Add support for a full cgroup v2 system to the 014-cgget-a_flag.py
functional test. It continues to support cgroup v1 as well.
Signed-off-by: Tom Hromatka <tom.hroma...@oracle.com>
---
ftests/014-cgget-a_flag.py | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/ftests/014-cgget-a_flag.py b/ftests/014-cgget-a_flag.py
index ff4dd6297ccb..4d2f49cb8c7f 100755
--- a/ftests/014-cgget-a_flag.py
+++ b/ftests/014-cgget-a_flag.py
@@ -37,8 +37,17 @@ def prereqs(config):
return result, cause
def setup(config):
- Cgroup.create(config, CONTROLLER1, CGNAME)
- Cgroup.create(config, CONTROLLER2, CGNAME)
+ ver1 = CgroupVersion.get_version(CONTROLLER1)
+ ver2 = CgroupVersion.get_version(CONTROLLER2)
+
+ if ver1 == CgroupVersion.CGROUP_V2 and \
+ ver2 == CgroupVersion.CGROUP_V2:
+ # If both controllers are cgroup v2, then we only need to make
+ # one cgroup. The path will be the same for both
+ Cgroup.create(config, [CONTROLLER1, CONTROLLER2], CGNAME)
+ else:
+ Cgroup.create(config, CONTROLLER1, CGNAME)
+ Cgroup.create(config, CONTROLLER2, CGNAME)
def test(config):
result = consts.TEST_PASSED
@@ -69,8 +78,17 @@ def test(config):
return result, cause
def teardown(config):
- Cgroup.delete(config, CONTROLLER1, CGNAME)
- Cgroup.delete(config, CONTROLLER2, CGNAME)
+ ver1 = CgroupVersion.get_version(CONTROLLER1)
+ ver2 = CgroupVersion.get_version(CONTROLLER2)
+
+ if ver1 == CgroupVersion.CGROUP_V2 and \
+ ver2 == CgroupVersion.CGROUP_V2:
+ # If both controllers are cgroup v2, then we only need to make
+ # one cgroup. The path will be the same for both
+ Cgroup.delete(config, [CONTROLLER1, CONTROLLER2], CGNAME)
+ else:
+ Cgroup.delete(config, CONTROLLER1, CGNAME)
+ Cgroup.delete(config, CONTROLLER2, CGNAME)
def main(config):
[result, cause] = prereqs(config)
--
2.26.3
_______________________________________________
Libcg-devel mailing list
Libcg-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libcg-devel
