X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FGetSliceTicket.py;h=5a34c47c4ada998bb1cd75a98c48136412d8322f;hb=6bef7b35eec76ff66332cb20f58eb7703c2116f9;hp=cbf4d951d1d4685812a06b71f5a462f99687f164;hpb=690573bbfe483955331a061b5d209637de56826d;p=plcapi.git diff --git a/PLC/Methods/GetSliceTicket.py b/PLC/Methods/GetSliceTicket.py index cbf4d95..5a34c47 100644 --- a/PLC/Methods/GetSliceTicket.py +++ b/PLC/Methods/GetSliceTicket.py @@ -1,6 +1,3 @@ -# $Id$ -# $URL$ - import time from PLC.Faults import * @@ -45,25 +42,25 @@ class GetSliceTicket(Method): def call(self, auth, slice_id_or_name): slices = Slices(self.api, [slice_id_or_name]) if not slices: - raise PLCInvalidArgument, "No such slice" + raise PLCInvalidArgument("No such slice") slice = slices[0] # Allow peers to obtain tickets for their own slices if slice['peer_id'] is not None: if not isinstance(self.caller, Peer): - raise PLCInvalidArgument, "Not a local slice" + raise PLCInvalidArgument("Not a local slice") elif slice['peer_id'] != self.caller['peer_id']: - raise PLCInvalidArgument, "Only the authoritative peer may obtain tickets for that slice" + raise PLCInvalidArgument("Only the authoritative peer may obtain tickets for that slice") # Tickets are the canonicalized XML-RPC methodResponse # representation of a partial GetSlivers() response, i.e., - - initscripts = InitScripts(self.api, {'enabled': True}) + + initscripts = InitScripts(self.api, {'enabled': True}) data = { 'timestamp': int(time.time()), - 'initscripts': initscripts, - 'slivers': get_slivers(self.api, auth, [slice['slice_id']]), + 'initscripts': initscripts, + 'slivers': get_slivers(self.api, self.caller, auth, [slice['slice_id']]), } # Sign ticket