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
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
sfa
/
methods
/
ListResources.py
diff --git
a/sfa/methods/ListResources.py
b/sfa/methods/ListResources.py
index
c05d697
..
b7ac0b7
100644
(file)
--- a/
sfa/methods/ListResources.py
+++ b/
sfa/methods/ListResources.py
@@
-39,7
+39,7
@@
class ListResources(Method):
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
if not origin_hrn:
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
if not origin_hrn:
- origin_hrn = Credential(
string
=valid_creds[0]).get_gid_caller().get_hrn()
+ origin_hrn = Credential(
cred
=valid_creds[0]).get_gid_caller().get_hrn()
rspec = self.api.manager.ListResources(self.api, creds, options)
# filter rspec through sfatables
rspec = self.api.manager.ListResources(self.api, creds, options)
# filter rspec through sfatables