Add other valid controllers to cgconfig lens

hercules-team · Jun 24, 2014 · 45ed30e · 45ed30e
1 parent cf3de24
commit 45ed30e
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -35,6 +35,7 @@ Contributions by:
   Freakin                     <[email protected]>
   Marc Fournier               <[email protected]>
   Davide Guerri               <[email protected]>
+  Andy Grimm                  <[email protected]>
   Travis Groth                <[email protected]>
   Adam Helms                  <[email protected]>
   Harald Hoyer                <[email protected]>

diff --git a/NEWS b/NEWS
@@ -7,6 +7,7 @@
     * Remove unused "filename" argument from dump-xml command, RHBZ#1100106
   - Lens changes/additions
     * AptPreferences: Support spaces in origin fields
+    * Cgconfig: handle additional valid controllers (Andy Grimm)
     * Chrony: New lens to parse /etc/chrony.conf
     * CPanel: New lens to parse cpanel.config files
     * Desktop: Allow @ in keys (GH issue #92)

diff --git a/lenses/cgconfig.aug b/lenses/cgconfig.aug
@@ -28,7 +28,7 @@ module Cgconfig =
 
    let id        = /[a-zA-Z0-9_\/.-]+/
    let name      = /[^#= \n\t{}\/]+/
-   let cont_name = /(cpuacct|cpu|devices|ns|cpuset|memory|freezer|net_cls)/
+   let cont_name = /(cpuacct|cpu|devices|ns|cpuset|memory|freezer|net_cls|blkio|hugetlb|perf_event)/
    let role_name = /(admin|task)/
    let id_name   = /(uid|gid)/
    let address   = /[^#; \n\t{}]+/

diff --git a/lenses/tests/test_cgconfig.aug b/lenses/tests/test_cgconfig.aug
@@ -257,3 +257,44 @@ test Cgconfig.lns get group4 =
 test Cgconfig.lns put "group tst {memory {}}" after
   set "/group" "tst2"
 = "group tst2 {memory {}}"
+
+let group5="
+group user {
+	cpuacct {}
+        cpu {}
+        cpuset {}
+        devices {}
+        freezer {}
+        memory {}
+        net_cls {}
+        blkio {}
+        hugetlb {}
+        perf_event {}
+}"
+
+test Cgconfig.lns get group5 =
+  {  }
+  { "group" = "user"
+    {  }
+    { "controller" = "cpuacct" }
+    {  }
+    { "controller" = "cpu" }
+    {  }
+    { "controller" = "cpuset" }
+    {  }
+    { "controller" = "devices" }
+    {  }
+    { "controller" = "freezer" }
+    {  }
+    { "controller" = "memory" }
+    {  }
+    { "controller" = "net_cls" }
+    {  }
+    { "controller" = "blkio" }
+    {  }
+    { "controller" = "hugetlb" }
+    {  }
+    { "controller" = "perf_event" }
+    {  }
+  }
+