X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=a2afbfc2bbe18963daf352aad6e1fc6d1624ba9c;hb=2c1bd9325dc325f82d99807fcdb9d14ae148f167;hp=75e5d06f8939ad92d8858300b27f3df168a13ea9;hpb=8441a4b2b81aa0543fa048b6ad2a59934c368769;p=unfold.git

diff --git a/portal/actions.py b/portal/actions.py
index 75e5d06f..a2afbfc2 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -71,7 +71,8 @@ def clear_user_creds(request, user_email):
                 if platform_detail['platform_id'] == account_detail['platform_id']:
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
-                        user_cred = account_config.get('delegated_user_credential','N/A')
+                        #user_cred = account_config.get('delegated_user_credential','N/A')
+                        user_cred = account_config.get('user_credential','N/A')
                         if 'N/A' not in user_cred:
                             user_hrn = account_config.get('user_hrn','N/A')
                             user_pub_key = json.dumps(account_config.get('user_public_key','N/A'))
@@ -416,13 +417,19 @@ def create_slice(wsgi_request, request):
     user_hrn = request.get('user_hrn', None)
     user_hrns = list([user_hrn]) if user_hrn else list()
     
-    user_email = request.get
+    user_query  = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_hrn)
+    user_details_sfa = execute_admin_query(wsgi_request, user_query)
+    if not user_details_sfa:
+        raise Exception, "User %s doesn't exist, validate user before validating slice" % user_hrn
+    for user in user_details_sfa:
+        user_email = user['user_email']
 
     # XXX We should create a slice with Manifold terminology
     slice_params = {
         'slice_hrn'        : hrn, 
         'slice_urn'        : urn,
         'slice_type'       : request['type'],
+        'url'              : request['number_of_nodes'],
         'users'            : user_hrns,
         'slice_enabled'    : True
     }
@@ -432,12 +439,11 @@ def create_slice(wsgi_request, request):
     results = execute_query(wsgi_request, query)
     if not results:
         raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
-    ## We do not store the email in pendingslice table. As a result receiver's email is unknown ##
-    ## Need modification in pendingslice table ###
-    #else:
-    #    subject = 'Slice created'
-    #    msg = 'A manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.'
-    #    send_mail(subject, msg, 'support@onelab.eu',['yasin.upmc@gmail.com'], fail_silently=False)
+    else:
+        clear_user_creds(wsgi_request,user_email)
+        subject = 'Slice created'
+        msg = 'A manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.'
+        send_mail(subject, msg, 'support@onelab.eu',[user_email], fail_silently=False)
        
     return results
 
@@ -450,7 +456,7 @@ def create_pending_slice(wsgi_request, request, email):
         slice_name      = request['slice_name'],
         user_hrn        = request['user_hrn'],
         authority_hrn   = request['authority_hrn'],
-        number_of_nodes = request['exp_url'],
+        number_of_nodes = request['url'],
         purpose         = request['purpose'],
     )
     s.save()
@@ -522,7 +528,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):
+def sfa_create_user(wsgi_request, request, namespace = None, as_admin = False):
     """
     Arguments:
         wsgi_request (~ WSGIRequest) : 
@@ -549,8 +555,16 @@ def sfa_create_user(wsgi_request, request):
         'user_enabled'      : True
     }
 
-    query = Query.create('user').set(sfa_user_params).select('user_hrn')
-    results = execute_query(wsgi_request, query)
+    if namespace is not None:
+        query = Query.create('%s:user' % namespace).set(sfa_user_params).select('user_hrn')
+    else:
+        query = Query.create('user').set(sfa_user_params).select('user_hrn')
+
+    if as_admin:
+        results = execute_admin_query(wsgi_request, query)
+    else:
+        results = execute_query(wsgi_request, query)
+
     if not results:
         raise Exception, "Could not create %s. Already exists ?" % sfa_user_params['user_hrn']
     else:
@@ -559,8 +573,7 @@ def sfa_create_user(wsgi_request, request):
         send_mail(subject, msg, 'support@onelab.eu',[request['email']], fail_silently=False)       
     return results
 
-def create_user(wsgi_request, request):
-    
+def create_user(wsgi_request, request, namespace = None, as_admin = False):
     # XXX This has to be stored centrally
     USER_STATUS_ENABLED = 2
 
@@ -568,7 +581,7 @@ def create_user(wsgi_request, request):
     # we would have to perform the steps in create_pending_user too
 
     # Add the user to the SFA registry
-    sfa_create_user(wsgi_request, request)
+    sfa_create_user(wsgi_request, request, namespace, as_admin)
 
     # Update Manifold user status
     manifold_update_user(wsgi_request, request['email'], {'status': USER_STATUS_ENABLED})