git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix iot-lab driver bug ldap connection invalid
[sfa.git]
/
sfa
/
iotlab
/
OARrestapi.py
diff --git
a/sfa/iotlab/OARrestapi.py
b/sfa/iotlab/OARrestapi.py
index
a4ce7a8
..
20091e4
100644
(file)
--- a/
sfa/iotlab/OARrestapi.py
+++ b/
sfa/iotlab/OARrestapi.py
@@
-228,8
+228,8
@@
class OARrestapi:
# % (error))
#raise ServerError("GET_OAR_SRVR : Could not reach OARserver")
if resp.status >= 400:
# % (error))
#raise ServerError("GET_OAR_SRVR : Could not reach OARserver")
if resp.status >= 400:
- raise ValueError ("Response Error %s, %s" %(resp.status,
- resp.reason))
+ raise ValueError ("Response Error %s, %s
, %s
" %(resp.status,
+ resp.reason
, resp.read()
))
try:
js_dict = json.loads(body)
#print "\r\n \t\t\t js_dict keys" , js_dict.keys(), " \r\n", js_dict
try:
js_dict = json.loads(body)
#print "\r\n \t\t\t js_dict keys" , js_dict.keys(), " \r\n", js_dict
@@
-286,8
+286,8
@@
class OARrestapi:
conn.close()
if resp.status >= 400:
conn.close()
if resp.status >= 400:
- raise ValueError ("Response Error %s, %s" %(resp.status,
- resp.reason))
+ raise ValueError ("Response Error %s, %s
, %s
" %(resp.status,
+ resp.reason
, body
))
try:
try:
@@
-807,7
+807,7
@@
class OARGETParser:
:rtype: dict
.. warning:: unused
:rtype: dict
.. warning:: unused
- .. seealso:: GetSites (Iotlab
TestbedAPI
)
+ .. seealso:: GetSites (Iotlab
Shell
)
"""
self.ChangeRawJsonDependingOnApilibVersion()
"""
self.ChangeRawJsonDependingOnApilibVersion()