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
drop support for API v1, hard-wired v2
[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
444ceb4
..
aa803ac
100644
(file)
--- a/
sfa/managers/aggregate_manager_eucalyptus.py
+++ b/
sfa/managers/aggregate_manager_eucalyptus.py
@@
-23,8
+23,10
@@
from sfa.util.callids import Callids
#from sfa.util.sfalogging import logger
from sfa.util.version import version_core
from sfa.trust.credential import Credential
#from sfa.util.sfalogging import logger
from sfa.util.version import version_core
from sfa.trust.credential import Credential
-from sfa.plc.aggregate import Aggregate
-from sfa.plc.slices import Slice, Slices
+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.version_manager import VersionManager
from sfa.rspecs.rspec import RSpec
# not sure what this used to be nor where it is now defined
@@
-445,7
+447,7
@@
class AggregateManagerEucalyptus:
port=eucaPort,
path=srvPath)
port=eucaPort,
path=srvPath)
- def ListResources(api, creds, options
={}
):
+ def ListResources(api, creds, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
# get slice's hrn from options
@@
-542,15
+544,15
@@
class AggregateManagerEucalyptus:
"""
Hook called via 'sfi.py create'
"""
"""
Hook called via 'sfi.py create'
"""
- def CreateSliver(api, slice_xrn, creds, xml, users, options
={}
):
+ def CreateSliver(api, slice_xrn, creds, xml, users, options):
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
logger = logging.getLogger('EucaAggregate')
logger.debug("In CreateSliver")
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
logger = logging.getLogger('EucaAggregate')
logger.debug("In CreateSliver")
- aggregate = Aggregate(self.driver)
- slices =
Slices(api
)
+ aggregate =
Pl
Aggregate(self.driver)
+ 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)
@@
-680,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, options
={}
):
+ def GetVersion(api, options):
version_manager = VersionManager()
ad_rspec_versions = []
version_manager = VersionManager()
ad_rspec_versions = []
@@
-693,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,