X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=geni%2Futil%2Fgeniclient.py;h=4bee85d8e498cac3a5eb67c2723cc740308efb12;hb=53b94f53174bf915aff6dd2c1b725ddece152ac6;hp=1e010bd8f1c1fd6d9840d033ed25914efb9ac160;hpb=81c04907e8bf5a83d39c0e29da3be8d40d55278f;p=sfa.git

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index 1e010bd8..4bee85d8 100644
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -243,21 +243,13 @@ class GeniClient():
     # Aggregate Interface
     #-------------------------------------------------------------------------
     
-    ## list components
-    #
-    # 
-    def list_nodes(self, cred):
-        
-        result = self.server.list_nodes(cred.save_to_string(save_parents=True))
-        return result
-
     ## list resources
     #
     # @param cred a credential
     # @param hrn slice hrn
 
-    def get_resources(self, cred, hrn=None):
-        result = self.server.get_resources(cred.save_to_string(save_parents=True), hrn)
+    def resources(self, cred, hrn=None):
+        result = self.server.resources(cred.save_to_string(save_parents=True), hrn)
         return result
 
     ## get policy
@@ -337,8 +329,8 @@ class GeniClient():
     #
     # @return a list of slice names
 
-    def list_slices(self, cred):
-        result = self.server.list_slices(cred.save_to_string(save_parents=True))
+    def slices(self, cred):
+        result = self.server.slices(cred.save_to_string(save_parents=True))
         return result
 
     ##