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.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.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
+
+from sfa.planetlab.plaggregate import PlAggregate
+from sfa.planetlab.plslices import PlSlices
+from sfa.planetlab.plxrn import slicename_to_hrn
##
# Meta data of an instance.
self.instance_id = instance.id
# If there is an error, destroy itself.
- except EC2ResponseError, ec2RespErr:
+ except EC2ResponseError as ec2RespErr:
errTree = ET.fromstring(ec2RespErr.body)
msg = errTree.find('.//Message')
logger.error(msg.text)
instList.append(instInfoDict)
AggregateManagerEucalyptus.cloud['instances'] = instancesDict
- except EC2ResponseError, ec2RespErr:
+ except EC2ResponseError as ec2RespErr:
errTree = ET.fromstring(ec2RespErr.body)
errMsgE = errTree.find('.//Message')
logger.error(errMsgE.text)
ramdisk_id = instRamDisk,
key_pair = instKey,
inst_type = instType,
- meta = Meta(start_time=datetime.datetime.now()))
+ meta = Meta(start_time=datetime.datetime.utcnow()))
eucaInst.reserveInstance(conn, pubKeys)
# xxx - should return altered rspec
try:
os.makedirs(outdir)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.EEXIST:
raise