X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FDescribe.py;h=b66780a4246e459f38179ebf74a53e82087bd6d2;hb=1d313ecb50cfe38de38f287217fe71abc5b09f83;hp=546be22eb970543edecffeb34b672d34cc7a29c3;hpb=ea34fd483d755265eb42bff02ee3de96f191886c;p=sfa.git

diff --git a/sfa/methods/Describe.py b/sfa/methods/Describe.py
index 546be22e..b66780a4 100644
--- a/sfa/methods/Describe.py
+++ b/sfa/methods/Describe.py
@@ -20,13 +20,14 @@ class Describe(Method):
     """
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
+        Parameter(type([str]), "List of URNs"),
         Mixed(Parameter(str, "Credential string"), 
               Parameter(type([str]), "List of credentials")),
         Parameter(dict, "Options")
         ]
     returns = Parameter(str, "List of resources")
 
-    def call(self, creds, options):
+    def call(self, urns, creds, options):
         self.api.logger.info("interface: %s\tmethod-name: %s" % (self.api.interface, self.name))
        
         # client must specify a version
@@ -36,13 +37,13 @@ class Describe(Method):
             else:
                 raise SfaInvalidArgument('Must specify an rspec version option. geni_rspec_version cannot be null')
  
-        # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentials(creds, 'listnodes')
+        valid_creds = self.api.auth.checkCredentials(creds, 'listnodes', urns, \
+                      check_sliver_callback = self.api.manager.driver.check_sliver_credentials)
 
         # get hrn of the original caller 
         origin_hrn = options.get('origin_hrn', None)
         if not origin_hrn:
-            origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
+            origin_hrn = Credential(cred=valid_creds[0]).get_gid_caller().get_hrn()
         desc = self.api.manager.Describe(self.api, creds, urns, options)
 
         # filter rspec through sfatables