Merge branch 'iotlab_fixes' into geni-v3

Conflicts:
	sfa/iotlab/OARrestapi.py
	sfa/iotlab/iotlabaggregate.py
	sfa/iotlab/iotlabdriver.py
	sfa/iotlab/iotlabshell.py
	sfa/iotlab/iotlabslices.py

diff --git a/sfa/iotlab/LDAPapi.py b/sfa/iotlab/LDAPapi.py
index d01c82b..7c3deb6 100644 (file)
--- a/sfa/iotlab/LDAPapi.py
+++ b/sfa/iotlab/LDAPapi.py
@@ -466,6 +466,8 @@ class LDAPapi:
                 if record['first_name'] != record['last_name']:
                     req_ldapdict['cn'] = str(record['first_name'])+" "\
                         + str(record['last_name'])
+            if 'uid' in record:
+                req_ldapdict['uid'] = record['uid']
             if 'email' in record:
                 req_ldapdict['mail'] = record['email']
             if 'mail' in record: