Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3

[sfa.git] / sfa / iotlab / iotlabdriver.py

diff --git a/sfa/iotlab/iotlabdriver.py b/sfa/iotlab/iotlabdriver.py
index adcf8a1..855dc35 100644 (file)
--- a/sfa/iotlab/iotlabdriver.py
+++ b/sfa/iotlab/iotlabdriver.py
@@ -153,13 +153,13 @@ class IotlabDriver(Driver):
         ret = self.testbed_shell.ldap.LdapAddUser(record)
 
         if ret['bool'] is True:
-            record['hrn'] = self.testbed_shell.root_auth + '.' + ret['uid']
+            #record['hrn'] = self.testbed_shell.root_auth + '.' + ret['uid']
             logger.debug("IOTLAB_API AddPerson return code %s record %s  "
                          % (ret, record))
-            self.__add_person_to_db(record)
+            #self.__add_person_to_db(record)
         return ret
 
-    def __add_person_to_db(self, user_dict):
+    def add_person_to_db(self, user_dict):
         """
         Add a federated user straight to db when the user issues a lease
         request with iotlab nodes and that he has not registered with iotlab
@@ -191,8 +191,9 @@ class IotlabDriver(Driver):
 
             if pubkey is not None and pkey is not None :
                 hierarchy = Hierarchy()
+                # We fake the parent in order to be able to create a valid GID
                 person_gid = hierarchy.create_gid(person_urn, create_uuid(), \
-                                pkey)
+                                pkey, force_parent='iotlab')
                 if user_dict['email']:
                     logger.debug("__add_person_to_db \r\n \r\n \
                         IOTLAB IMPORTER PERSON EMAIL OK email %s "\
@@ -1490,15 +1491,21 @@ class IotlabDriver(Driver):
         # dans la methode avec les infos du user, els infos sont propagees
         # dans verify_slice_leases
         logger.debug("IOTLABDRIVER.PY  BEFORE slices.verify_persons")
-        logger.debug("LOIC - slice_record[user] = %s" % slice_record['user'])
+
+        # XXX JORDAN XXX slice_record devrait recevoir le caller_xrn...
+        # LOIC maintenant c'est fait au dessus
+        logger.debug("IOTLABDRIVER.PY - LOIC - slice_record[user][hrn] = %s" % slice_record['user']['hrn'])
+        logger.debug("IOTLABDRIVER.PY - LOIC - slice_record[reg-researchers] = %s" % slice_record['reg-researchers'])
         persons = slices.verify_persons(xrn.hrn, slice_record, users,
                                         options=options)
         logger.debug("IOTLABDRIVER.PY  AFTER slices.verify_persons")
         logger.debug("LOIC - slice_record[user] = %s" % slice_record['user'])
+        logger.debug("IOTLABDRIVER.PY - LOIC - slice_record[reg-researchers] = %s" % slice_record['reg-researchers'])
 
         # ensure slice record exists
         current_slice = slices.verify_slice(xrn.hrn, slice_record, sfa_peer)
         logger.debug("LOIC - AFTER verify_slice - slice_record[user] = %s" % slice_record['user'])
+        logger.debug("IOTLABDRIVER.PY - LOIC - slice_record[reg-researchers] = %s" % slice_record['reg-researchers'])
         logger.debug("IOTLABDRIVER.PY \t ===============allocate \t\
                             \r\n \r\n  current_slice %s" % (current_slice))
 
@@ -1507,6 +1514,7 @@ class IotlabDriver(Driver):
                                     # options=options)
 
         # add/remove slice from nodes
+        # XXX JORDAN ensure requested_xp_dict returns a dict with all new leases
         requested_xp_dict = self._process_requested_xp_dict(rspec)
 
         logger.debug("IOTLABDRIVER.PY \tallocate  requested_xp_dict %s "
@@ -1529,10 +1537,14 @@ class IotlabDriver(Driver):
         rspec_requested_leases = rspec.version.get_leases()
         leases = slices.verify_slice_leases(slice_record,
                                                 requested_xp_dict, peer)
+        # JORDAN: 
+        #   leases = already in slice
+        #   rspec_requested_leases = newly requested
         logger.debug("IOTLABDRIVER.PY \tallocate leases  %s \
                         rspec_requested_leases %s" % (leases,
                         rspec_requested_leases))
-         # update sliver allocations
+        # update sliver allocations
+        # JORDAN Here we loop over newly allocated nodes
         for hostname in nodes_list:
             client_id = hostname
             node_urn = xrn_object(self.testbed_shell.root_auth, hostname).urn
@@ -1560,7 +1572,7 @@ class IotlabDriver(Driver):
             'geni_slice_urn': urn,
             'list_leases': 'all',
         }
-        return aggregate.describe([xrn.get_urn()], version=rspec.version)
+        return aggregate.describe([xrn.get_urn()], version=rspec.version, options=describe_options)
 
     def provision(self, urns, options=None):
         if options is None: options={}
@@ -1589,4 +1601,4 @@ class IotlabDriver(Driver):
             'geni_slice_urn': current_slice['urn'],
             'list_leases': 'all',
         }
-        return self.describe(urns, rspec_version, options=options)
+        return self.describe(urns, rspec_version, options=describe_options)