git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed sfa/plc into sfa/planetlab
[sfa.git]
/
sfa
/
managers
/
aggregate_manager_eucalyptus.py
diff --git
a/sfa/managers/aggregate_manager_eucalyptus.py
b/sfa/managers/aggregate_manager_eucalyptus.py
index
588f090
..
950d2f2
100644
(file)
--- 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.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.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.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
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.
##
# Meta data of an instance.
@@
-286,7
+281,7
@@
class AggregateManagerEucalyptus:
_inited=False
# the init_server mechanism has vanished
_inited=False
# the init_server mechanism has vanished
- def __init__ (self):
+ def __init__ (self
, config
):
if AggregateManagerEucalyptus._inited: return
AggregateManagerEucalyptus.init_server()
if AggregateManagerEucalyptus._inited: return
AggregateManagerEucalyptus.init_server()
@@
-682,7
+677,7
@@
class AggregateManagerEucalyptus:
f.write("%s %s %s\n" % (instId, ipaddr, hrn))
f.close()
f.write("%s %s %s\n" % (instId, ipaddr, hrn))
f.close()
- def GetVersion(api):
+ def GetVersion(api
, options
):
version_manager = VersionManager()
ad_rspec_versions = []
version_manager = VersionManager()
ad_rspec_versions = []
@@
-695,7
+690,7
@@
class AggregateManagerEucalyptus:
xrn=Xrn(api.hrn)
version_more = {'interface':'aggregate',
'sfa': 1,
xrn=Xrn(api.hrn)
version_more = {'interface':'aggregate',
'sfa': 1,
- 'geni_api':
api.config.SFA_AGGREGATE_API_VERSION
,
+ 'geni_api':
'2'
,
'testbed':'myplc',
'hrn':xrn.get_hrn(),
'geni_request_rspec_versions': request_rspec_versions,
'testbed':'myplc',
'hrn':xrn.get_hrn(),
'geni_request_rspec_versions': request_rspec_versions,