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
more consistency between API method names and corresponding manager implementation
[sfa.git]
/
sfa
/
methods
/
GetTicket.py
diff --git
a/sfa/methods/GetTicket.py
b/sfa/methods/GetTicket.py
index
afd7f49
..
174bd4c
100644
(file)
--- a/
sfa/methods/GetTicket.py
+++ b/
sfa/methods/GetTicket.py
@@
-1,15
+1,10
@@
-### $Id: get_ticket.py 17732 2010-04-19 21:10:45Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/get_ticket.py $
-import time
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.xrn import urn_to_hrn
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.util.config import Config
-from sfa.trust.credential import Credential
from sfa.util.sfatablesRuntime import run_sfatables
from sfa.util.sfatablesRuntime import run_sfatables
+from sfa.trust.credential import Credential
+
class GetTicket(Method):
"""
Retrieve a ticket. This operation is currently implemented on PLC
class GetTicket(Method):
"""
Retrieve a ticket. This operation is currently implemented on PLC
@@
-37,20
+32,18
@@
class GetTicket(Method):
Parameter(type([]), "List of user information")
]
Parameter(type([]), "List of user information")
]
- returns = Parameter(str, "String represen
e
ation of a ticket object")
+ returns = Parameter(str, "String represen
t
ation of a ticket object")
def call(self, xrn, creds, rspec, users):
hrn, type = urn_to_hrn(xrn)
# Find the valid credentials
def call(self, xrn, creds, rspec, users):
hrn, type = urn_to_hrn(xrn)
# Find the valid credentials
- valid_creds = self.api.auth.checkCredentials(creds, '
createsliver
', hrn)
+ valid_creds = self.api.auth.checkCredentials(creds, '
getticket
', hrn)
origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
#log the call
self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
#log the call
self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name))
- manager = self.api.get_interface_manager()
-
- # flter rspec through sfatables
+ # filter rspec through sfatables
if self.api.interface in ['aggregate']:
chain_name = 'OUTGOING'
elif self.api.interface in ['slicemgr']:
if self.api.interface in ['aggregate']:
chain_name = 'OUTGOING'
elif self.api.interface in ['slicemgr']:
@@
-58,7
+51,5
@@
class GetTicket(Method):
rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
# remove nodes that are not available at this interface from the rspec
rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec)
# remove nodes that are not available at this interface from the rspec
- ticket = manager.get_ticket(self.api, xrn, creds, rspec, users)
-
- return ticket
+ return self.api.manager.GetTicket(self.api, xrn, creds, rspec, users)