From: Loic Baron Date: Wed, 29 Oct 2014 15:12:15 +0000 (+0100) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~13^2~9^2~2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5a690e87a71059403fe3872a5a11b437f22f0438;hp=2ab33522a6a0799cb9aaf9a663e3b91a5e4fa2ac;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/README b/README index 4e0b4716..b1f201da 100644 --- a/README +++ b/README @@ -11,7 +11,7 @@ See the devel/ subdir for more devel-oriented doc. ** see devel/django-install.txt in case of trouble $ apt-get install python-django $ apt-get install python-django-south -$ apt-get install python-pip +$ apt-get install python-pip or sudo easy_install pip==1.4.1 $ pip install requests $ pip install djangorestframework * git clone git://git.onelab.eu/myslice.git diff --git a/activity/__init__.py b/activity/__init__.py index d2a9e94f..4719a61c 100644 --- a/activity/__init__.py +++ b/activity/__init__.py @@ -62,9 +62,10 @@ def logWrite(request, action, message, objects = None): "testbed" : None, } - for o in objects : - if (o in log) : - log[o] = objects[o] + if objects is not None: + for o in objects : + if (o in log) : + log[o] = objects[o] try : result = urllib2.urlopen(server, urllib.urlencode(log)) @@ -72,7 +73,8 @@ def logWrite(request, action, message, objects = None): content = result.read() except urllib2.URLError as e: print "===============>> activity: connection to " + server + " impossible, could not log action" - print "==>> " + e.strerror + print e.strerror + print "" def log(request, action, message, objects = None): # Create a new thread in Daemon mode to send the log entry diff --git a/portal/actions.py b/portal/actions.py index 400f3a73..6fde0211 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -612,14 +612,14 @@ def create_slice(wsgi_request, request): } # ignored in request: id, timestamp, number_of_nodes, type_of_nodes, purpose - query = Query.create('slice').set(slice_params).select('slice_hrn') + query = Query.create('myslice:slice').set(slice_params).select('slice_hrn') results = execute_query(wsgi_request, query) if not results: raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn'] else: clear_user_creds(wsgi_request,user_email) # log user activity - activity.slice.validate(self.request, "Slice validation", { "slice" : hrn }) + #activity.slice.validate(request, "Slice validation", { "slice" : hrn }) try: theme.template_name = 'slice_request_validated.txt' text_content = render_to_string(theme.template, request) diff --git a/portal/homeview.py b/portal/homeview.py index 00b279d2..f1ac37cc 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -1,24 +1,25 @@ # this somehow is not used anymore - should it not be ? -from django.core.context_processors import csrf -from django.http import HttpResponseRedirect -from django.contrib.auth import authenticate, login, logout -from django.template import RequestContext -from django.shortcuts import render_to_response -from django.shortcuts import render +from django.core.context_processors import csrf +from django.http import HttpResponseRedirect +from django.contrib.auth import authenticate, login, logout +from django.template import RequestContext +from django.shortcuts import render_to_response +from django.shortcuts import render -import json -from unfold.loginrequired import FreeAccessView +from unfold.loginrequired import FreeAccessView from manifold.core.query import Query from manifoldapi.manifoldapi import execute_query -from manifoldapi.manifoldresult import ManifoldResult -from ui.topmenu import topmenu_items, the_user -from myslice.configengine import ConfigEngine +from manifoldapi.manifoldresult import ManifoldResult +from ui.topmenu import topmenu_items, the_user +from myslice.configengine import ConfigEngine -from myslice.theme import ThemeView +from myslice.theme import ThemeView +from portal.models import PendingSlice +import json import activity.user class HomeView (FreeAccessView, ThemeView): @@ -97,8 +98,13 @@ class HomeView (FreeAccessView, ThemeView): user_cred = 'no_creds' else: user_cred = 'has_creds' + + # list the pending slices of this user + pending_slices = [] + for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all(): + pending_slices.append(slices.slice_name) - + env['pending_slices'] = pending_slices env['pi'] = pi env['user_cred'] = user_cred else: @@ -155,8 +161,13 @@ class HomeView (FreeAccessView, ThemeView): user_cred = 'no_creds' else: user_cred = 'has_creds' - + # list the pending slices of this user + pending_slices = [] + for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all(): + pending_slices.append(slices.slice_name) + + env['pending_slices'] = pending_slices env['pi'] = pi env['user_cred'] = user_cred env['person'] = self.request.user diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html index 8f2b0c14..9f165d0e 100644 --- a/portal/templates/activate_user.html +++ b/portal/templates/activate_user.html @@ -15,12 +15,12 @@ You may now log in to the portal using you

