X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fcomponent_manager_pl.py;h=2e1b3c3f7b77c65f4040e0af8d30a870bb96bad8;hb=5982c08ca1c1f4e248d6fbc161a07c5ef095902a;hp=ae1fc13853029d54f8813eb4d48cd6b7cf249130;hpb=11d02cbfd5e91784119bb9377fceb4fa6adae621;p=sfa.git diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py index ae1fc138..2e1b3c3f 100644 --- a/sfa/managers/component_manager_pl.py +++ b/sfa/managers/component_manager_pl.py @@ -5,7 +5,7 @@ from sfa.util.namespace import * from sfa.util.sfaticket import SfaTicket def init_server(): - from server import sfa_component_setup + from sfa.server import sfa_component_setup # get current trusted gids try: sfa_component_setup.get_trusted_certs() @@ -13,10 +13,8 @@ def init_server(): # our keypair may be old, try refreshing sfa_component_setup.get_node_key() sfa_component_setup.get_credential(force=True) - sfa_component_sertup.get_trusted_certs() + sfa_component_setup.get_trusted_certs() - - def start_slice(api, xrn): hrn, type = urn_to_hrn(xrn) slicename = hrn_to_pl_slicename(hrn) @@ -56,6 +54,6 @@ def redeem_ticket(api, ticket_string): # convert ticket to format nm is used to nm_ticket = xmlrpclib.dumps((ticket.attributes,), methodresponse=True) - self.api.nodemanager.AdminTicket(nm_ticket) + api.nodemanager.AdminTicket(nm_ticket)