X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=0c70ddaeb9ec76cf4f860754e13c7282bd68f7ba;hb=ba2aaa438f939a4b5c697052e37b1c3218901319;hp=d3422c9871c3faa4b512a5344ac916ef2aea7eb4;hpb=99e9f96209b9ebfd1853e7b8902a1a0fe893eaa2;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index d3422c98..0c70ddae 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -4,11 +4,13 @@ import traceback import sys import re from types import StringTypes +from dateutil.parser import parse -from sfa.util.namespace import get_authority, urn_to_hrn, slicename_to_hrn, hrn_to_pl_slicename, hrn_to_urn +from sfa.util.faults import * +from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn +from sfa.util.plxrn import slicename_to_hrn, hrn_to_pl_slicename from sfa.util.rspec import * from sfa.util.specdict import * -from sfa.util.faults import * from sfa.util.record import SfaRecord from sfa.util.policy import Policy from sfa.util.record import * @@ -19,7 +21,6 @@ import sfa.plc.peers as peers from sfa.plc.network import * from sfa.plc.api import SfaAPI from sfa.plc.slices import * -from dateutil.parser import parse def __get_registry_objects(slice_xrn, creds, users): @@ -265,7 +266,7 @@ def get_slices(api, creds): def get_rspec(api, creds, options): # get slice's hrn from options - xrn = options.get('geni_slice_urn', None) + xrn = options.get('geni_slice_urn', '') hrn, type = urn_to_hrn(xrn) # look in cache first