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

Conflicts:
	portal/actions.py
	portal/lsapiclient.py

diff --git a/portal/actions.py b/portal/actions.py
index feef871..07943ef 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -578,44 +578,56 @@ def ls_create_user(wsgi_request, request, user_detail):
     organization = request['username'].split('@')[1]
     lsClient = LaboraSchedulerClient( organization )
 
-    org_gidnumber = lsClient.get_testbed_info()['gidnumber']
-    user_homedirectory = "/home/" + organization + "/" + request['username'].split('@')[0]
-    user_homedirectory = user_homedirectory.encode('utf-8')
+    orgGIDNumber = lsClient.get_testbed_info()['gidnumber']
+    userHomeDirectory = "/home/" + organization + "/" + request['username'].split('@')[0]
+    userHomeDirectory = userHomeDirectory.encode('utf-8')
     
-    user_data = {
+    userData = {
         'username'      : request['username'],
         'email'         : request['email'].encode('utf-8'),
         'password'      : request['password'].encode('utf-8'),
         'name'          : str( request['first_name'].encode('latin1') ) + ' ' + str( request['last_name'].encode('latin1') ),
-        'gidnumber'     : org_gidnumber,
-        'homedirectory' : user_homedirectory
+        'gidnumber'     : orgGIDNumber,
+        'homedirectory' : userHomeDirectory,
+        'created_by'    : "myslice"
     }
     
-    # Add user in the island:
-    addUser = lsClient.add_user( user_data )
-
-
+    # Add user in the island.
+    addUser = lsClient.add_user( userData )
+    
+    # User successfully created, upload user public key.
+    if addUser:
+        ls_update_public_key( wsgi_request, request, lsClient, addUser )
+    
     return addUser
 
 def ls_validate_user(wsgi_request, request):
     organization = request['username'].split('@')[1]
     lsClient = LaboraSchedulerClient( organization )
     
-    user_id = lsClient.get_user_id_by_username( { 'username': str(request['username']) } )
+    userId = lsClient.get_user_id_by_username( { 'username': str( request['username'] ) } )
     
     validate = False
-    if user_id:
-        user_data = {
-            'user_id'       : user_id,
+    if userId:
+        userData = {
+            'user_id'       : userId,
             'new_user_data' : { 'enable': 'TRUE' }
         }
         
-        validate = lsClient.update_user( user_data )
-
-        addUserPublicKey = lsClient.add_user_public_key( { 'user_id' : user_id, 'public_key': request['public_key'] } )
+        validate = lsClient.update_user( userData )
         
     return validate and addUserPublicKey
 
+def ls_update_public_key( wsgi_request, request, lsClient, userId ):
+    userPbKey = {
+        'user_id'       : userId,
+        'public_key'    : request['public_key']
+    }
+    
+    addUserPublicKey = lsClient.add_user_public_key( userPbKey )
+    
+    return addUserPublicKey
+
 def create_user(wsgi_request, request):
     
     # XXX This has to be stored centrally

diff --git a/portal/lsapiclient.py b/portal/lsapiclient.py
index ead040e..bed829d 100644 (file)
--- a/portal/lsapiclient.py
+++ b/portal/lsapiclient.py
@@ -49,7 +49,7 @@ class LaboraSchedulerClient:
                 method_parameters.extend(['username'])
             elif actual_name == "add_user":
                 method_parameters.extend(['username', 'email', 'password', 'name', 'gidnumber',
-                                          'homedirectory'])
+                                          'homedirectory', 'created_by'])
             elif actual_name == "add_user_public_key":
                 method_parameters.extend(['user_id', 'public_key'])
             
@@ -90,7 +90,7 @@ class LaboraSchedulerClient:
         
         databaseConfig = {
             'dbHost'        : '10.128.11.200',
-            'dbUser'        : '',
+            'dbUser'        : 'postgres',
             'dbPassword'    : '',
             'dbName'        : 'LaboraSchedulerNOC'
         }