X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Flsapiclient.py;h=0e6edde47dcddf934b5260dcc53b3dc9dc36938a;hb=5c5d6689dc9c7d0fda4fae3ceb14a8c738a7cfa2;hp=494adb0d0adc50796b1b49327072e8c97420ff07;hpb=bddaae13234f2d36f16098b756006e77a2e409f5;p=myslice.git

diff --git a/portal/lsapiclient.py b/portal/lsapiclient.py
index 494adb0d..0e6edde4 100644
--- a/portal/lsapiclient.py
+++ b/portal/lsapiclient.py
@@ -13,7 +13,7 @@ class LaboraSchedulerClient:
     """
                 
     direct_calls = [ 'get_testbed_info', 'get_users', 'add_user', 'delete_user', 'update_user',
-                     'get_user_id_by_username' ]
+                     'get_user_id_by_username', 'add_user_public_key', 'delete_user_public_key' ]
 
     def __init__ ( self, organization ):
         self.url, self.key = self.getOrganizationConfigs( organization )
@@ -44,13 +44,15 @@ class LaboraSchedulerClient:
                 method_parameters.extend(['filter'])
             elif actual_name == "update_user":
                 method_parameters.extend(['user_id', 'new_user_data'])
-            elif actual_name == "delete_user":
+            elif actual_name == "delete_user" or actual_name == "delete_user_public_key":
                 method_parameters.extend(['user_id'])
             elif actual_name == "get_user_id_by_username":
                 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'])
             
             for parameter in args:
                 if isinstance(parameter, (frozenset, list, set, tuple, dict)):
@@ -89,8 +91,8 @@ class LaboraSchedulerClient:
         
         databaseConfig = {
             'dbHost'        : '10.128.11.200',
-            'dbUser'        : '',
-            'dbPassword'    : '',
+            'dbUser'        : 'postgres',
+            'dbPassword'    : '5e6b70f2e9dc',
             'dbName'        : 'LaboraSchedulerNOC'
         }