X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FSliverStatus.py;h=f722c7cd01150f6a29da353a2fdd59952ec5bd17;hb=cf630d87d633f3861e3ac8a50433fa29ca46a74e;hp=24d6ff2ab1bdc37be6d1dd4b35174414646cccb0;hpb=952322d76247f8991f3c2688ed7e1f5a22ca4572;p=sfa.git

diff --git a/sfa/methods/SliverStatus.py b/sfa/methods/SliverStatus.py
index 24d6ff2a..f722c7cd 100644
--- a/sfa/methods/SliverStatus.py
+++ b/sfa/methods/SliverStatus.py
@@ -1,7 +1,7 @@
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter
+
+from sfa.storage.parameter import Parameter, Mixed
 
 class SliverStatus(Method):
     """
@@ -10,26 +10,22 @@ class SliverStatus(Method):
     @param slice_urn (string) URN of slice to allocate to
     
     """
-    interfaces = ['geni_am']
+    interfaces = ['aggregate', 'slicemgr', 'component']
     accepts = [
         Parameter(str, "Slice URN"),
+        Mixed(Parameter(str, "Credential string"),
+              Parameter(type([str]), "List of credentials")),
+        Parameter(dict, "Options")
         ]
-    returns = Parameter(bool, "Success or Failure")
+    returns = Parameter(dict, "Status details")
 
-    def call(self, slice_xrn, creds):
+    def call(self, slice_xrn, creds, options={}):
         hrn, type = urn_to_hrn(slice_xrn)
-        
-        ValidCreds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
+        valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
 
         self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
+    
+        status = self.api.manager.SliverStatus(self.api, hrn, valid_creds, options)
 
-        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.SliverStatus(self.api, slice_xrn, ValidCreds)
-
-        return ''
+        return status