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

diff --git a/sfa/iotlab/iotlabaggregate.py b/sfa/iotlab/iotlabaggregate.py
index 36b3291..3878da4 100644 (file)
--- a/sfa/iotlab/iotlabaggregate.py
+++ b/sfa/iotlab/iotlabaggregate.py
@@ -52,7 +52,10 @@ class IotLABAggregate(object):
         rspec_node = IotlabNode()
         rspec_node['mobile'] = node['mobile']
         rspec_node['archi'] = node['archi']
-        rspec_node['radio'] = (node['archi'].split(':'))[1]
+        if ':' in node['archi']:
+            rspec_node['radio'] = (node['archi'].split(':'))[1]
+        else:
+            rspec_node['radio'] = node['archi']
         iotlab_xrn = Xrn('.'.join([self.driver.root_auth,
                                    Xrn.escape(node['network_address'])]),
                          type='node')

diff --git a/sfa/iotlab/iotlabshell.py b/sfa/iotlab/iotlabshell.py
index f237dde..3b9f993 100644 (file)
--- a/sfa/iotlab/iotlabshell.py
+++ b/sfa/iotlab/iotlabshell.py
@@ -109,6 +109,7 @@ class IotLABShell(object):
                                    files=exp_file)
         except HTTPError as err:
             logger.warning("iotlashell reserve_nodes error %s" % err.reason)
+            logger.error(err)
             return {'error': err.reason}
 
     def get_reserved_nodes(self):
@@ -151,7 +152,20 @@ class IotLABShell(object):
     def add_user(self, slice_user):
         """
         Add LDAP user
+        {
+            "firstName":"loic",
+            "lastName":"test",
+            "email":"loic.test@lip6.fr",
+            "organization":"SFA",
+            "city":"To be defined",
+            "country":"To be defined",
+            "motivations":"SFA federation",
+            "category":"Academic",
+            "type": "SA",
+            "sshPublicKey": "ssh-rsa AAAAB3Nz..."
+        }       
         """
+        
         # pylint:disable=E1123
         logger.warning("iotlashell add_user")
         logger.warning("slice_user: %s" % slice_user)
@@ -164,7 +178,9 @@ class IotLABShell(object):
                 "city": "To be defined",
                 "country": "To be defined",
                 "motivations": "SFA federation",
-                "organization": organization}
+                "organization": organization,
+                "category":"Academic"
+                }
         email = slice_user['email']
         user['email'] = email
         user['sshPublicKey'] = slice_user['keys'][0]