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
last plc-dependent code moved to PlDriver
[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
6fe4720
..
552f544
100644
(file)
--- a/
sfa/managers/aggregate_manager_eucalyptus.py
+++ b/
sfa/managers/aggregate_manager_eucalyptus.py
@@
-286,7
+286,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()
@@
-552,7
+552,7
@@
class AggregateManagerEucalyptus:
logger.debug("In CreateSliver")
aggregate = PlAggregate(self.driver)
logger.debug("In CreateSliver")
aggregate = PlAggregate(self.driver)
- slices = PlSlices(
api
)
+ slices = PlSlices(
self.driver
)
(hrn, type) = urn_to_hrn(slice_xrn)
peer = slices.get_peer(hrn)
sfa_peer = slices.get_sfa_peer(hrn)
(hrn, type) = urn_to_hrn(slice_xrn)
peer = slices.get_peer(hrn)
sfa_peer = slices.get_sfa_peer(hrn)
@@
-682,7
+682,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
+695,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,