Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

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

diff --git a/sfa/methods/Status.py b/sfa/methods/Status.py
index 6935d01..68d928e 100644 (file)
--- a/sfa/methods/Status.py
+++ b/sfa/methods/Status.py
@@ -12,20 +12,17 @@ class Status(Method):
     """
     interfaces = ['aggregate', 'slicemgr', 'component']
     accepts = [
-        Parameter(str, "Slice URN"),
-        Mixed(Parameter(str, "Credential string"),
-              Parameter(type([str]), "List of credentials")),
+        Parameter(type([str]), "Slice or sliver URNs"),
+        Parameter(type([dict]), "credentials"),
         Parameter(dict, "Options")
         ]
     returns = Parameter(dict, "Status details")
 
-    def call(self, slice_xrn, creds, options):
-        hrn, type = urn_to_hrn(slice_xrn)
-        valid_creds = self.api.auth.checkCredentials(creds, 'sliverstatus', hrn)
+    def call(self, xrns, creds, options):
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'sliverstatus', xrns,
+                                                              check_sliver_callback = self.api.driver.check_sliver_credentials,
+                                                              options=options)
 
-        self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, hrn, self.name))
-    
-        status = self.api.manager.Status(self.api, hrn, valid_creds, options)
-
-        return status
+        self.api.logger.info("interface: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, xrns, self.name))
+        return self.api.manager.Status(self.api, xrns, creds, options)