from sfa.trust.sfaticket import SfaTicket
from sfa.trust.credential import Credential
+
from sfa.rspecs.version_manager import VersionManager
from sfa.rspecs.rspec import RSpec
from sfa.server.sfaapi import SfaApi
import sfa.plc.peers as peers
-from sfa.plc.aggregate import Aggregate
-from sfa.plc.slices import Slices
+from sfa.plc.plaggregate import PlAggregate
+from sfa.plc.plslices import PlSlices
class AggregateManager:
request_rspec_versions.append(rspec_version.to_dict())
xrn=Xrn(api.hrn)
version_more = {'interface':'aggregate',
- 'sfa': 1,
+ 'sfa': 2,
'geni_api': api.config.SFA_AGGREGATE_API_VERSION,
'testbed':'myplc',
'hrn':xrn.get_hrn(),
"""
hrn, _ = urn_to_hrn(slice_xrn)
- hrn_auth = get_authority(hrn)
+ #hrn_auth = get_authority(hrn)
# Build up objects that an SFA registry would return if SFA
# could contact the slice's registry directly
call_id = options.get('call_id')
if Callids().already_handled(call_id): return ""
- aggregate = Aggregate(api)
- slices = Slices(api)
+ aggregate = PlAggregate(self.driver)
+ slices = PlSlices(api)
(hrn, _) = urn_to_hrn(slice_xrn)
peer = slices.get_peer(hrn)
sfa_peer = slices.get_sfa_peer(hrn)
version_manager = VersionManager()
# get the rspec's return format from options
- rspec_version = version_manager.get_version(options.get('rspec_version'))
- version_string = "rspec_%s" % (rspec_version.to_string())
+ rspec_version = version_manager.get_version(options.get('geni_rspec_version'))
+ version_string = "rspec_%s" % (rspec_version)
#panos adding the info option to the caching key (can be improved)
if options.get('info'):
#panos: passing user-defined options
#print "manager options = ",options
- aggregate = Aggregate(api)
+ aggregate = PlAggregate(self.driver)
rspec = aggregate.get_rspec(slice_xrn=xrn, version=rspec_version, options=options)
# cache the result
def GetTicket(self, api, xrn, creds, rspec, users, options={}):
(slice_hrn, _) = urn_to_hrn(xrn)
- slices = Slices(api)
+ slices = PlSlices(api)
peer = slices.get_peer(slice_hrn)
sfa_peer = slices.get_sfa_peer(slice_hrn)