diff --git a/portal/templates/activate_user.txt b/portal/templates/activate_user.txt index fd7278fe..a68d1ceb 100644 --- a/portal/templates/activate_user.txt +++ b/portal/templates/activate_user.txt @@ -9,13 +9,13 @@ Email: {{email}} You may now log in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required: - 1. You confirm that you have indeed made this request by clicking on the following link: + 1. You must confirm that you have indeed made this request by clicking on the following link: {{validation_link}} If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email. - 2. A manager from your organization validates your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request. + 2. A manager from your organization must also validate your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request. We look forward to welcoming you to OneLab. Please don't hesitate to contact us at support@onelab.eu with any additional questions that you might have. diff --git a/portal/templates/email_activation.html b/portal/templates/email_activation.html index ce763ba3..d923b9da 100644 --- a/portal/templates/email_activation.html +++ b/portal/templates/email_activation.html @@ -8,17 +8,17 @@

{% if activation_status == 'success' %}

Signup request confirmed.

-

You are currently able to log in to the portal using your email address and the password that you provided, but your access is still limited.

-

You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to the managers with a validation request.

+

You are currently able to log in to the portal using your email address and the password that you have provided; however, your access is still limited.

+

You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to your organisation's managers with a validation request.

{% elif activation_status == 'validated' %}

Account validated.

We have identified you as a valid PLE user. Your OneLab account has automatically been approved.

You have a full access to OneLab testbeds.

{%else%}

Signup confirmation failed.

-

You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. However, - we have been unable to match the link that you have clicked to a signup request in our database.

-

Please contact support so that we can help you complete the signup process.

+

You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. + We have been unable to match the link that you have clicked to a signup request in our database.

+

Please contact support so that we may help you complete the signup process.

{%endif%}
diff --git a/portal/templates/onelab/onelab_account-view.html b/portal/templates/onelab/onelab_account-view.html index 199444a3..549ec6b4 100644 --- a/portal/templates/onelab/onelab_account-view.html +++ b/portal/templates/onelab/onelab_account-view.html @@ -154,9 +154,9 @@ -

Tradeoff: Ease-of-use vs Security.
- Ease-of-use: Automatic account delegation. Don't delete private key.
- Security: Manual account delegation. Download & Delete private key. +

+ Automatic vs. Manual delegation of credentials: + Trade-off between ease-of-use & security

@@ -276,24 +276,31 @@ -
-

You may get this message for several reasons.

-

Account Delegation: Automatic

+
+

You are getting this message for any of the following reasons:

    -
  • If your account is not yet validated
    • +
  • If your account is still pending for validation
  • If you press the "Clear Credentials" button
  • If you "Generate a new key pair"
  • If a new slice is added to your account
-

In all the above mentioned cases, it is sufficient to refresh the page or go back to home page. The portal will regenrate your credentials. - In some cases it may take more time than usual. If nothing works, then please logout and login again to the portal.

-

Account Delegation: Manual

-

First of all your account needs to be validated by the manager of your organization.

-

As you have uploaded your own public key, the portal can no longer generate your credentials automatically.

-

In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to - delegate your credentials to the portal. +

Unless your account has not yet been validated, it is sufficient to refresh the page or go back to the home page. + The portal will then regenerate your credentials. In some cases it may take more time than usual. If nothing works, + then please logout and login back into to the portal.

-
Contact support
+

Manual delegation of credentials

+

+ You have selected upon sign-up to upload your public key. As you have uploaded your own public key, + the portal can no longer generate your credentials automatically. In order to have your credentials + delegated to the portal, please follow these instructions: +

