git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Activity module - fixing request.user error
[myslice.git]
/
rest
/
sfa_api.py
diff --git
a/rest/sfa_api.py
b/rest/sfa_api.py
index
2cfb639
..
cc9f9a1
100644
(file)
--- a/
rest/sfa_api.py
+++ b/
rest/sfa_api.py
@@
-186,6
+186,7
@@
def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
elif 'user_credential' in user_config:
user_cred = user_config['user_credential']
else:
elif 'user_credential' in user_config:
user_cred = user_config['user_credential']
else:
+ logger.error("no user credentials for user = ", user_email)
user_cred = {}
if object_type:
user_cred = {}
if object_type:
@@
-197,6
+198,11
@@
def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
for obj_name, cred in user_config['%s_credentials'%object_type].items():
if obj_name == hrn:
object_cred = cred
for obj_name, cred in user_config['%s_credentials'%object_type].items():
if obj_name == hrn:
object_cred = cred
+ else:
+ logger.error("no credentials for object")
+ logger.error(object_type)
+ logger.error(object_name)
+ object_cred = {}
# Both AM & Registry
if method == "GetVersion":
# Both AM & Registry
if method == "GetVersion":
@@
-226,7
+232,9
@@
def sfa_client(request, method, hrn=None, urn=None, object_type=None, rspec=None
# else GetVersion = v3
else:
result = server.Describe([urn] ,[object_cred], api_options)
# else GetVersion = v3
else:
result = server.Describe([urn] ,[object_cred], api_options)
- dict_result = xmltodict.parse(result['value']['geni_rspec'])
+ if isinstance(result, dict):
+ if result['value'] != 0:
+ dict_result = xmltodict.parse(result['value']['geni_rspec'])
result['parsed'] = dict_result
if 'rspec' in dict_result and 'node' in dict_result['rspec']:
result['parsed'] = dict_result
if 'rspec' in dict_result and 'node' in dict_result['rspec']: