From: Josh Karlin <jkarlin@bbn.com>
Date: Fri, 16 Apr 2010 20:24:25 +0000 (+0000)
Subject: Adding final few functions to GENI AM
X-Git-Tag: geni-apiv1-totrunk~55
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=e9162f83292361d81fcc9b241191a0b84baac87c

Adding final few functions to GENI AM
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index b280c26e..45635d0e 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -155,7 +155,11 @@ class Sfi:
                   "GetVersion": "name",
                   "ListResources": "name",
                   "CreateSliver": "name",
-                  "get_geni_aggregates": "name"
+                  "get_geni_aggregates": "name",
+                  "DeleteSliver": "name",
+                  "SliverStatus": "name",
+                  "RenewSliver": "name",
+                  "Shutdown": "name"
                  }
 
         if additional_cmdargs:
@@ -959,6 +963,14 @@ class Sfi:
         rspec = open(rspec_file).read()
         server = self.geni_am
         return server.CreateSliver(slice_xrn, [slice_cred], rspec)
+    
+    def DeleteSliver(self, opts, args):
+        slice_xrn = args[0]
+        user_cred = self.get_user_cred()
+        slice_cred = self.get_slice_cred(slice_xrn).save_to_string(save_parents=True)
+        server = self.geni_am
+        return server.DeleteSliver(slice_xrn, [slice_cred])    
+    
     #
     # Main: parse arguments and dispatch to command
     #
diff --git a/sfa/managers/geni_am_pl.py b/sfa/managers/geni_am_pl.py
index ec152dba..c91bf1dc 100644
--- a/sfa/managers/geni_am_pl.py
+++ b/sfa/managers/geni_am_pl.py
@@ -63,4 +63,8 @@ def SliverStatus(api, slice_xrn):
     return result
 
 def RenewSliver(api, slice_xrn, creds, renew_time):
-    return False
\ No newline at end of file
+    return False
+
+def Shutdown(api, slice_xrn, creds):
+    return False
+
diff --git a/sfa/methods/__init__.py b/sfa/methods/__init__.py
index da9e5c3f..243db987 100644
--- a/sfa/methods/__init__.py
+++ b/sfa/methods/__init__.py
@@ -33,4 +33,5 @@ get_geni_aggregates
 DeleteSliver
 SliverStatus
 RenewSliver
+Shutdown
 """.split()
diff --git a/sfa/trust/rights.py b/sfa/trust/rights.py
index 36006376..bef63824 100644
--- a/sfa/trust/rights.py
+++ b/sfa/trust/rights.py
@@ -22,7 +22,7 @@ privilege_table = {"authority": ["register", "remove", "update", "resolve", "lis
                    "sa": ["getticket", "redeemslice", "redeemticket", "createslice", "deleteslice", "updateslice", 
                           "getsliceresources", "getticket", "loanresources", "stopslice", "startslice", "renewsliver",
                           "deleteslice", "resetslice", "listslices", "listnodes", "getpolicy", "createsliver", "sliverestatus"],
-                   "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver",  "deleteslice", "updateslice", "getsliceresources"],
+                   "embed": ["getticket", "redeemslice", "redeemticket", "createslice", "createsliver",  "deleteslice", "updateslice", "getsliceresources", "shutdown"],
                    "bind": ["getticket", "loanresources", "redeemticket"],
                    "control": ["updateslice", "createslice", "createsliver", "stopslice", "startslice", "deleteslice", "resetslice", "getsliceresources", "getgids"],
                    "info": ["listslices", "listnodes", "getpolicy"],