X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fplaggregate.py;h=3e2d3428b4452dad0743962d6499924bf51e1fe7;hb=95591b4019b874168027d0b683503fbbbe3d9c69;hp=1d06c4b48d160af42fdb6bef03d5213310dec830;hpb=7f25366ea485a55f5a24cca8156d52a1dd302263;p=sfa.git diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 1d06c4b4..3e2d3428 100644 --- a/sfa/planetlab/plaggregate.py +++ b/sfa/planetlab/plaggregate.py @@ -363,11 +363,14 @@ class PlAggregate: rspec.xml.set('expires', rspec_expires) # lookup the sliver allocations + geni_urn = None sliver_ids = [sliver['sliver_id'] for sliver in slivers] constraint = SliverAllocation.sliver_id.in_(sliver_ids) sliver_allocations = dbsession.query(SliverAllocation).filter(constraint) sliver_allocation_dict = {} for sliver_allocation in sliver_allocations: + if not geni_urn: + geni_urn = sliver_allocation.slice_urn sliver_allocation_dict[sliver_allocation.sliver_id] = sliver_allocation if not options.get('list_leases') or options['list_leases'] != 'leases': @@ -415,6 +418,6 @@ class PlAggregate: rspec.version.add_leases(leases) - return {'geni_urn': urns[0], + return {'geni_urn': geni_urn, 'geni_rspec': rspec.toxml(), 'geni_slivers': geni_slivers}