X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=f9c4636dc1c6aca610b19518658b654d5791b833;hb=c50b70a0ccf850465e2de5d2cb45b4e70283247b;hp=222a28eb6aa90639fffe1d5f7f3bca2d1f30953a;hpb=dcb5961dffafd4a24a212decaf47548865e02f48;p=myslice.git diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 222a28eb..f9c4636d 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -7,7 +7,7 @@ from unfold.page import Page from manifold.core.query import Query from manifoldapi.manifoldapi import execute_admin_query, execute_query -from portal.actions import is_pi, create_slice, create_pending_slice +from portal.actions import is_pi, create_slice, create_pending_slice, clear_user_creds, authority_check_pis #from portal.forms import SliceRequestForm from unfold.loginrequired import LoginRequiredAutoLogoutView from ui.topmenu import topmenu_items_live, the_user @@ -16,6 +16,8 @@ from myslice.theme import ThemeView import json, time, re +import activity.user + class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): template_name = 'slicerequest_view.html' @@ -33,12 +35,15 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): errors = [] slice_name ='' purpose='' - exp_url='' + url='' + authority_hrn = None + authority_name = None # Retrieve the list of authorities authorities_query = Query.get('authority').select('name', 'authority_hrn') authorities = execute_admin_query(wsgi_request, authorities_query) if authorities is not None: - authorities = sorted(authorities) + authorities = sorted(authorities, key=lambda k: k['authority_hrn']) + authorities = sorted(authorities, key=lambda k: k['name']) # Get user_email (XXX Would deserve to be simplified) user_query = Query().get('local:user').select('email','config') @@ -53,14 +58,17 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): if authority['authority_hrn'] == user_authority: authority_name = authority['name'] - # + # Handle the case when we use only hrn and not name + if authority_name is None: + authority_name = user_authority + account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') account_details = execute_query(wsgi_request, account_query) - # + platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') platform_details = execute_query(wsgi_request, platform_query) user_hrn = None - # getting user_hrn from local:account + #getting user_hrn from local:account for account_detail in account_details: for platform_detail in platform_details: if platform_detail['platform_id'] == account_detail['platform_id']: @@ -69,15 +77,17 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): if 'myslice' in platform_detail['platform']: account_config = json.loads(account_detail['config']) user_hrn = account_config.get('user_hrn','N/A') - acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + # acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') # checking if pi or not - if acc_auth_cred == {} or acc_auth_cred == 'N/A': - pi = "is_not_pi" - else: - pi = "is_pi" + #if acc_auth_cred == {} or acc_auth_cred == 'N/A': + # pi = "is_not_pi" + #else: + # pi = "is_pi" + pi = authority_check_pis (wsgi_request, user_email) + print "SLICEREQUESTVIEW.PY ----- pi=",pi # Page rendering page = Page(wsgi_request) @@ -97,10 +107,15 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): if authority['name'] == wsgi_request.POST.get('org_name', ''): authority_hrn = authority['authority_hrn'] - # Handle the case when the template uses only hrn and not name - if not authority_hrn: + # Handle the case when we use only hrn and not name + if authority_hrn is None: authority_hrn = wsgi_request.POST.get('org_name', '') + # Handle project if used + project = wsgi_request.POST.get('project', None) + if project is not None: + authority_hrn = project + slice_request = { 'type' : 'slice', 'id' : None, @@ -110,7 +125,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 'authority_hrn' : authority_hrn, 'organization' : wsgi_request.POST.get('org_name', ''), 'slice_name' : wsgi_request.POST.get('slice_name', ''), - 'exp_url' : wsgi_request.POST.get('exp_url', ''), + 'url' : wsgi_request.POST.get('url', ''), 'purpose' : wsgi_request.POST.get('purpose', ''), 'current_site' : current_site } @@ -119,7 +134,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): slice_name = slice_request['slice_name'] req_slice_hrn = authority_hrn + '.' + slice_name # comparing requested slice_hrn with the existing slice_hrn - slice_query = Query().get('slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn) + slice_query = Query().get('myslice:slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn) slice_details_sfa = execute_admin_query(wsgi_request, slice_query) for _slice in slice_details_sfa: if _slice['slice_hrn'] == req_slice_hrn: @@ -143,18 +158,22 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): if (purpose is None or purpose == ''): errors.append('Experiment purpose is mandatory') - exp_url = slice_request['exp_url'] + url = slice_request['url'] if not errors: if is_pi(wsgi_request, user_hrn, authority_hrn): # PIs can directly create slices in their own authority... create_slice(wsgi_request, slice_request) + clear_user_creds(wsgi_request, user_email) self.template_name = 'slice-request-done-view.html' else: # Otherwise a wsgi_request is sent to the PI create_pending_slice(wsgi_request, slice_request, user_email) self.template_name = 'slice-request-ack-view.html' + # log user activity + activity.user.slice(wsgi_request) + return render(wsgi_request, self.template, {'theme': self.theme}) # Redirect after POST else: slice_request = {} @@ -167,7 +186,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 'purpose': purpose, 'email': user_email, 'user_hrn': user_hrn, - 'exp_url': exp_url, + 'url': url, 'pi': pi, 'authority_name': authority_name, 'authority_hrn': user_authority,