huge cleanup for removing mutables used as default

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

diff --git a/sfa/methods/Describe.py b/sfa/methods/Describe.py
index c6a4dd3..018f803 100644 (file)
--- a/sfa/methods/Describe.py
+++ b/sfa/methods/Describe.py
@@ -20,6 +20,7 @@ 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")
@@ -35,14 +36,14 @@ class Describe(Method):
                 options['geni_rspec_version'] = options['rspec_version']
             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', urns)
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'listnodes', urns, 
+                                                              check_sliver_callback = self.api.driver.check_sliver_credentials,
+                                                              options=options)
 
         # 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