X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fcomponent_manager_pl.py;h=ba9b7ebf10647d83233c82e13a089c57e1c9b9da;hb=06768bd605e5d47fadfc90a35c74e30f267226a5;hp=699297147a9de713d0acbaaa4ddfd60e1fbf1afd;hpb=19dff4d49e0bf51857903d759947d0a1b01229a4;p=sfa.git diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py index 69929714..ba9b7ebf 100644 --- a/sfa/managers/component_manager_pl.py +++ b/sfa/managers/component_manager_pl.py @@ -1,11 +1,12 @@ -import xmlrpclib - from sfa.util.faults import SliverDoesNotExist -from sfa.util.plxrn import PlXrn -from sfa.trust.sfaticket import SfaTicket from sfa.util.version import version_core +from sfa.util.py23 import xmlrpc_client + +from sfa.trust.sfaticket import SfaTicket + +from sfa.planetlab.plxrn import PlXrn -def GetVersion(api): +def GetVersion(api, options): return version_core({'interface':'component', 'testbed':'myplc'}) @@ -64,7 +65,7 @@ def redeem_ticket(api, ticket_string): raise SliverDoesNotExist(slicename) # convert ticket to format nm is used to - nm_ticket = xmlrpclib.dumps((ticket.attributes,), methodresponse=True) + nm_ticket = xmlrpc_client.dumps((ticket.attributes,), methodresponse=True) api.driver.nodemanager.AdminTicket(nm_ticket)