Skip to content
Snippets Groups Projects
Commit a19f8203 authored by jurgenhaas's avatar jurgenhaas
Browse files

Bug fixes

parent 2a9288b9
No related branches found
No related tags found
No related merge requests found
import json import json
import os import os
import requests import requests
import tempfile
from ansible.callbacks import vv from ansible.callbacks import vv
from ansible.errors import AnsibleError as ae from ansible.errors import AnsibleError as ae
...@@ -48,7 +49,7 @@ class ActionModule(object): ...@@ -48,7 +49,7 @@ class ActionModule(object):
if just_download: if just_download:
self.force_update = False self.force_update = False
self.cache_file_name = os.tmpnam() self.cache_file_name = tempfile.mktemp(prefix='sd_', suffix='.json')
cleanup = False cleanup = False
result = {} result = {}
...@@ -57,7 +58,7 @@ class ActionModule(object): ...@@ -57,7 +58,7 @@ class ActionModule(object):
if just_download: if just_download:
vv('Downloaded settings to %s' % self.cache_file_name) vv('Downloaded settings to %s' % self.cache_file_name)
return return ReturnData(conn=conn, comm_ok=True, result=result)
services = {} services = {}
devicegroup_alerts = {} devicegroup_alerts = {}
...@@ -200,7 +201,11 @@ class ActionModule(object): ...@@ -200,7 +201,11 @@ class ActionModule(object):
decoder = json.JSONDecoder() decoder = json.JSONDecoder()
content = decoder.decode(request_result.content) content = decoder.decode(request_result.content)
if request_result.status_code != 200: if request_result.status_code != 200:
raise ae('%s' % content['message']) msg = content['message']
if content['errors']:
for error in content['errors']:
msg += ' // ' + error['description']
raise ae('%s' % msg)
return content return content
def _get_device_id(self, hostname): def _get_device_id(self, hostname):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment