ncm-chkconfig: add chkconfig function to enable/disable services

quattor · Aug 10, 2017 · 479dc3c · 479dc3c
1 parent c34d49b
commit 479dc3c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/ncm-chkconfig/src/main/pan/components/chkconfig/config.pan b/ncm-chkconfig/src/main/pan/components/chkconfig/config.pan
@@ -1,19 +1 @@
-# ${license-info}
-# ${developer-info}
-# ${author-info}
-# ${build-info}
-
-unique template components/${project.artifactId}/config;
-
-include 'components/${project.artifactId}/schema';
-
-bind "/software/components/${project.artifactId}" = component_chkconfig_type;
-
-# Set prefix to root of component configuration.
-prefix '/software/components/${project.artifactId}';
-'active' ?= true;
-'dispatch' ?= true;
-'dependencies/pre' ?= list("spma");
-
-# Package to install
-"/software/packages" = pkg_repl("ncm-${project.artifactId}", "${no-snapshot-version}-${rpm.release}", "noarch");
+${componentconfig}
diff --git a/ncm-chkconfig/src/main/pan/components/chkconfig/schema.pan b/ncm-chkconfig/src/main/pan/components/chkconfig/schema.pan
@@ -1,8 +1,4 @@
-# ${license-info}
-# ${developer-info}
-# ${author-info}
-
-declaration template components/chkconfig/schema;
+${componentschema}
 
 include 'quattor/types/component';
 
@@ -37,6 +33,23 @@ function chkconfig_allow_combinations = {
     true;
 };
 
+@{Enables (on + startstop&#61;true) all arguments as services.
+  If argument starts with a -, it is disabled (off + startstop&#61;true).
+  Use as e.g.
+    "/software/components" &#61; chkconfig("service1", "-service2");
+}
+function chkconfig = {
+    foreach (idx;arg;ARGV) {
+        m = matches(arg, '^(-)?(.*)$');
+        what = 'on';
+        if (m[1] == '-') {
+            what = 'off';
+        };
+        SELF['chkconfig']['service'][escape(m[2])] = dict(what, '', 'startstop', true);
+    };
+    SELF;
+};
+
 type service_type = {
     "name" ? string
     "add" ? boolean
@@ -47,7 +60,7 @@ type service_type = {
     "startstop" ? boolean
 } with chkconfig_allow_combinations(SELF);
 
-type component_chkconfig_type = {
+type ${project.artifactId}_component = {
     include structure_component
     "service" : service_type{}
     "default" ? string with match (SELF, '^(ignore|off)$')

diff --git a/ncm-chkconfig/src/test/perl/component.t b/ncm-chkconfig/src/test/perl/component.t
@@ -63,5 +63,11 @@ isa_ok($cmd, "CAF::Process", "Command for service --del test_del (off first) run
 $cmd = get_command("/sbin/chkconfig --del test_del")->{object};
 isa_ok($cmd, "CAF::Process", "Command for service --del test_del run");
 
+is_deeply($cfg->getTree("/software/components/chkconfig/service/{test_enable}"),
+          {'on', '', 'startstop', 1},
+         'chkconfig function creates correct enabled service');
+is_deeply($cfg->getTree("/software/components/chkconfig/service/{test_disable}"),
+          {'off', '', 'startstop', 1},
+         'chkconfig function creates correct disabled service');
 
 done_testing();
diff --git a/ncm-chkconfig/src/test/resources/simple_services.pan b/ncm-chkconfig/src/test/resources/simple_services.pan
@@ -17,3 +17,6 @@ prefix "/software/components/chkconfig/service";
 # the service has to exists and/or turned on
 "{test_off}" = dict("off","45");
 "{test_del}" = dict("del",true,);
+
+# test function
+"/software/components" = chkconfig("test_enable", "-test_disable");