a little nicer wrt pep8

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

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index 17c6636..c445215 100644 (file)
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -1,28 +1,32 @@
 from sfa.storage.parameter import Parameter
 from sfa.trust.credential import Credential
 from sfa.util.method import Method
+from sfa.util.sfalogging import logger
+
 
 class Shutdown(Method):
     """
-    Perform an emergency shut down of a sliver. This operation is intended for administrative use. 
+    Perform an emergency shut down of a sliver. This operation is intended for administrative use.
     The sliver is shut down but remains available for further forensics.
 
     @param slice_urn (string) URN of slice to renew
-    @param credentials ([string]) of credentials    
+    @param credentials ([string]) of credentials
     """
-    interfaces = ['aggregate', 'slicemgr']
+    interfaces = ['aggregate']
     accepts = [
         Parameter(str, "Slice URN"),
-        Parameter(type([str]), "List of 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)
-        #log the call
-        origin_hrn = Credential(string=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))
+        valid_creds = self.api.auth.checkCredentials(
+            creds, 'stopslice', xrn,
+            check_sliver_callback=self.api.driver.check_sliver_credentials)
+        # log the call
+        origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
+        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)
-