software/fluentd: Finalize instance parameter form

See merge request !1572

software/fluentd/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance-profile]
 filename = instance.cfg
-md5sum = 82c476f22e6b55b674640abef959c3c2
+md5sum = 1fe38a024766347454ad7a3d9fb52d01
 
 [template-fluentd]
 filename = instance-fluentd.cfg

software/fluentd/instance-input-schema.json

@@ -4,10 +4,11 @@
   "description": "Parameters to instantiate Fluentd",
   "additionalProperties": false,
   "properties": {
-    "conf_text": {
-      "description": "Fluentd configuration. You can write it entirely by yourself. See fluentd-agent.conf.jinja2.in",
-      "default": "",
-      "type": "string"
+    "conf-text": {
+      "title": "Configuration",
+      "description": "Fluentd configuration. See: https://docs.fluentd.org/configuration",
+      "type": "string",
+      "textarea": true
     }
   }
 }

software/fluentd/instance.cfg

@@ -42,7 +42,7 @@ recipe = slapos.recipe.build
 slapparameter-dict = $${slap-configuration:configuration}
 init =
   import re
-  options['text'] = options['slapparameter-dict'].get('conf_text') or ' '
+  options['text'] = options['slapparameter-dict'].get('conf-text') or ' '
   options['port-list'] = re.findall(r'<source>.*port (\d+).*<\/source>', options['text'], re.DOTALL)
 
 [fluentd-agent-conf]

software/fluentd/software.cfg.json

+{
+  "name": "Fluentd",
+  "description": "Fluentd",
+  "serialisation": "xml",
+  "software-type": {
+    "default": {
+      "title": "Default",
+      "description": "Fluentd",
+      "request": "instance-input-schema.json",
+      "index": 0
+    }
+  }
+}

software/fluentd/test/test.py

@@ -88,7 +88,7 @@ class WendelinTutorialTestCase(FluentdTestCase):
 
   @classmethod
   def getInstanceParameterDict(cls):
-    return {'conf_text': cls._conf,}
+    return {'conf-text': cls._conf,}
 
   @classmethod
   def measureDict(cls):