+
    +
  • Your account must first be validated by the manager of your organization.
    • +
  • In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to + delegate your credentials to the portal.
    • +
+

+

Contact support

If you don't have the above mentioned cases and still have this message, please contact us.

@@ -304,6 +311,48 @@
+ + + + +
diff --git a/portal/templates/onelab/onelab_contact.html b/portal/templates/onelab/onelab_contact.html index 2a7c60af..4014ede6 100644 --- a/portal/templates/onelab/onelab_contact.html +++ b/portal/templates/onelab/onelab_contact.html @@ -14,9 +14,9 @@
-

Please check our FAQ section. Most of the basic problems are explained there.

+

If you are having any problems, please read our FAQ section as many of them are explained there.

- If you haven't find your answes in the FAQ, please contact us by filling the form below.
+ If you cannot find the answers to your questions in our FAQ section, please contact us by filling out the form below.
You can also e-mail us directly.

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html index b3394d60..944bcbe6 100644 --- a/portal/templates/onelab/onelab_home-view.html +++ b/portal/templates/onelab/onelab_home-view.html @@ -14,24 +14,31 @@
-
-

You may get this message for several reasons.

-

Account Delegation: Automatic

+
+

You are getting this message for any of the following reasons:

    -
  • If your account is not yet validated
    • +
  • If your account is still pending for validation
  • If you press the "Clear Credentials" button
  • If you "Generate a new key pair"
  • If a new slice is added to your account
-

In all the above mentioned cases, it is sufficient to refresh the page or go back to home page. The portal will regenrate your credentials. - In some cases it may take more time than usual. If nothing works, then please logout and login again to the portal.

-

Account Delegation: Manual

-

First of all your account needs to be validated by the manager of your organization.

-

As you have uploaded your own public key, the portal can no longer generate your credentials automatically.

-

In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to - delegate your credentials to the portal. +

Unless your account has not yet been validated, it is sufficient to refresh the page or go back to the home page. + The portal will then regenerate your credentials. In some cases it may take more time than usual. If nothing works, + then please logout and login back into to the portal.

-
Contact support
+

Manual delegation of credentials

+

+ You have selected upon sign-up to upload your public key. As you have uploaded your own public key, + the portal can no longer generate your credentials automatically. In order to have your credentials + delegated to the portal, please follow these instructions: +

+
    +
  • Your account must first be validated by the manager of your organization.
    • +
  • In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to + delegate your credentials to the portal.
    • +
+

+

Contact support

If you don't have the above mentioned cases and still have this message, please contact us.

@@ -136,6 +143,18 @@
Loading Slices
+ {% if pending_slices %} +

Pending slices + +

    + {% for slices in pending_slices %} +
  • {{slices}}
    • + {% endfor %} +
+ +

+ {%endif%}

diff --git a/portal/templates/onelab/onelab_supportview.html b/portal/templates/onelab/onelab_supportview.html index 72e013da..e59d2817 100644 --- a/portal/templates/onelab/onelab_supportview.html +++ b/portal/templates/onelab/onelab_supportview.html @@ -23,13 +23,13 @@
-
+

Frequently Asked Questions (FAQs)

