git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
namespace module is gone, plxrn provides PL-specific translations
[sfa.git]
/
sfa
/
methods
/
get_registries.py
diff --git
a/sfa/methods/get_registries.py
b/sfa/methods/get_registries.py
index
ed46b5a
..
a2a65a5
100644
(file)
--- a/
sfa/methods/get_registries.py
+++ b/
sfa/methods/get_registries.py
@@
-1,8
+1,8
@@
### $Id: get_slices.py 14387 2009-07-08 18:19:11Z faiyaza $
### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_registries.py $
### $Id: get_slices.py 14387 2009-07-08 18:19:11Z faiyaza $
### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_registries.py $
-
+from types import StringTypes
from sfa.util.faults import *
from sfa.util.faults import *
-from sfa.util.
misc import *
+from sfa.util.
xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
@@
-13,7
+13,7
@@
class get_registries(Method):
Get a list of connection information for all known registries.
@param cred credential string specifying the rights of the caller
Get a list of connection information for all known registries.
@param cred credential string specifying the rights of the caller
- @param a Human readable name (hrn
), or list of hrn
s or None
+ @param a Human readable name (hrn
or urn), or list of name
s or None
@return list of dictionaries with aggregate information.
"""
@return list of dictionaries with aggregate information.
"""
@@
-21,15
+21,16
@@
class get_registries(Method):
accepts = [
Parameter(str, "Credential string"),
accepts = [
Parameter(str, "Credential string"),
- Mixed([Parameter(str, "Human readable name (hrn)")],
- Parameter(str, "Human readable name (hrn)"),
- Parameter(None, "hrn not specified"))
+ Mixed(Parameter(str, "Human readable name (hrn or urn)"),
+ Parameter(None, "hrn not specified"))
]
returns = [Parameter(dict, "Registry interface information")]
]
returns = [Parameter(dict, "Registry interface information")]
- def call(self, cred,
h
rn = None):
-
+ def call(self, cred,
x
rn = None):
+ hrn, type = urn_to_hrn(xrn)
self.api.auth.check(cred, 'list')
self.api.auth.check(cred, 'list')
- registries = Registries(self.api)
- return registries.interfaces
+ registries = Registries(self.api).interfaces.values()
+ if hrn:
+ registries = [reg for reg in registries if reg['hrn'] == hrn]
+ return registries