From: Tony Mack <tmack@cs.princeton.edu>
Date: Tue, 24 Mar 2009 16:02:44 +0000 (+0000)
Subject: list nodes now collapsed into list resources
X-Git-Tag: sfa-0.9-0@14641~544
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9e4245c7644a9a2f72ba9aa8c39fe48119c14a4b;hp=9c1a4828f9007bf48f57f88591d8518a326ffb32;p=sfa.git

list nodes now collapsed into list resources
---

diff --git a/geni/slicemgr.py b/geni/slicemgr.py
index 5b8a43a5..2abfc373 100644
--- a/geni/slicemgr.py
+++ b/geni/slicemgr.py
@@ -411,9 +411,12 @@ class SliceMgr(GeniServer):
         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')
-        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')