Merge remote-tracking branch 'origin/geni-v3' into geni-v3

[sfa.git] / sfa / methods / Shutdown.py

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index d288036..3eee878 100644 (file)
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -13,15 +13,16 @@ class Shutdown(Method):
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
-        Parameter(type(dict), "Credentials"),
+        Parameter(type([dict]), "Credentials"),
         ]
     returns = Parameter(bool, "Success or Failure")
 
     def call(self, xrn, creds):
 
-        valid_creds = self.api.auth.checkCredentials(creds, 'stopslice', xrn)
+        valid_creds = self.api.auth.checkCredentials(creds, 'stopslice', xrn,
+                      check_sliver_callback = self.api.driver.check_sliver_credentials)
         #log the call
-        origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
+        origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
         self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, xrn, self.name))
 
         return self.api.manager.Shutdown(self.api, xrn, creds)