From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 27 Oct 2011 13:39:20 +0000 (+0200)
Subject: Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~315
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9b8234d5a13b82e9c480d68883cef7ee14d0fc68;p=sfa.git

Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2

Conflicts:
	sfa/managers/registry_manager_slab.py
---

9b8234d5a13b82e9c480d68883cef7ee14d0fc68
diff --cc sfa/managers/registry_manager_slab.py
index e3de48cf,2cde76c3..970dbe8e
--- a/sfa/managers/registry_manager_slab.py
+++ b/sfa/managers/registry_manager_slab.py
@@@ -226,18 -228,11 +230,20 @@@ def register(api, record)
          raise ExistingRecord(hrn)
         
      record = SfaRecord(dict = record)
 -    record['authority'] = get_authority(record['hrn'])
 -    type = record['type']
 -    hrn = record['hrn']
 -    myapi.auth.verify_object_permission(hrn)
++<<<<<<< HEAD
 +    print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAN.PY  register  SfaRecordrecord %s" %(record)
 +    #record['authority'] = get_authority(record['hrn'])
 +    record['authority'] = get_authority(hrn)
 +    
 +    #type_of_rec = record['type']
 +    #hrn = record['hrn']
 +    
 +    #api.auth.verify_object_permission(hrn)
-     api.auth.verify_object_permission( record['hrn'])
-     auth_info = api.auth.get_auth_info(record['authority'])
++    myapi.auth.verify_object_permission( record['hrn'])
+     auth_info = myapi.auth.get_auth_info(record['authority'])
 +  
 +    
++
      pub_key = None
      # make sure record has a gid
      if 'gid' not in record:
@@@ -254,35 -249,29 +260,35 @@@
          gid = gid_object.save_to_string(save_parents=True)
          record['gid'] = gid
          record.set_gid(gid)
 +	print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAB.PY   record['gid']  %s" %(record['gid'])   
 +	print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAB.PY  register type_of_rec %s"%(type_of_rec)
 +	
 +    if type_of_rec in ["authority"]:	
  
 -    if type in ["authority"]:
          # update the tree
-         if not api.auth.hierarchy.auth_exists(hrn):
-             api.auth.hierarchy.create_auth(hrn_to_urn(hrn,'authority'))
+         if not myapi.auth.hierarchy.auth_exists(hrn):
+             myapi.auth.hierarchy.create_auth(hrn_to_urn(hrn,'authority'))
  
          # get the GID from the newly created authority
          gid = auth_info.get_gid_object()
          record.set_gid(gid.save_to_string(save_parents=True))
 -        pl_record = myapi.sfa_fields_to_pl_fields(type, hrn, record)
 +	
-         #pl_record = api.sfa_fields_to_pl_fields(type, hrn, record)
++        #pl_record = myapi.sfa_fields_to_pl_fields(type, hrn, record)
 +	print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAB.PY  register : type_of_rec in [authority ] sfa_fields_to_pl_fields FIELDS A CHANGER"    
 +	
-         sites = api.oar.GetSites( [pl_record['login_base']])
+         sites = myapi.oar.GetSites( [pl_record['login_base']])
          if not sites:
-             pointer = api.oar.AddSite( pl_record)
+             pointer = myapi.oar.AddSite( pl_record)
          else:
              pointer = sites[0]['site_id']
  
          record.set_pointer(pointer)
          record['pointer'] = pointer
  
 -    elif (type == "slice"):
 +    elif (type_of_rec == "slice"):
          acceptable_fields=['url', 'instantiation', 'name', 'description']
-         pl_record = api.sfa_fields_to_pl_fields(type_of_rec, hrn, record)
 -        pl_record = myapi.sfa_fields_to_pl_fields(type, hrn, record)
 -	print>>sys.stderr, " \r\n \r\n ----------- registry_manager_slab register  slice pl_record %s"%(pl_record)
++        pl_record = myapi.sfa_fields_to_pl_fields(type_of_rec, hrn, record)
 +	print>>sys.stderr, " \r\n \r\n ----------- REGISTRY_MANAGER_SLAB.PY  register  slice pl_record %s"%(pl_record)
          for key in pl_record.keys():
              if key not in acceptable_fields:
                  pl_record.pop(key)
@@@ -294,8 -283,8 +300,8 @@@
          record.set_pointer(pointer)
          record['pointer'] = pointer
  
 -    elif  (type == "user"):
 +    elif  (type_of_rec == "user"):
-         persons = api.users.GetPersons( [record['email']]) 
+         persons = myapi.users.GetPersons( [record['email']]) 
  	if not persons:
             print>>sys.stderr, "  \r\n \r\n ----------- registry_manager_slab  register NO PERSON ADD TO LDAP?"
        
@@@ -329,11 -318,11 +335,11 @@@
  
      ##record['pointer'] = pointer
      ##record.set_pointer(pointer)
 -    record_id = table.insert(record)
 -    record['record_id'] = record_id
 +    #record_id = table.insert(record)
 +    #record['record_id'] = record_id
  
      # update membership for researchers, pis, owners, operators
-     api.update_membership(None, record)
+     myapi.update_membership(None, record)
  
      return record.get_gid_object().save_to_string(save_parents=True)