PlanetLab Europe Users

  • -

    I am a PlanetLab Europe user, how do I sign up?

    +

    I am already a PlanetLab Europe user, how do I sign up?

    Users that already have an account on PlanetLab Europe will be able to sign up using the available form and selecting their institution from the provided list.
    @@ -37,7 +37,7 @@

  • -

    Which testbeds will I be able to access to?

    +

    Which testbeds will I be able to access?

    You will be able to access NITOS, a wireless based testbed, and IoT-LAB, a sensor and radio based testbed.

    @@ -50,7 +50,7 @@ We are working to provide you with an equally good PlanetLab experience through the OneLab portal, and we will invite you to help us beta-test this feature as soon as it is available.
    Other users, who do not have PlanetLab Europe accounts, currently have limited access to - PlanetLab Europe through the OneLab portal, but this is not equivalent to the full access you + PlanetLab Europe through the OneLab portal. This is not the same as the full access that you currently enjoy through your PlanetLab Europe account.

    • @@ -59,32 +59,41 @@

    Users

    • Who is a user?

      • -

      A user is an experimenter who registers to the OneLab portal and able to use all the facilites that the portal has to offer. However, a user does not +

      A user is an experimenter who registers to the OneLab portal and able to use all of the facilities that the portal has to offer. However, a user does not have the right to do any admin operation such as managing slices, users and resources.

    • How do I register?

      • -

      In order to register you must go to the Registration page. You have to choose your corresponding institution (authority). After registration you have to wait until the PI validates your account. However upon registration, you will be able login to the portal with a limited access. Do not try to re-register with the same email address.

      +

      In order to register you must go to the Registration page. You must choose your corresponding institution (authority). + After registration you will have to wait until the manager of your organization validates your account. However upon registration, you will be able login to the portal with + a limited access. Do not try to re-register with the same email address.

    • Why can't I register with my email?

      • If you have already registered then you won't be able to register again with the same email address. However, if you have never registered and still you are not able to use your email then please Contact Support and mention the error message that you are getting while trying to register.

      -

    • In registration, in "My keys" option, what should i choose?

      • -

      There are two choices.

      -

      1. Generate Key Pairs: This option is for users who have no knowledge about SFA and MySlice i.e., new users. We offer convenience to the new users in order to avoid addtional efforts to delegate keys manually. If you choose this option, the portal will automatically handle your credentials and you would be able use the portal as soon as the PI validates your account. However, you can delete your private key from the portal if you are concerned about privacy issues. In that case once your current credentials expire, you have to delegate your credentials manually using SFA. As this needs advance knowledge about SFA and Myslice, we highly recommend to the new users to keep both private and public keys in the portal in order to keep the process automatic.

      -

      2. Upload My Public Key: This option is for users who have experience with MySlice and SFA. If you choose this option, once the PI validates your account, you have to delegate your credentials manually using SFA. You have to repeat the same process everytime your credentials expire. Normally, credentials expire every one month. You can see the expiration date in your Account page.

      +

    • In the "My keys" option under registration, what should I choose?

      • +

      You may choose one of the two options.

      +

      1. Generate Key Pairs: This option is for users who have no knowledge about SFA and MySlice i.e., new users. + We offer convenience to the new users in order to avoid additional efforts to delegate keys manually. If you choose this option, + the portal will automatically handle your credentials and you would be able use the portal as soon as your organization's manager + validates your account. However, you can delete your private key from the portal if you are concerned about privacy issues. In this instance, + once your current credentials expire, you will have to delegate your credentials manually using SFA. + As this needs advance knowledge about SFA and Myslice, we highly recommend to the new users to keep both private and public keys in + the portal in order to keep the process automatic. +

      +

      2. Upload My Public Key: This option is for users who have experience with MySlice and SFA. If you choose this option, once your organization's manager validates your account, you will have to delegate your credentials manually using SFA. You have will to repeat this same process every time your credentials expire. Credentials must generally be renewed every 30 days. You can see the expiration date in your Account page.

    • Who is responsible for validating my account?

      • -

      When you register, you choose an authority fromt he list of authorities. For each authority there is a Principal Investigator (PI). PI of your authority will verify your identity and if he finds that you are from his institution, he will validate your account otherwise he will reject your account.

      +

      When you register, you choose an authority from he list of authorities. For each authority there is a manager. The manager of your organization will verify your identity and if he finds that you are from his institution, he will validate your account.If you are not a part of his organization, then he will not approve your account.

      -

    • How long I have to wait for validation?

      • +

    • How long must I wait for validation?

      • It depends on the PI of your authority. In general, it should not take more than a week. If you are waiting more than usual, please Contact Support and explain your problem.

    • I just registered. Why can't I see any slices and resources?

      • -

      Once you register, you can login to your account with limited access. It means that you can view your account details, modify your name and password. You can also view other pages. However, you will not be able to see any slices as well as resources before your account validation. But you can Request Slice before being validated. Therefore, the PI will validate your account as well as your requested slice. Once validated, you will be able to see your slice and if you click on your slice, you will be able to see resources in that slice and you can reserve nodes and start your experiment.

      +

      Once you register, you can login to your account with limited access. It means that you can view your account details, modify your name and password. You can also view other pages. However, you will not be able to see any slices as well as resources before your account validation. But you can Request Slice before being validated. In this instance, your organization's manager will validate your account as well as your requested slice. Once validated, you will be able to see your slice. If you click on your slice, you will be able to see the resources in that slice and you can reserve nodes and start your experiment.

    • How can I get access to a slice?

      • -

      If you are a completely new user, you have to Request Slice. It is upto the PI of your authority to accept/reject your slice request.
      On the other hand, if you are a new user to the portal but you already have an account in OneLab SFA registry and you have access to slices, you will be able to see all your slices once your account is validated by the PI.

      +

      If you are a completely new user, you have to Request Slice. It is up to the manager of your organization to accept/reject your slice request.
      On the other hand, if you are a new user to the portal but you already have an account in the OneLab SFA registry and you have access to slices, you will be able to see all of your slices once your account is validated by the PI.

    • I forgot my password, how to recover it?

      • If you have an account in the portal but you forgot the password, you can always Reset your password.

    @@ -92,14 +101,22 @@

    Managers

    • Who is a manager?

      • -

      A manager is the Principal Investigator (PI) of the institution. Each PI has authority over his own institution. A PI can add, delete, validate users/ - slices that belong to his institution.

      +

      + A manager is the contact person and principal authority of the a particular organization. Each manager has authority over his + or her own institution/department/team. A manager may add, delete or validate users/slices that belong to his institution. + +

    • What is pending users/slices?

      • -

      In Requests page you will be able to see all the users that registered under your authority and the slices that users of your authority has requested. Therefore, pending users/slices are those users and slices that are yet to be validated. You can validate/reject these requests based on the policy of your institution.

      +

      In the Requests page you will be able to see all the users that have registered under your authority and the slices that they have requested. Therefore, pending users/slices are those users and slices that are yet to be validated. You can validate/reject these requests based on the policy of your institution.

    • How can I manage the users/slices that belong to my institution?

      • -

      In Instution page, under "Users" tab, you will be able to see all the users that belong to your authority. You can delete the users that you don't want anymore. Under "Slices" tab, you will be able to see all the slices that belong to your authority. You can renew/delete the slices based on your requirements. As a PI you can also Create Slice. Just fill the form of request slice and the slice will be automatically validated if it is requested by a PI.

      +

      + In the Instution page, under "Users" tab, you will be able to see all the users that belong to your authority. + You can delete the users that you don't want anymore. Under "Slices" tab, you will be able to see all the slices that belong to your authority. + You can renew/delete the slices based on your requirements. As a manager you may also Create Slice. + Just fill in the create slice and the slice will automatically be validated if it is requested by a manager. +

