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.forms import SliceRequestForm
+from portal.actions import is_pi, create_slice, create_pending_slice, clear_user_creds
+#from portal.forms import SliceRequestForm
from unfold.loginrequired import LoginRequiredAutoLogoutView
from ui.topmenu import topmenu_items_live, the_user
from myslice.theme import ThemeView
-import json, time
+import json, time, re
class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
template_name = 'slicerequest_view.html'
"""
"""
errors = []
-
+ slice_name =''
+ purpose=''
+ exp_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)
- # Get user_hrn (XXX Would deserve to be simplified)
- user_query = Query().get('local:user').select('email')
- user_emails = execute_query(wsgi_request, user_query)
- user_email = user_emails[0].get('email')
+ # Get user_email (XXX Would deserve to be simplified)
+ user_query = Query().get('local:user').select('email','config')
+ user_details = execute_query(wsgi_request, user_query)
+ user_email = user_details[0].get('email')
+ # getting user_hrn
+ for user_detail in user_details:
+ user_config = json.loads(user_detail['config'])
+ user_authority = user_config.get('authority','N/A')
+ # getting the org from authority
+ for authority in authorities:
+ 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)
# checking if pi or not
- if acc_auth_cred == {}:
+ if acc_auth_cred == {} or acc_auth_cred == 'N/A':
pi = "is_not_pi"
else:
pi = "is_pi"
# Page rendering
page = Page(wsgi_request)
- page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
+ 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.expose_js_metadata()
if method == 'POST':
# The form has been submitted
# get the domain url
current_site = Site.objects.get_current()
current_site = current_site.domain
+
+ # getting the authority_hrn from the selected organization
+ for authority in authorities:
+ if authority['name'] == wsgi_request.POST.get('org_name', ''):
+ authority_hrn = authority['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', '')
slice_request = {
'type' : 'slice',
'user_hrn' : user_hrn,
'email' : user_email,
'timestamp' : time.time(),
- 'authority_hrn' : wsgi_request.POST.get('authority_hrn', ''),
+ 'authority_hrn' : authority_hrn,
+ 'organization' : wsgi_request.POST.get('org_name', ''),
'slice_name' : wsgi_request.POST.get('slice_name', ''),
- 'number_of_nodes' : wsgi_request.POST.get('number_of_nodes', ''),
- 'type_of_nodes' : wsgi_request.POST.get('type_of_nodes', ''),
+ 'exp_url' : wsgi_request.POST.get('exp_url', ''),
'purpose' : wsgi_request.POST.get('purpose', ''),
'current_site' : current_site
}
- authority_hrn = slice_request['authority_hrn']
- if (authority_hrn is None or authority_hrn == ''):
- errors.append('Please, select an authority')
+ # 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('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:
+ errors.append('Slice already exists. Please use a different slice name.')
+
# What kind of slice name is valid?
- slice_name = slice_request['slice_name']
if (slice_name is None or slice_name == ''):
- errors.append('Slice Name is mandatory')
+ errors.append('Slice name is mandatory')
+
+ 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')
+
+
purpose = slice_request['purpose']
if (purpose is None or purpose == ''):
- errors.append('Purpose is mandatory')
+ errors.append('Experiment purpose is mandatory')
+
+ exp_url = slice_request['exp_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
'username': wsgi_request.user.email,
'topmenu_items': topmenu_items_live('Request a slice', page),
'errors': errors,
+ 'slice_name': slice_name,
+ 'purpose': purpose,
'email': user_email,
'user_hrn': user_hrn,
- 'pi': pi,
+ 'exp_url': exp_url,
+ 'pi': pi,
+ 'authority_name': authority_name,
+ 'authority_hrn': user_authority,
'cc_myself': True,
'authorities': authorities,
'theme': self.theme,
git://git.onelab.eu / myslice.git / blobdiff