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
list nodes now collapsed into list resources
[sfa.git]
/
geni
/
slicemgr.py
diff --git
a/geni/slicemgr.py
b/geni/slicemgr.py
index
5b8a43a
..
2abfc37
100644
(file)
--- a/
geni/slicemgr.py
+++ b/
geni/slicemgr.py
@@
-411,9
+411,12
@@
class SliceMgr(GeniServer):
self.decode_authentication(cred, 'listslices')
return self.getSlices()
self.decode_authentication(cred, 'listslices')
return self.getSlices()
- def get_resources(self, cred, hrn):
+ def get_resources(self, cred, hrn
=None
):
self.decode_authentication(cred, 'listnodes')
self.decode_authentication(cred, 'listnodes')
- return self.getResources(hrn)
+ if not hrn:
+ return self.getNodes()
+ else:
+ return self.getResources(hrn)
def get_ticket(self, cred, hrn, rspec):
self.decode_authentication(cred, 'getticket')
def get_ticket(self, cred, hrn, rspec):
self.decode_authentication(cred, 'getticket')