Commit 7def795f authored by Łukasz Nowak's avatar Łukasz Nowak

Do nothing if json parameters are not transmitted.

parent fa548541
...@@ -467,27 +467,32 @@ class ComputerPublisher(GenericPublisher): ...@@ -467,27 +467,32 @@ class ComputerPublisher(GenericPublisher):
return error_dict return error_dict
error_dict = {} error_dict = {}
transmitted = False
if 'partition' in self.jbody: if 'partition' in self.jbody:
error_dict.update(getErrorDict(self.jbody['partition'], error_dict.update(getErrorDict(self.jbody['partition'],
('title', 'public_ip', 'private_ip', 'tap_interface'), 'partition')) ('title', 'public_ip', 'private_ip', 'tap_interface'), 'partition'))
transmitted = True
if 'software' in self.jbody: if 'software' in self.jbody:
error_dict.update(getErrorDict(self.jbody['software'], error_dict.update(getErrorDict(self.jbody['software'],
('software_release', 'status', 'log'), 'software')) ('software_release', 'status', 'log'), 'software'))
transmitted = True
# XXX: Support status as enum.
if error_dict: if error_dict:
self.REQUEST.response.setStatus(400) self.REQUEST.response.setStatus(400)
self.REQUEST.response.setBody(jsonify(error_dict)) self.REQUEST.response.setBody(jsonify(error_dict))
return self.REQUEST.response return self.REQUEST.response
try: if transmitted:
computer.Computer_updateFromJson(self.jbody) try:
except Exception: computer.Computer_updateFromJson(self.jbody)
transaction.abort() except Exception:
LOG('VifibRestApiV1Tool', ERROR, transaction.abort()
'Problem while trying to update computer:', error=True) LOG('VifibRestApiV1Tool', ERROR,
self.REQUEST.response.setStatus(500) 'Problem while trying to update computer:', error=True)
self.REQUEST.response.setBody(jsonify({'error': self.REQUEST.response.setStatus(500)
'There is system issue, please try again later.'})) self.REQUEST.response.setBody(jsonify({'error':
return self.REQUEST.response 'There is system issue, please try again later.'}))
return self.REQUEST.response
self.REQUEST.response.setStatus(204) self.REQUEST.response.setStatus(204)
return self.REQUEST.response return self.REQUEST.response
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment