rename list_slices to slices

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

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index 580fc61..4bee85d 100644 (file)
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -152,9 +152,9 @@ class GeniClient():
     # @return a credental object
 
     def get_credential(self, cred, type, name):
-        if cred == None:
-            return self.get_self_credential(type, name)
-        cred_str = self.server.get_credential(cred.save_to_string(save_parents=True), type, name)
+        if cred:
+            cred = cred.save_to_string(save_parents=True) 
+        cred_str = self.server.get_credential(cred, type, name)
         return Credential(string = cred_str)
 
     ##
@@ -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
 
     ##