%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)" )
[ "$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
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])
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: