list nodes now collapsed into list resources

[sfa.git] / geni / util / geniclient.py

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index 6702b06..580fc61 100644 (file)
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -246,8 +246,9 @@ class GeniClient():
     ## list components
     #
     # 
-    def list_components(self):
-        result = self.server.list_components()
+    def list_nodes(self, cred):
+        
+        result = self.server.list_nodes(cred.save_to_string(save_parents=True))
         return result
 
     ## list resources
@@ -255,7 +256,7 @@ class GeniClient():
     # @param cred a credential
     # @param hrn slice hrn
 
-    def list_resources(self, cred, hrn):
+    def get_resources(self, cred, hrn=None):
         result = self.server.get_resources(cred.save_to_string(save_parents=True), hrn)
         return result
 
@@ -336,7 +337,7 @@ class GeniClient():
     #
     # @return a list of slice names
 
-    def list_slices(self, cred, hrn):
+    def list_slices(self, cred):
         result = self.server.list_slices(cred.save_to_string(save_parents=True))
         return result