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
rename geniticket.py into sfaticket.py and defined class Ticket into SfaTicket
[sfa.git]
/
component
/
component.py
diff --git
a/component/component.py
b/component/component.py
index
828c3d3
..
7aa2163
100644
(file)
--- a/
component/component.py
+++ b/
component/component.py
@@
-17,7
+17,7
@@
from sfa.trust.trustedroot import *
from sfa.util.faults import *
from sfa.util.misc import *
from sfa.util.record import *
from sfa.util.faults import *
from sfa.util.misc import *
from sfa.util.record import *
-from sfa.util.
geniticket import *
+from sfa.util.
sfaticket import SfaTicket
from sfa.util.geniserver import *
##
from sfa.util.geniserver import *
##
@@
-124,7
+124,7
@@
class ComponentManager(GeniServer):
# @param ticket_string the string representation of the ticket
def decode_ticket(self, ticket_string):
# @param ticket_string the string representation of the ticket
def decode_ticket(self, ticket_string):
- self.client_ticket = Ticket(string = ticket_string)
+ self.client_ticket =
Sfa
Ticket(string = ticket_string)
self.client_gid = self.client_ticket.get_gid_caller()
self.object_gid = self.client_ticket.get_gid_object()
self.client_gid = self.client_ticket.get_gid_caller()
self.object_gid = self.client_ticket.get_gid_object()
@@
-144,7
+144,7
@@
class ComponentManager(GeniServer):
if self.object_gid:
self.object_gid.verify_chain(self.trusted_cert_list)
if self.object_gid:
self.object_gid.verify_chain(self.trusted_cert_list)
- def
geni
_ticket_to_plc_ticket(self, ticket):
+ def
sfa
_ticket_to_plc_ticket(self, ticket):
ticket_attrs = ticket.get_attributes()
ticket_rspec = ticket.get_rspec()
ticket_attrs = ticket.get_attributes()
ticket_rspec = ticket.get_rspec()
@@
-211,7
+211,7
@@
class ComponentManager(GeniServer):
print "ticket received for", self.object_gid.get_hrn()
print "ticket received for", self.object_gid.get_hrn()
- pt = self.
geni
_ticket_to_plc_ticket(ticket)
+ pt = self.
sfa
_ticket_to_plc_ticket(ticket)
print "plticket", pt
print "plticket", pt