X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fslicerequestview.py;h=b927d4f76cdf50af8967324363824b50d82a0dea;hb=refs%2Fheads%2Ff4f-review;hp=4a52560cdc7d1a1064e8972b949c2ed3c9f6a54a;hpb=52a0b9984635eab3576e652a3a55c7bb15f564d6;p=myslice.git diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index 4a52560c..b927d4f7 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, clear_user_creds +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 @@ -17,6 +17,7 @@ from myslice.theme import ThemeView import json, time, re import activity.user +theme = ThemeView() class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): template_name = 'slicerequest_view.html' @@ -42,7 +43,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 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') @@ -60,14 +62,14 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): # 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']: @@ -76,20 +78,22 @@ 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) page.add_js_files ( [ "js/jquery.validate.js", "js/jquery-ui.js" ] ) - page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] ) + page.add_css_files ( [ "css/jquery-ui.css" ] ) page.expose_js_metadata() if method == 'POST': @@ -108,6 +112,11 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 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 and project != '': + authority_hrn = project + slice_request = { 'type' : 'slice', 'id' : None, @@ -124,12 +133,13 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): # create slice_hrn based on authority_hrn and slice_name 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('myslice:slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn) + # slice name is unique among all authorities + 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: - if _slice['slice_hrn'] == req_slice_hrn: + split_list = _slice['slice_hrn'].split('.') + sfa_slice_name = split_list[-1] + if sfa_slice_name == slice_name: errors.append('Slice already exists. Please use a different slice name.') @@ -140,9 +150,17 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): if (re.search(r'^[A-Za-z0-9_]*$', slice_name) == None): errors.append('Slice name may contain only letters, numbers, and underscore.') - organization = slice_request['organization'] - if (organization is None or organization == ''): - errors.append('Organization is mandatory') + organization = slice_request['organization'] + if theme.theme == 'fed4fire': + if (organization is None or organization == ''): + errors.append('Selecting project is mandatory') + else: + if (organization is None or organization == ''): + errors.append('Organization is mandatory') + + slice_length= len(slice_request['slice_name']) + if slice_length >19: + errors.append('Slice name can be maximum 19 characters long')