# private_key = ''.join(private_key.split())
# public_key = "ssh-rsa " + public_key
# Saving to DB
- keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
+ account_config = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}'
auth_type = 'managed'
#keypair = re.sub("\r", "", keypair)
#keypair = re.sub("\n", "\\n", keypair)
file_extension = os.path.splitext(file_name)[1]
allowed_extension = ['.pub','.txt']
if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content):
- keypair = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
- keypair = re.sub("\r", "", keypair)
- keypair = re.sub("\n", "\\n",keypair)
- keypair = ''.join(keypair.split())
+ account_config = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
+ account_config = re.sub("\r", "", account_config)
+ account_config = re.sub("\n", "\\n",account_config)
+ account_config = ''.join(account_config.split())
auth_type = 'user'
# for sending email
public_key = file_content
#login = reg_login,
email = reg_email,
password = request.POST['password'],
- keypair = keypair,
+ keypair = account_config,
)
b.save()
# saves the user to django auth_user table [needed for password reset]
user = User.objects.create_user(reg_email, reg_email, request.POST['password'])
#creating user to manifold local:user
- config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
- user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config}
+ user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
+ user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config}
manifold_add_user(request,user_params)
#creating local:account in manifold
user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
- user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair}
- manifold_add_account(request,user_params)
+ account_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': account_config}
+ manifold_add_account(request,account_params)
# Send email
ctx = {
from django.shortcuts import render
from django.core.mail import send_mail
+from unfold.page import Page
+
from manifold.core.query import Query
from manifold.manifoldapi import execute_admin_query, execute_query
from portal.actions import authority_get_pi_emails
from portal.forms import SliceRequestForm
from unfold.loginrequired import LoginRequiredAutoLogoutView
-from ui.topmenu import topmenu_items, the_user
+from ui.topmenu import topmenu_items_live, the_user
class SliceRequestView (LoginRequiredAutoLogoutView):
-
- def authority_hrn_initial (self, request):
- # Using cache manifold-tables to get the list of authorities
- authorities_query = Query.get('authority').\
- select('name', 'authority_hrn')
-
- #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple-onelab').filter_by('disabled', '==', 'False')
- #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
- #if onelab_enabled:
- #authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple','ple.nitos'])
- # Now using Cache
-
- authorities = execute_admin_query(request, authorities_query)
- authorities = sorted(authorities)
-
- authority_hrn_tuples = [ (authority['authority_hrn'], authority['name'] if authority['name'] else authority['authority_hrn'],) for authority in authorities ]
- print "authority_hrn_tuples=", authority_hrn_tuples
- return {'authority_hrn': authority_hrn_tuples}
+ def __init__ (self):
+ self.user_email = ''
+ self.errors = []
# because we inherit LoginRequiredAutoLogoutView that is implemented by redefining 'dispatch'
# we cannot redefine dispatch here, or we'd lose LoginRequired and AutoLogout behaviours
def post (self, request):
-
- # The form has been submitted
- form = SliceRequestForm(request.POST, initial=self.authority_hrn_initial(request))
-
- if form.is_valid():
- slice_name = form.cleaned_data['slice_name']
- authority_hrn = form.cleaned_data['authority_hrn']
- number_of_nodes = form.cleaned_data['number_of_nodes']
- type_of_nodes = form.cleaned_data['type_of_nodes']
- purpose = form.cleaned_data['purpose']
-
- s = PendingSlice(
- slice_name = slice_name,
- authority_hrn = authority_hrn,
- number_of_nodes = number_of_nodes,
- type_of_nodes = type_of_nodes,
- purpose = purpose
- )
- s.save()
+ return self.get_or_post (request, 'POST')
- # All validation rules pass; process data in form.cleaned_data
- # slice_name, number_of_nodes, type_of_nodes, purpose
- email = form.cleaned_data['email'] # email of the sender
- cc_myself = form.cleaned_data['cc_myself']
-
- # The recipients are the PI of the authority
- recipients = authority_get_pi_emails(request, authority_hrn)
-
- if cc_myself:
- recipients.append(email)
- msg = render_to_string('slice-request-email.txt', form.cleaned_data)
- print "email, msg, email, recipients", email , msg, email, recipients
- send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
+ def get (self, request):
+ return self.get_or_post (request, 'GET')
- return render(request,'slice-request-ack-view.html') # Redirect after POST
- else:
- return self._display (request, form)
+ def get_or_post (self, request, method):
+ # Using cache manifold-tables to get the list of authorities faster
+ authorities_query = Query.get('authority').select('name', 'authority_hrn')
+ authorities = execute_admin_query(request, authorities_query)
+ authorities = sorted(authorities)
- def get (self, request):
- return self._display (request, SliceRequestForm(initial=self.authority_hrn_initial(request)))
+ user_query = Query().get('local:user').select('email')
+ user_email = execute_query(self.request, user_query)
+ self.user_email = user_email[0].get('email')
- def _display (self, request, form):
- return render(request, 'slice-request-view.html', {
- 'form': form,
- 'topmenu_items': topmenu_items('Request a slice', request),
- 'username': the_user (request)
- })
+ page = Page(request)
+ page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] )
+ if method == 'POST':
+ self.errors = []
+
+ # The form has been submitted
+ slice_name = request.POST.get('slice_name', '')
+ authority_hrn = request.POST.get('authority_hrn', '')
+ number_of_nodes = request.POST.get('number_of_nodes', '')
+ purpose = request.POST.get('purpose', '')
+ email = self.user_email
+ cc_myself = True
+
+ if (authority_hrn is None or authority_hrn == ''):
+ self.errors.append('Please, select an authority')
+ # What kind of slice name is valid?
+ if (slice_name is None or slice_name == ''):
+ self.errors.append('Slice Name is mandatory')
+
+ if (purpose is None or purpose == ''):
+ self.errors.append('Purpose is mandatory')
+
+ if not self.errors:
+ ctx = {
+ 'email': email,
+ 'slice_name': slice_name,
+ 'authority_hrn': authority_hrn,
+ 'number_of_nodes': number_of_nodes,
+ 'purpose': purpose,
+ }
+ s = PendingSlice(
+ slice_name = slice_name,
+ authority_hrn = authority_hrn,
+ number_of_nodes = number_of_nodes,
+ purpose = purpose
+ )
+ s.save()
+
+ # The recipients are the PI of the authority
+ recipients = authority_get_pi_emails(request, authority_hrn)
+
+ if cc_myself:
+ recipients.append(email)
+ msg = render_to_string('slice-request-email.txt', ctx)
+ #print "email, msg, email, recipients", email , msg, email, recipients
+ send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
+
+ return render(request,'slice-request-ack-view.html') # Redirect after POST
+
+ template_env = {
+ 'topmenu_items': topmenu_items_live('Request a slice', page),
+ 'errors': self.errors,
+ 'slice_name': request.POST.get('slice_name', ''),
+ 'authority_hrn': request.POST.get('authority_hrn', ''),
+ 'number_of_nodes': request.POST.get('number_of_nodes', ''),
+ 'purpose': request.POST.get('purpose', ''),
+ 'email': self.user_email,
+ 'cc_myself': True,
+ 'authorities': authorities,
+ }
+ template_env.update(page.prelude_env ())
+ return render(request, 'slicerequest_view.html',template_env)
--- /dev/null
+{% extends "layout-unfold1.html" %}
+{% load i18n %}
+
+{% block head %}
+{{ wizard.form.media }}
+{% endblock %}
+
+{% block unfold_main %}
+
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
+<!-- xxx ideally only onelab.css but ... xxx -->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
+
+<div class="onelab-title well-lg">
+ <h2>Request a Slice</h2>
+</div>
+
+{% if errors %}
+<ul>
+ {% for error in errors %}
+ <li>{{ error }}</li>
+ {% endfor %}
+</ul>
+{% endif %}
+
+<div class='well'>
+ <form id="commentForm" class="form-horizontal" action="" method="post" role="form">{% csrf_token %}
+ <fieldset>
+
+ <div class="form-group">
+ <label for="email" class="col-xs-2 control-label">Experimenter</label>
+ <div class="col-xs-4">
+ <label class="col-xs-2 control-label" style="height:34px;">{{ email }}</label>
+ </div>
+ <div class="col-xs-6"> <p class="form-hint">Experimenter requesting a Slice</p> </div>
+ </div>
+
+ <div class="form-group">
+ <label for="slice_name" class="col-xs-2 control-label">Slice Name</label>
+ <div class="col-xs-4">
+ <input type="text" name="slice_name" class="form-control" minlength="2" value="{{ slice_name }}" placeholder="Slice Name" required />
+ </div>
+ <div class="col-xs-6"> <p class="form-hint">The name of the slice you wish to create</p> </div>
+ </div>
+
+ <div class="form-group">
+ <label for="authority_hrn" class="col-xs-2 control-label">Authority</label>
+ <div class="col-xs-4">
+ <div class="ui-widget">
+ <input id="authority_hrn" name="authority_hrn" class="form-control" value="{{ authority_hrn }}" placeholder="Authority" required />
+ </div>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your slice</p></div>
+ </div>
+
+ <div class="form-group">
+ <label for="number_of_nodes" class="col-xs-2 control-label">Number of nodes</label>
+ <div class="col-xs-4">
+ <div class="ui-widget">
+ <input id="number_of_nodes" name="number_of_nodes" class="form-control" value="{{ number_of_nodes }}" />
+ </div>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Number of nodes you expect to request (informative)</p></div>
+ </div>
+
+ <div class="form-group">
+ <label for="purpose" class="col-xs-2 control-label">Experiment purpose</label>
+ <div class="col-xs-4">
+ <div class="ui-widget">
+ <textarea id="purpose" name="purpose" class="form-control" style="height:110px;" placeholder="Purpose" required>{{ purpose }}</textarea>
+ </div>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Purpose of your experiment (informative)</p></div>
+ </div>
+
+ <button class="submit btn btn-default col-xs-12" type="submit">Request Slice</button>
+ </fieldset>
+ </form>
+</div>
+
+<script>
+jQuery(document).ready(function(){
+ var availableTags = [
+ {% if authorities %}
+ {% for authority in authorities %}
+ {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
+ {% endfor %}
+ {% else %}
+ {value:"",label:"No authority found !!!"}
+ {% endif %}
+ ];
+ $( "#authority_hrn" ).autocomplete({
+ source: availableTags,
+ select: function( event, ui ) {console.log(jQuery(this))}
+ });
+});
+</script>
+{% endblock %}
+
git://git.onelab.eu / myslice.git / commitdiff