Merge branch 'master' of git://git.onelab.eu/sfa

Conflicts:
	sfa/iotlab/iotlabshell.py

diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py
index 0b4a7c6..ac60097 100644 (file)
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -159,7 +159,7 @@ class IotLABShell(object):
         user['email'] = email
         user['sshPublicKey'] = slice_user['keys'][0]
         # ex : onelab.inria
-        user['structure'] = slice_user['urn'].split('+')[1]
+        user['structure'] = slice_user['urn'].split('+')[1].replace(':','.')
         email = (email.split('@'))[0]
         user['firstName'] = email.split('.')[0]
         try:

diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py
index 0646be7..e3cd0ee 100644 (file)
--- a/sfa/managers/registry_manager.py
+++ b/sfa/managers/registry_manager.py
@@ -583,7 +583,6 @@ class RegistryManager:
         if type not in ['slice', 'user', 'node', 'authority']:
             raise UnknownSfaType(type)
 
-        credential = api.getCredential()
         registries = api.registries
 
         # Try to remove the object from the PLCDB of federated agg.
@@ -593,6 +592,7 @@ class RegistryManager:
             for registry in registries:
                 if registry not in [api.hrn]:
                     try:
+                        credential = api.getCredential()
                         result = registries[registry].remove_peer_object(
                             credential, record, origin_hrn)
                     except: