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 f3013df..580fc61 100644 (file)
--- a/geni/util/geniclient.py
+++ b/geni/util/geniclient.py
@@ -238,6 +238,54 @@ class GeniClient():
         result = self.server.update(cred.save_to_string(save_parents=True), record.as_dict())
         return result
 
+
+    #-------------------------------------------------------------------------
+    # 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)
+        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
     # ------------------------------------------------------------------------
@@ -278,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
 
     ##