diff options
| author |   dfilppi <dewayne@cloudify.co> | 2017-12-09 20:16:48 +0000 |
|---|---|---|
| committer | dfilppi <dewayne@cloudify.co> | 2017-12-09 20:29:41 +0000 |
| commit | e90193610f292c7d000f51592d03ebefdb8cd8d6 (patch) | |
| tree | d38174c0d12d992cddde94e5f9ab81425e48266e /aria/aria-rest-server/src | |
| parent | d6d744b6ac31ef19fe52bf2715bd1dd23e38961c (diff) | |
Null POST/PUT bodies were causing REST failures
Change-Id: I11725dfd1feb7b080160a361cd9fec65bba4bf78
Issue-ID: SO-356
Signed-off-by: DeWayne Filppi <dewayne@cloudify.co>
Diffstat (limited to 'aria/aria-rest-server/src')
| -rw-r--r-- | aria/aria-rest-server/src/main/python/aria-rest/aria_rest/rest.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/aria/aria-rest-server/src/main/python/aria-rest/aria_rest/rest.py b/aria/aria-rest-server/src/main/python/aria-rest/aria_rest/rest.py index 45fb4299d9..7b9223d1c9 100644 --- a/aria/aria-rest-server/src/main/python/aria-rest/aria_rest/rest.py +++ b/aria/aria-rest-server/src/main/python/aria-rest/aria_rest/rest.py @@ -116,7 +116,7 @@ def install_template(template_name, model_storage, resource_storage, elif rtype == "json": - body = request.json + body = request.json or {} # Check body if "service_template_path" in body: @@ -169,7 +169,7 @@ def validate_template(model_storage, resource_storage, plugin_manager, logger): """ Validates a TOSCA template """ - body = request.json + body = request.json or {} # Check body if "service_template_path" in body: @@ -385,7 +385,7 @@ def create_service(template_id, service_name, model_storage, resource_storage, """ Creates a service from the specified service template """ - body = request.json + body = request.json or {} inputs = {} if 'inputs' in body: inputs = body['inputs'] @@ -542,7 +542,7 @@ def start_execution( """ Start an execution for the specified service """ - body = request.json + body = request.json or {} executor = DryExecutor( ) if 'executor' in body and body['executor'] == 'dry' else None @@ -585,7 +585,7 @@ def resume_execution( """ Resume the specified execution """ - body = request.json + body = request.json or {} execution = model_storage.execution.get(execution_id) if execution.status != execution.status.CANCELLED: return "cancelled execution cannot be resumed", 400 @@ -619,7 +619,7 @@ def cancel_execution(execution_id, model_storage, logger): Cancel the specified execution """ logger.info("cancelling execution {}".format(execution_id)) - body = request.json + body = request.json or {} try: execution = model_storage.execution.get(execution_id) |