X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Fcomponent_manager_pl.py;h=961c0354d7c61440145e5f2cbbead42974edd58d;hb=5307e4e09dd0a7982f0c6dfdd13065425c802005;hp=6b784cde08273afea4a03475ad13f62184029110;hpb=f5a6829ab1fd58a695c3e6a92bfbf905223c4693;p=sfa.git diff --git a/sfa/managers/component_manager_pl.py b/sfa/managers/component_manager_pl.py index 6b784cde..961c0354 100644 --- a/sfa/managers/component_manager_pl.py +++ b/sfa/managers/component_manager_pl.py @@ -2,8 +2,7 @@ import os import xmlrpclib from sfa.util.faults import * -from sfa.util.xrn import urn_to_hrn -from sfa.util.plxrn import hrn_to_pl_slicename +from sfa.util.plxrn import PlXrn from sfa.util.sfaticket import SfaTicket from sfa.util.version import version_core @@ -30,23 +29,19 @@ def slice_status(api, slice_xrn, creds): return result def start_slice(api, xrn, creds): - hrn, type = urn_to_hrn(xrn) - slicename = hrn_to_pl_slicename(hrn) + slicename = PlXrn(xrn, type='slice').pl_slicename() api.nodemanger.Start(slicename) def stop_slice(api, xrn, creds): - hrn, type = urn_to_hrn(xrn) - slicename = hrn_to_pl_slicename(hrn) + slicename = PlXrn(xrn, type='slice').pl_slicename() api.nodemanager.Stop(slicename) -def delete_slice(api, xrn, creds): - hrn, type = urn_to_hrn(xrn) - slicename = hrn_to_pl_slicename(hrn) +def DeleteSliver(api, xrn, creds, call_id): + slicename = PlXrn(xrn, type='slice').pl_slicename() api.nodemanager.Destroy(slicename) def reset_slice(api, xrn): - hrn, type = urn_to_hrn(xrn) - slicename = hrn_to_pl_slicename(hrn) + slicename = PlXrn(xrn, type='slice').pl_slicename() if not api.sliver_exists(slicename): raise SliverDoesNotExist(slicename) api.nodemanager.ReCreate(slicename) @@ -64,7 +59,7 @@ def redeem_ticket(api, ticket_string): ticket = SfaTicket(string=ticket_string) ticket.decode() hrn = ticket.attributes['slivers'][0]['hrn'] - slicename = hrn_to_pl_slicename(hrn) + slicename = PlXrn (hrn).pl_slicename() if not api.sliver_exists(slicename): raise SliverDoesNotExist(slicename)