@@ -117,7 +134,7 @@

contact@onelab.eu

-

Also you can adress any issues in the same email address.

+

Also you may adress any other issues in the same email address.

Mailing Address

@@ -137,7 +154,7 @@

Report a Bug

-

If you have found a bug or having difficulties accesing some features or found some anomalies, +

If you have found a bug, are having difficulties accessing some features or have found some anomalies, please report it using our ticketing system.

diff --git a/portal/templates/slice-request-done-view.html b/portal/templates/slice-request-done-view.html index 9419d136..0d0a03b4 100644 --- a/portal/templates/slice-request-done-view.html +++ b/portal/templates/slice-request-done-view.html @@ -4,7 +4,7 @@

Slice created

-As you are a manager of your institution, your slice has directly been created. +As a manager of your institution, your slice has directly been created directly. {% endblock %} diff --git a/portal/templates/slice_request_denied.html b/portal/templates/slice_request_denied.html index c3814131..ab95deea 100644 --- a/portal/templates/slice_request_denied.html +++ b/portal/templates/slice_request_denied.html @@ -2,13 +2,14 @@

Dear OneLab user,

-

You have recently requested the following slice in the OneLab portal({{portal_url}}):

+

You have recently requested the following slice on the OneLab portal({{portal_url}}):


Slice name : {{slice_name}}
URL : {{url}}
Purpose : {{purpose}}

-

We regret to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email.

