Merge pull request #81 from xebialabs-community/controltask

Issue #69: Allowing empty parameters

Author: jdewinne

build.gradle

@@ -11,9 +11,9 @@ apply plugin: 'maven'
 
 xlDocker {
   compileImage = 'xebialabs/xlr_dev_compile'
-  compileVersion = 'v7.1.0.4'
+  compileVersion = 'v7.2.0.1'
   runImage = 'xebialabs/xlr_dev_run'
-  runVersion = 'v7.1.0.1'
+  runVersion = 'v7.2.0.1'
   runPortMapping = '15516:5516'
 }
 

src/main/resources/synthetic.xml

@@ -18,7 +18,7 @@
     <type type="xldeploy.Server" extends="xldeploy.XLDeployServer"/>
 
     <type type="xldeploy.VirtualTask" extends="xlrelease.PythonScript" virtual="true">
-        <property name="iconLocation" default="xlr_xldeploy/xldeploy-icon-black-small.png" hidden="true"/>
+        <property name="iconLocation" default="xlrxldeploy/xl-deploy.svg" hidden="true"/>
         <property name="taskColor" hidden="true" default="#68B749"/>
     </type>
 
@@ -84,7 +84,7 @@
 
     </type>
 
-    <type type="xldeploy.ControlTask" label="XL Deploy: Control task" extends="xldeploy.TaskRunningTask"
+    <type type="xldeploy.ControlTask" label="XL Deploy: Control task extended" extends="xldeploy.TaskRunningTask"
           description="Invokes a control task on an XL Deploy Configuration Item">
         <property name="scriptLocation" default="xlr_xldeploy/controlTask.py" hidden="true"/>
 

src/main/resources/xlr_xldeploy/XLDeployClient.py

@@ -132,11 +132,12 @@ def prepare_control_task(self, control_task_name, target_ci_id, parameters=None)
                            target_ci_id, prepare_response.status, prepare_response.response))
         control_obj = prepare_response.getResponse()
         root = ET.fromstring(control_obj)
-        parameter_type_id = get_parameter_type_name(root)
-        if parameter_type_id:
-            parameter_names = self.get_parameter_names(parameter_type_id)
-            for parameterName in parameter_names:
-                add_parameter(root, parameter_type_id, parameterName, parameters)
+        if parameters:
+            parameter_type_id = get_parameter_type_name(root)
+            if parameter_type_id:
+                parameter_names = self.get_parameter_names(parameter_type_id)
+                for parameterName in parameter_names:
+                    add_parameter(root, parameter_type_id, parameterName, parameters)
         invoke_response = self.http_request.post('/deployit/control', ET.tostring(root), contentType='application/xml')
         check_response(invoke_response, "Failed to create control task [%s]. Server return [%s], with content [%s]" % (
             target_ci_id, invoke_response.status, invoke_response.response))

src/main/resources/xlr_xldeploy/xldeploy-icon-black-small.png

@@ -10,14 +10,14 @@
 
 
 xld1:
-  image: xebialabs/xl-docker-demo-xld:v7.1.0.1
+  image: xebialabs/xl-docker-demo-xld:v7.2.0.1
   volumes:
     - ~/xl-licenses:/license
   ports:
    - "14516:4516"
 
 xld2:
-  image: xebialabs/xl-docker-demo-xld:v7.1.0.1
+  image: xebialabs/xl-docker-demo-xld:v7.2.0.1
   volumes:
     - ~/xl-licenses:/license
   links:
@@ -26,7 +26,7 @@ xld2:
    - "24516:4516"
 
 xlr:
-  image: xebialabs/xlr_dev_run:v7.1.0.1
+  image: xebialabs/xlr_dev_run:v7.2.0.1
   volumes:
     - ~/xl-licenses:/license
     - ./../../../../:/data