X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_eucalyptus.py;h=950d2f2f7bac58194a0892cd174fd6d86e067ac8;hb=0f90da7f05fbe3d07e56790c10f6ecc877b33754;hp=552f544690347f7df230514631e47e5010a18e5f;hpb=b6de9285a970eccb9658a0078c49f76fb11af7cd;p=sfa.git diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py index 552f5446..950d2f2f 100644 --- a/sfa/managers/aggregate_manager_eucalyptus.py +++ b/sfa/managers/aggregate_manager_eucalyptus.py @@ -17,22 +17,17 @@ from sqlobject import * from sfa.util.faults import InvalidRSpec from sfa.util.xrn import urn_to_hrn, Xrn -from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn +from sfa.util.plxrn import slicename_to_hrn from sfa.util.callids import Callids #comes with its own logging #from sfa.util.sfalogging import logger from sfa.util.version import version_core + from sfa.trust.credential import Credential -from sfa.plc.plaggregate import PlAggregate -# No Slice symbol in there -#from sfa.plc.plslices import Slice, Slices -from sfa.plc.plslices import PlSlices +from sfa.planetlab.plaggregate import PlAggregate +from sfa.planetlab.plslices import PlSlices from sfa.rspecs.version_manager import VersionManager from sfa.rspecs.rspec import RSpec -# not sure what this used to be nor where it is now defined -#from sfa.rspecs.sfa_rspec import sfa_rspec_version -# most likely this should now be -#from sfa.rspecs.version_manager import VersionManager ## # Meta data of an instance.