Merge cc3d0df into 4637be7

reanahub · Jul 26, 2017 · 380a6a5 · 380a6a5
2 parents 4637be7 + cc3d0df
commit 380a6a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/docs/openapi.json b/docs/openapi.json
@@ -120,25 +120,11 @@
             "type": "string"
           },
           {
-            "description": "Specification with necessary data to instantiate a yadage workflow.",
+            "description": "Workflow specification with necessary data to instantiate a yadage workflow.",
             "in": "body",
-            "name": "yadage_payload",
+            "name": "workflow",
             "required": true,
             "schema": {
-              "properties": {
-                "nparallel": {
-                  "type": "integer"
-                },
-                "preset_pars": {
-                  "type": "object"
-                },
-                "toplevel": {
-                  "type": "string"
-                },
-                "workflow": {
-                  "type": "string"
-                }
-              },
               "type": "object"
             }
           }

diff --git a/reana_workflow_controller/rest.py b/reana_workflow_controller/rest.py
@@ -173,22 +173,13 @@ def yadage_endpoint():  # noqa
           description: Required. UUID of workflow owner.
           required: true
           type: string
-        - name: yadage_payload
+        - name: workflow
           in: body
-          description: Specification with necessary data to instantiate a
-            yadage workflow.
+          description: Workflow specification with necessary data to
+            instantiate a yadage workflow.
           required: true
           schema:
             type: object
-            properties:
-              toplevel:
-                type: string
-              workflow:
-                type: string
-              nparallel:
-                type: integer
-              preset_pars:
-                type: object
       responses:
         200:
           description: >-
@@ -212,6 +203,7 @@ def yadage_endpoint():  # noqa
     """
     try:
         if request.json:
+            # validate request and change parameter names in RWEY
             queue = organization_to_queue[request.args.get('organization')]
             resultobject = run_yadage_workflow.apply_async(
                 args=[request.json],