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

[myslice.git] / portal / actions.py

diff --git a/portal/actions.py b/portal/actions.py
index 16ddaa1..53d0a78 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -39,23 +39,46 @@ def sfa_add_slice(slice_params):
 
 # Propose hrn
 
-def manifold_add_user(user_params):
-    # user_params: email, password
+def manifold_add_user(request, user_params):
+    # user_params: email, password e.g., user_params = {'email':'aa@aa.com','password':'demo'}
     query = Query.create('local:user').set(user_params).select('email')
-    results = execute_query(query)
+    results = execute_query(request,query)
     if not results:
         raise Exception, "Failed creating manifold user: %s" % user_params['email']
     result, = results
     return result['email']
 
-def manifold_add_account(account_params):
+def manifold_update_user(request, user_params):
+    # user_params: password, config e.g., 
+    query = Query.update('local:user').filter_by('email', '==', request.user.email).set(user_params).select('email')
+    results = execute_query(request,query)
+    # NOTE: results remains empty and goes to Exception. However, it updates the manifold DB.
+    # That's why I commented the exception part. -- Yasin 
+    #if not results:
+    #    raise Exception, "Failed updating manifold user: %s" % user_params['email']
+    #result, = results
+    return results
+
+def manifold_add_account(request, account_params):
     query = Query.create('local:account').set(account_params).select(['user', 'platform'])
-    results = execute_query(query)
+    results = execute_query(request,query)
     if not results:
         raise Exception, "Failed creating manifold account on platform %s for user: %s" % (account_params['platform'], account_params['user'])
     result, = results
     return (result['user'], result['platform'])
 
+def manifold_update_account(request,account_params):
+    # account_params: config
+    query = Query.update('local:account').filter_by('email', '==', request.user.email).set(account_params).select('email')
+    results = execute_query(request,query)
+    # NOTE: results remains empty and goes to Exception. However, it updates the manifold DB.
+    # That's why I commented the exception part. -- Yasin 
+    #if not results:
+    #    raise Exception, "Failed updating manifold account: config %s" % account_params['config']
+    #result, = results
+    return results
+
+
 def make_request_user(user):
     request = {}
     request['type'] = 'user'