+

We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. +For any other queries, please contact us by replying to this email.


On behalf of the entire team, I wish you a fruitful user experience on OneLab.


diff --git a/portal/templates/slice_request_denied.txt b/portal/templates/slice_request_denied.txt index 7dcbee3b..521ec5ef 100644 --- a/portal/templates/slice_request_denied.txt +++ b/portal/templates/slice_request_denied.txt @@ -1,14 +1,14 @@ Dear OneLab user, -You have recently requested the following slice in the OneLab portal({{portal_url}}): +You have recently requested the following slice on the OneLab portal({{portal_url}}): Slice name : {{slice_name}} URL : {{url}} Purpose : {{purpose}} -We regret to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email. +We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. For any other queries, please contact us by replying to this email. -On behalf of the entire team, I wish you a fruitful user experience on OneLab.. +On behalf of the entire team, I wish you a fruitful user experience on OneLab. Yours sincerely, diff --git a/portal/templates/slice_request_validated.html b/portal/templates/slice_request_validated.html index c508a241..7fac65ce 100644 --- a/portal/templates/slice_request_validated.html +++ b/portal/templates/slice_request_validated.html @@ -8,9 +8,12 @@ URL : {{number_of_nodes}}
Purpose : {{purpose}}

-

We are glad to inform you that, a manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.

+

+ We are pleased to inform you that a manager from your institution has validated your slice request on the OneLab portal. + You can now add resources to you slice and start experimenting. +

-

On behalf of the entire team, I wish you a fruitful user experience on OneLab.

+

On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal.

Yours sincerely,

diff --git a/portal/templates/slice_request_validated.txt b/portal/templates/slice_request_validated.txt index f0cd3c5c..993e6ef8 100644 --- a/portal/templates/slice_request_validated.txt +++ b/portal/templates/slice_request_validated.txt @@ -6,9 +6,10 @@ Slice name : {{slice_name}} URL : {{number_of_nodes}} Purpose : {{purpose}} -We are glad to inform you that, a manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting. -On behalf of the entire team, I wish you a fruitful user experience on OneLab. +We are pleased to inform you that a manager from your institution has validated your slice request on the OneLab portal. You can now add resources to you slice and start experimenting. + +On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal. Yours sincerely, diff --git a/portal/templates/user_request_validated.html b/portal/templates/user_request_validated.html index fc883167..8821b66d 100644 --- a/portal/templates/user_request_validated.html +++ b/portal/templates/user_request_validated.html @@ -2,13 +2,13 @@

Dear {{first_name}} {{last_name}},

-

It is my pleasure to welcome you as a fully signed up user of the OneLab experimental facility. OneLab provides you with access to world class computer networking testbeds, such as IoT-LAB, NITOS, and PlanetLab Europe. Our aim at OneLab is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.

+

It is my pleasure to welcome you as a fully signed-up user of the OneLab experimental facility. OneLab provides you with access to world class computer networking testbeds, such as IoT-LAB, NITOS, and PlanetLab Europe. Our aim at OneLab is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.

-Your entry point for access to the testbeds is the OneLab portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or individual nodes on the testbed with your OneLab public/private key pair, or use an experiment control tool such as as NEPI or OMF. The OneLab operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them. +Your entry point for access to the testbeds is the OneLab portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or individual nodes on the testbed with your OneLab public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The OneLab operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them.

-

On behalf of the entire team, I wish you a fruitful user experience on OneLab.

+

On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal.

Yours sincerely,

diff --git a/portal/templates/user_request_validated.txt b/portal/templates/user_request_validated.txt index 6c290f62..6765f3b3 100644 --- a/portal/templates/user_request_validated.txt +++ b/portal/templates/user_request_validated.txt @@ -4,7 +4,7 @@ It is my pleasure to welcome you as a fully signed-up user of the OneLab experim Your entry point for access to the testbeds is the OneLab portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or to individual nodes on the testbed with your OneLab public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The OneLab operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them. -On behalf of the entire team, I wish you a fruitful user experience on OneLab. +On behalf of the entire team, I wish you a fruitful user experience with the OneLab portal. Yours sincerely,