From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 20 Oct 2012 00:32:10 +0000 (-0400)
Subject: fix Delete
X-Git-Tag: sfa-3.0-0~105
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=405be3a2a2041d46fd1c4b5d88fe2e130da4cc0e

fix Delete
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index e9759399..004f4398 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -1183,7 +1183,7 @@ or with an slice hrn, shows currently provisioned resources
         api_options ['call_id'] = unique_call_id()
         if options.show_credential:
             show_credentials(creds)
-        result = server.Delete(slice_urn, creds, *self.ois(server, api_options ) )
+        result = server.Delete([slice_urn], creds, *self.ois(server, api_options ) )
         value = ReturnValue.get_value(result)
         if self.options.raw:
             save_raw_to_file(result, self.options.raw, self.options.rawformat, self.options.rawbanner)
diff --git a/sfa/methods/Delete.py b/sfa/methods/Delete.py
index 74ff8384..8233fb75 100644
--- a/sfa/methods/Delete.py
+++ b/sfa/methods/Delete.py
@@ -17,7 +17,7 @@ class Delete(Method):
     
     accepts = [
         Parameter(type([str]), "Human readable name of slice to delete (hrn or urn)"),
-        Parameter(dict, "Credentials"),
+        Parameter(type([dict]), "Credentials"),
         Parameter(dict, "options"),
         ]
 
diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 65573a9a..f00f1ebe 100644
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -721,7 +721,7 @@ class PlDriver (Driver):
             node_ids = ids
         else:
             node_ids = slice['node_ids']
-     
+        slice_hrn = PlXrn(auth=self.hrn, slicename=slice['name']).get_hrn()     
         # determine if this is a peer slice
         # xxx I wonder if this would not need to use PlSlices.get_peer instead 
         # in which case plc.peers could be deprecated as this here