X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=geni%2Futil%2Fgeniclient.py;h=580fc611be8ac1ad048f0756944e7223d13fe706;hb=9c1a4828f9007bf48f57f88591d8518a326ffb32;hp=881c63ab8aed965c45ce23f4682108799fd8af87;hpb=0f4c910888b54e8b0fb7eeae729c7407ae4d8a83;p=sfa.git

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index 881c63ab..580fc611 100644
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -243,21 +243,48 @@ class GeniClient():
     # Aggregate Interface
     #-------------------------------------------------------------------------
     
-    ## Get components
+    ## 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
 
-    def list_resources(self, cred, hrn):
+    ## 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)
         return result
 
+    ## get policy
+    #
+    # @param cred a credential
+
     def get_policy(self, cred):
         result = self.server.get_policy(cred.save_to_string(save_parents=True))
         return result
 
+    ## create slice
+    #
+    # @param cred a credential
+    # @param rspec resource specification defining how to instantiate the slice
+    
+    def create_slice(self, cred, hrn, rspec):
+        result = self.server.create_slice(cred.save_to_string(save_parents=True), hrn, rspec)
+        return result
+
+
+    ## delete slice
+    #
+    # @param cred a credential
+    # @param hrn slice to delete
+    def delete_slice(self, cred, hrn):
+        result = self.server.delete_slice(cred.save_to_string(save_parents=True), hrn)
+        return result    
 
     # ------------------------------------------------------------------------
     # Slice Interface
@@ -299,8 +326,8 @@ class GeniClient():
     # @param cred a credential identifying the caller (callerGID) and the slice
     #     (objectGID)
 
-    def delete_slice(self, cred):
-        result = self.server.delete_slice(cred.save_to_string(save_parents=True))
+    def delete_slice(self, cred, hrn):
+        result = self.server.delete_slice(cred.save_to_string(save_parents=True), hrn)
         return result
 
     ##