X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FShutdown.py;h=c4452151df699123376c60247efa3f09370d61af;hb=3147e8e089dd44e40b852cc121483189807ffa9b;hp=cd36532dc2260162c21b7e30666e1cc908609c06;hpb=952322d76247f8991f3c2688ed7e1f5a22ca4572;p=sfa.git

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index cd36532d..c4452151 100644
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -1,39 +1,32 @@
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.storage.parameter import Parameter
+from sfa.trust.credential import Credential
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+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 = ['geni_am']
+    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, slice_xrn, creds):
-        hrn, type = urn_to_hrn(slice_xrn)
+    def call(self, xrn, creds):
 
-        self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, hrn, creds, 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))
 
-        # Find the valid credentials
-        ValidCreds = self.api.auth.checkCredentials(creds, 'shutdown', hrn)
-
-        manager_base = 'sfa.managers'
-
-        if self.api.interface in ['geni_am']:
-            mgr_type = self.api.config.SFA_GENI_AGGREGATE_TYPE
-            manager_module = manager_base + ".geni_am_%s" % mgr_type
-            manager = __import__(manager_module, fromlist=[manager_base])
-            return manager.Shutdown(self.api, slice_xrn, ValidCreds)
-
-        return ''
-    
+        return self.api.manager.Shutdown(self.api, xrn, creds)