From: Thierry Parmentelat Date: Wed, 1 Feb 2012 17:38:27 +0000 (+0100) Subject: Merge branch 'master' into sqlalchemy - solved totally harmless X-Git-Tag: sfa-2.1-2~14^2 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=699667b3e734e954b0c93fbb2a6c29d82246d1dd Merge branch 'master' into sqlalchemy - solved totally harmless conflict in sfa/openstack/openstack_driver.py --- 699667b3e734e954b0c93fbb2a6c29d82246d1dd diff --cc sfa/openstack/openstack_driver.py index 3209f2b3,405e85d5..368b4080 --- a/sfa/openstack/openstack_driver.py +++ b/sfa/openstack/openstack_driver.py @@@ -9,23 -8,16 +9,19 @@@ from sfa.util.defaultdict import defaul from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch from sfa.util.xrn import Xrn, hrn_to_urn, get_leaf, urn_to_sliver_id from sfa.util.cache import Cache - - # one would think the driver should not need to mess with the SFA db, but.. - # used to be used in get_ticket #from sfa.trust.sfaticket import SfaTicket + from sfa.rspecs.version_manager import VersionManager from sfa.rspecs.rspec import RSpec + # the driver interface, mostly provides default behaviours from sfa.managers.driver import Driver + from sfa.openstack.openstack_shell import OpenstackShell - import sfa.plc.peers as peers - from sfa.plc.plaggregate import PlAggregate + from sfa.openstack.osaggregate import OSAggregate from sfa.plc.plslices import PlSlices - from sfa.util.plxrn import slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, hrn_to_pl_login_base + from sfa.util.osxrn import OSXrn def list_to_dict(recs, key):