Meraki module utility request() has improved error reporting (#39838)

* request() has improved error reporting
- 5xx errors show same as before
- 3xx and 4xx errors show error body

* Print body for errors greater than 300, but less than 500

* Remove trailing whitespace

(cherry picked from commit dd31dcab70)
(cherry picked from commit d75f821f0c)
pull/42531/head
Kevin Breit 8 years ago committed by Matt Clay
parent 6e479d5989
commit 1d759ffa2f

@ -240,8 +240,11 @@ class MerakiModule(object):
self.response = info['msg']
self.status = info['status']
if self.status >= 300:
if self.status >= 500:
self.fail_json(msg='Request failed for {url}: {status} - {msg}'.format(**info))
elif self.status >= 300:
self.fail_json(msg='Request failed for {url}: {status} - {msg}'.format(**info),
body=json.loads(to_native(info['body'])))
try:
return json.loads(to_native(resp.read()))
except:

Loading…
Cancel
Save