From: ciro Date: Tue, 21 Apr 2015 15:36:46 +0000 (+0200) Subject: merge X-Git-Tag: myslice-1.3~35^2~1 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=ad016322ae3f21b27cda0e942fa48a10c3c728a3 merge --- ad016322ae3f21b27cda0e942fa48a10c3c728a3 diff --cc portal/slicerequestview.py index f11603fe,6d7801d5..82c66551 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@@ -133,16 -133,18 +140,16 @@@ class SliceRequestView (LoginRequiredAu 'email' : user_email, 'timestamp' : time.time(), 'authority_hrn' : authority_hrn, - 'organization' : wsgi_request.POST.get('org_name', ''), + 'organization' : request.POST.get('org_name', ''), - 'slice_name' : request.POST.get('slice_name', ''), + 'slice_name' : slice_name, - 'url' : wsgi_request.POST.get('url', ''), - 'purpose' : wsgi_request.POST.get('purpose', ''), + 'url' : request.POST.get('url', ''), + 'purpose' : request.POST.get('purpose', ''), 'current_site' : current_site } - - # create slice_hrn based on authority_hrn and slice_name - slice_name = slice_request['slice_name'] + # slice name is unique among all authorities - slice_query = Query().get('myslice:slice').select('slice_hrn') - slice_details_sfa = execute_admin_query(request, slice_query) + slice_query = Query().get('myslice:slice').select('slice_hrn') + slice_details_sfa = execute_admin_query(wsgi_request, slice_query) for _slice in slice_details_sfa: split_list = _slice['slice_hrn'].split('.') sfa_slice_name = split_list[-1]