Makefile used to build/install/uninstall geniwrapper

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

diff --git a/geni/util/geniclient.py b/geni/util/geniclient.py
index 881c63a..4571fa8 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,44 @@ class GeniClient():
     # Aggregate Interface
     #-------------------------------------------------------------------------
     
-    ## Get components
+    ## list resources
     #
-    # 
-    def list_components(self):
-        result = self.server.list_components()
+    # @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
 
-    def list_resources(self, cred, hrn):
+    def get_aggregates(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 +322,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
 
     ##
@@ -310,8 +333,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 get_slices(self, cred):
+        result = self.server.get_slices(cred.save_to_string(save_parents=True))
         return result
 
     ##