X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager.py;h=4d773fc3f2f5ebb40abfce53069528bfbb812a1b;hb=7f0832796aa604729648728328ab9a433653bf02;hp=3651b159de02614c21f49ff7fe4cdeda47b8478c;hpb=5217d46556d445cf0b91d95811d112d758ba8be1;p=sfa.git diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 3651b159..4d773fc3 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -1,6 +1,8 @@ +import socket from sfa.util.version import version_core from sfa.util.xrn import Xrn from sfa.util.callids import Callids +from sfa.server.api_versions import ApiVersions class AggregateManager: @@ -11,11 +13,13 @@ class AggregateManager: def GetVersion(self, api, options): xrn=Xrn(api.hrn) version = version_core() + geni_api_versions = ApiVersions().get_versions() + geni_api_versions.append({'2': 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT)}) version_generic = { 'interface':'aggregate', 'sfa': 2, 'geni_api': 2, - 'geni_api_versions': {'2': 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT)}, + 'geni_api_versions': geni_api_versions, 'hrn':xrn.get_hrn(), 'urn':xrn.get_urn(), } @@ -110,5 +114,7 @@ class AggregateManager: slice_urn=xrn.get_urn() slice_hrn=xrn.get_hrn() + # xxx sounds like GetTicket is dead, but if that gets resurrected we might wish + # to pass 'users' over to the driver as well return self.driver.get_ticket (slice_urn, slice_hrn, creds, rspec, options)