git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cff7599)
Fix in GetLEases.
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 15 Oct 2013 11:42:15 +0000 (13:42 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Wed, 23 Oct 2013 13:08:41 +0000 (15:08 +0200)
sfa/iotlab/iotlabapi.py patch | blob | history
sfa/iotlab/iotlabslices.py patch | blob | history

diff --git a/sfa/iotlab/iotlabapi.py b/sfa/iotlab/iotlabapi.py
index f013cb7..ab27169 100644 (file)
--- a/sfa/iotlab/iotlabapi.py
+++ b/sfa/iotlab/iotlabapi.py
@@ -1001,8 +1001,8 @@ class IotlabTestbedAPI():
                 resa['component_id_list'].append(iotlab_xrn.urn)
 
         if lease_filter_dict:
                 resa['component_id_list'].append(iotlab_xrn.urn)
 
         if lease_filter_dict:
-            logger.debug("IOTLAB_API \tGetLeases resa_ %s \
-                    \r\n leasefilter %s" % (resa, lease_filter_dict))
+            logger.debug("IOTLAB_API \tGetLeases  \
+                    \r\n leasefilter %s" % ( lease_filter_dict))
 
             filter_dict_functions = {
             'slice_hrn' : IotlabTestbedAPI.filter_lease_name,
 
             filter_dict_functions = {
             'slice_hrn' : IotlabTestbedAPI.filter_lease_name,
diff --git a/sfa/iotlab/iotlabslices.py b/sfa/iotlab/iotlabslices.py
index 7722bf0..1068840 100644 (file)
--- a/sfa/iotlab/iotlabslices.py
+++ b/sfa/iotlab/iotlabslices.py
@@ -389,11 +389,12 @@ class IotlabSlices:
         for info in users:
             if 'slice_record' in info:
                 slice_rec = info['slice_record']
         for info in users:
             if 'slice_record' in info:
                 slice_rec = info['slice_record']
-                user = slice_rec['user']
+                if 'user' in slice_rec :
+                    user = slice_rec['user']
 
 
-            if 'email' in user:
-                users_by_email[user['email']] = user
-                users_dict[user['email']] = user
+                    if 'email' in user:
+                        users_by_email[user['email']] = user
+                        users_dict[user['email']] = user
 
         logger.debug("SLABSLICE.PY \t verify_person  \
                         users_dict %s \r\n user_by_email %s \r\n \
 
         logger.debug("SLABSLICE.PY \t verify_person  \
                         users_dict %s \r\n user_by_email %s \r\n \
sfa