X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager_pl.py;fp=sfa%2Fmanagers%2Faggregate_manager_pl.py;h=fecc3d77c22ccbf38677c3cecb23e2dfa08dad8b;hb=b4337060a7f0d2373d7429f58d5a93d47fa22b66;hp=54c658361edc1f56004cbd46ce53f57b35ef85a8;hpb=430896c90f993b77c80b830ae7d1b349e4ba6d58;p=sfa.git diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index 54c65836..fecc3d77 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -110,12 +110,13 @@ def create_slice(api, slice_xrn, creds, rspec, users): site_id, remote_site_id = slices.verify_site(registry, credential, hrn, peer, sfa_peer, reg_objects) - slice = slices.verify_slice(registry, credential, hrn, site_id, + slice_record = slices.verify_slice(registry, credential, hrn, site_id, remote_site_id, peer, sfa_peer, reg_objects) - + network = Network(api) slice = network.get_slice(api, hrn) + slice.peer_id = slice_record['peer_slice_id'] current = __get_hostnames(slice.get_nodes()) network.addRSpec(rspec, api.config.SFA_AGGREGATE_RSPEC_SCHEMA) @@ -228,11 +229,6 @@ def get_rspec(api, creds, options): xrn = options.get('geni_slice_urn', None) hrn, type = urn_to_hrn(xrn) - # get hrn of the original caller - origin_hrn = options.get('origin_hrn', None) - if not origin_hrn: - origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn() - # look in cache first if api.cache and not xrn: rspec = api.cache.get('nodes')