Merge Master in geni-v3 conflict resolution

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

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index 9788608..8641bd0 100644 (file)
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -1,7 +1,8 @@
-from sfa.util.parameter import Parameter
-from sfa.methods.Stop import Stop
+from sfa.storage.parameter import Parameter
+from sfa.trust.credential import Credential
+from sfa.util.method import Method
 
-class Shutdown(Stop):
+class Shutdown(Method):
     """
     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.
@@ -12,11 +13,17 @@ class Shutdown(Stop):
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
-        Parameter(type([str]), "List of credentials"),
+        Parameter(type([dict]), "Credentials"),
         ]
     returns = Parameter(bool, "Success or Failure")
 
-    def call(self, slice_xrn, creds):
+    def call(self, xrn, creds):
 
-        return Stop.call(self, slice_xrn, creds)
+        valid_creds = self.api.auth.checkCredentials(creds, 'stopslice', xrn,
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
+        #log the call
+        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)