From 8d139b9368a85b9e8b4017ba14b91552e000a795 Mon Sep 17 00:00:00 2001 From: Ryan Brown Date: Tue, 29 Jul 2014 10:15:17 -0400 Subject: [PATCH] Stop software_deployments from passing empty keys When software_deployments was given a body missing the "input_values" field it would pass update info with input_values=None, which would later fail and cause an internal server error. This change prevents software_deployments from passing on NoneType values. Change-Id: I02e9c08bbd7429d808de1451de12cc02fc879ecb Closes-Bug: 1319825 --- heat/api/openstack/v1/software_deployments.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/heat/api/openstack/v1/software_deployments.py b/heat/api/openstack/v1/software_deployments.py index 58d18a206c..ddbee7eaea 100644 --- a/heat/api/openstack/v1/software_deployments.py +++ b/heat/api/openstack/v1/software_deployments.py @@ -85,7 +85,8 @@ class SoftwareDeploymentController(object): """ update_data = dict((k, body.get(k)) for k in ( 'config_id', 'input_values', 'output_values', 'action', - 'status', 'status_reason')) + 'status', 'status_reason') + if body.get(k, None) is not None) sd = self.rpc_client.update_software_deployment(req.context, deployment_id, **update_data)