Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[unfold.git] / portal / actions.py

diff --git a/portal/actions.py b/portal/actions.py
index 20a623d..79538bd 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -61,7 +61,6 @@ def clear_user_creds(request, user_email):
     try:
         user_query  = Query().get('local:user').filter_by('email', '==', user_email).select('user_id','email','password','config')
         user_details = execute_admin_query(request, user_query)
-
         # getting the user_id from the session
         for user_detail in user_details:
             user_id = user_detail['user_id']
@@ -632,15 +631,15 @@ def create_slice(wsgi_request, request):
         'slice_enabled'    : True
     }
     # ignored in request: id, timestamp,  number_of_nodes, type_of_nodes, purpose
-    
+
     query = Query.create('slice').set(slice_params).select('slice_hrn')
-    results = execute_query(wsgi_request, query)
+    results = execute_admin_query(wsgi_request, query)
     if not results:
         raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
-    else:
+    else:      
         clear_user_creds(wsgi_request,user_obj.username)
         # log user activity
-        activity.slice.validate(request, "Slice validation")#, { "slice" : hrn })
+        activity.slice.validate(request,{ "slice" : hrn }) #"Slice validation", { "slice" : hrn })
        
         try:
             theme.template_name = 'slice_request_validated.txt'
@@ -763,7 +762,7 @@ def manifold_add_reference_user_accounts(wsgi_request, request):
         }
         manifold_add_account(wsgi_request, manifold_account_params)
 
-def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False):
+def sfa_create_user(wsgi_request, request, namespace = None, as_admin = True):
     """
     Arguments:
         wsgi_request (~ WSGIRequest) : 
@@ -794,6 +793,13 @@ def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False):
     #query = Query.create('user').set(sfa_user_params).select('user_hrn')
     #results = execute_query(wsgi_request, query)
 
+    ###### Guilherme 08-07-2015
+    ##subject = 'Teste das chaves publicas'
+    ##message = 'Um novo usuario SFA esta sendo criado\n'
+    ##message += "request['public_key']: " + request['public_key'] + '\n'
+    ##message += "sfa_user_params['keys']: " + sfa_user_params['keys'] + '\n'
+    ##send_mail(subject, message, 'support@fibre.org.br', [request['email']], fail_silently=False)
+
     if namespace is not None:
         query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn')
     else:
@@ -893,7 +899,7 @@ def iotlab_create_user (wsgi_request, request, namespace = None, as_admin=False)
         "structure"     : request['authority_hrn'],
         "city"          : "N/A",
         "country"       : "N/A",
-        "sshPublicKey"  : [request['public_key']],
+        "sshPublicKey"  : request['public_key'],
         "motivations"   : "SFA federation",
     }