### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_aggregates.py $
from types import StringTypes
from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
Get a list of connection information for all known aggregates.
@param cred credential string specifying the rights of the caller
- @param a Human readable name (hrn), or list of hrns or None
+ @param a Human readable name (hrn or urn), or list of hrns or None
@return list of dictionaries with aggregate information.
"""
accepts = [
Parameter(str, "Credential string"),
-
- Mixed(Parameter(str, "Human readable name (hrn)"),
- Parameter(None, "hrn not specified")),
- Mixed(Parameter(str, "Request hash"),
- Parameter(None, "Request hash not specified"))
+ Mixed(Parameter(str, "Human readable name (hrn or urn)"),
+ Parameter(None, "hrn not specified"))
]
returns = [Parameter(dict, "Aggregate interface information")]
- def call(self, cred, hrn = None, request_hash=None):
- self.api.auth.authenticateCred(cred, [cred, hrn], request_hash)
+ def call(self, cred, xrn = None):
+ hrn, type = urn_to_hrn(xrn)
self.api.auth.check(cred, 'list')
aggregates = Aggregates(self.api)
hrn_list = []
hrn_list = hrn
if not hrn_list:
- interfaces = aggregates.interfaces
+ interfaces = aggregates.interfaces.keys()
else:
- interfaces = [interface for interface in aggregates.interfaces if interface['hrn'] in hrn_list]
+ interfaces = [interface for interface in aggregates.interfaces if interface in hrn_list]
return interfaces