X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fcomponent_manager_pl.py;h=ec5e24c6bbd12b14189960f53900c64ddd9a70dc;hb=1e95f8a388325499564df5f8eb6eb1fd10ca2d42;hp=961c0354d7c61440145e5f2cbbead42974edd58d;hpb=5307e4e09dd0a7982f0c6dfdd13065425c802005;p=sfa.git diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py index 961c0354..ec5e24c6 100644 --- a/sfa/managers/component_manager_pl.py +++ b/sfa/managers/component_manager_pl.py @@ -3,7 +3,7 @@ import xmlrpclib from sfa.util.faults import * from sfa.util.plxrn import PlXrn -from sfa.util.sfaticket import SfaTicket +from sfa.trust.sfaticket import SfaTicket from sfa.util.version import version_core def GetVersion(api): @@ -21,7 +21,7 @@ def init_server(): sfa_component_setup.get_credential(force=True) sfa_component_setup.get_trusted_certs() -def slice_status(api, slice_xrn, creds): +def SliverStatus(api, slice_xrn, creds): result = {} result['geni_urn'] = slice_xrn result['geni_status'] = 'unknown' @@ -46,7 +46,8 @@ def reset_slice(api, xrn): raise SliverDoesNotExist(slicename) api.nodemanager.ReCreate(slicename) -def get_slices(api): +# xxx outdated - this should accept a credential & call_id +def ListSlices(api): # this returns a tuple, the data we want is at index 1 xids = api.nodemanager.GetXIDs() # unfortunately the data we want is given to us as