From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 18 Oct 2012 12:56:14 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~56
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=6872209af2d5ec927820f2b333b8d3b112260957;hp=1ca62657b0e80664a840e4856618dc5103fb1252

Merge branch 'master' into senslab2
---

diff --git a/sfa.spec b/sfa.spec
index 2b503832..8d393e65 100644
--- a/sfa.spec
+++ b/sfa.spec
@@ -1,6 +1,6 @@
 %define name sfa
 %define version 2.1
-%define taglevel 16
+%define taglevel 17
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -259,6 +259,10 @@ fi
 [ "$1" -ge "1" ] && service sfa-cm restart || :
 
 %changelog
+* Tue Oct 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-2.1-17
+- bugfix in forwarding Resolve requests
+- various fixes in the nitos driver wrt keys and users
+
 * Mon Oct 01 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sfa-2.1-16
 - various tweaks for the nitos driver
 
diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py
index d1a4c6f5..f6f55eda 100644
--- a/sfa/managers/registry_manager.py
+++ b/sfa/managers/registry_manager.py
@@ -142,7 +142,7 @@ class RegistryManager:
                 server_proxy = api.server_proxy(interface, credential)
                 # should propagate the details flag but that's not supported in the xmlrpc interface yet
                 #peer_records = server_proxy.Resolve(xrns, credential,type, details=details)
-                peer_records = server_proxy.Resolve(xrns, credential,type)
+                peer_records = server_proxy.Resolve(xrns, credential)
                 # pass foreign records as-is
                 # previous code used to read
                 # records.extend([SfaRecord(dict=record).as_dict() for record in peer_records])
diff --git a/sfa/nitos/nitosslices.py b/sfa/nitos/nitosslices.py
index 077b0d49..2edd2092 100644
--- a/sfa/nitos/nitosslices.py
+++ b/sfa/nitos/nitosslices.py
@@ -188,11 +188,11 @@ class NitosSlices:
 
              if not nitos_users:
                  # create the user
-                 user_id = self.driver.shell.addUsers({'username': email.split('@')[0], 'email': email})
+                 user_id = self.driver.shell.addUser({'username': email.split('@')[0], 'email': email})
                  added_users.append(user_id)
                  # add user keys
                  for key in user['keys']:
-                      self.driver.shell.addUserKey({'user_id': user_id, 'key': key})
+                      self.driver.shell.addUserKey({'user_id': user_id, 'key': key, 'slice_id': slice['slice_id']})
                  # add the user to the slice
                  self.driver.shell.addUserToSlice({'slice_id': slice['slice_id'], 'user_id': user_id})
              else: