X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=a6349c76f8c6192abf6e530ff85e9ed4d9f21839;hb=23a066e493df6d553e358c1a3fcee04e6c371458;hp=c373a30ccc671640ac5a2f76a4e5b90a0a6fe2fb;hpb=caafec9916ce3ca86106a7bc8aa167b53309e072;p=myslice.git

diff --git a/portal/actions.py b/portal/actions.py
index c373a30c..a6349c76 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -48,7 +48,6 @@ def sfa_update_user(request, user_hrn, user_params):
     results = execute_query(request,query)
     return results
 
-
 def sfa_add_slice(request, slice_params):
     query = Query.create('slice').set(slice_params).select('slice_hrn')
     results = execute_query(request, query)
@@ -56,6 +55,13 @@ def sfa_add_slice(request, slice_params):
         raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
     return results
 
+def sfa_add_user_to_slice(request, user_hrn, slice_params):
+    query = Query.update('slice').filter_by('user_hrn', '==', user_hrn).set(slice_params).select('slice_hrn')
+    results = execute_query(request, query)
+    if not results:
+        raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
+    return results
+
 # Propose hrn
 
 def manifold_add_user(request, user_params):
@@ -131,6 +137,7 @@ def make_request_slice(slice):
     request = {}
     request['type'] = 'slice'
     request['id'] = slice.id
+    request['user_email'] = slice.user_email
     request['timestamp'] = slice.created
     request['authority_hrn'] = slice.authority_hrn
     request['slice_name'] = slice.slice_name
@@ -166,6 +173,7 @@ def get_request_by_id(ids):
     return make_requests(pending_users, pending_slices)
 
 def get_request_by_authority(authority_hrns):
+    print "get_request_by_authority auth_hrns = ", authority_hrns
     if not authority_hrns:
         pending_users  = PendingUser.objects.all()
         pending_slices = PendingSlice.objects.all()
@@ -227,6 +235,9 @@ def portal_validate_request(wsgi_request, request_ids):
 
             except Exception, e:
                 request_status['SFA user'] = {'status': False, 'description': str(e)}
+            
+            user_params = {'status':2}
+            manifold_update_user(request, request['email'],user_params)
 
             # MANIFOLD user should be added beforehand, during registration
             #try:
@@ -260,6 +271,7 @@ def portal_validate_request(wsgi_request, request_ids):
                 # ignored in request: id, timestamp,  number_of_nodes, type_of_nodes, purpose
 
                 sfa_add_slice(wsgi_request, sfa_slice_params)
+                #sfa_add_user_to_slice(wsgi_request, user_hrn, sfa_slice_params)
 
                 # XXX Remove from database