X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools%2Freset_gids.py;h=3922034e25db535fd07c8633e7b59e05e73876b3;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=f4b7da52a05b78b196039930835364e440e3f153;hpb=5404ec87098e28a160f3b53ccb751cd4086c7fa7;p=sfa.git diff --git a/tools/reset_gids.py b/tools/reset_gids.py index f4b7da52..3922034e 100755 --- a/tools/reset_gids.py +++ b/tools/reset_gids.py @@ -1,8 +1,6 @@ #!/usr/bin/env python # -*- coding:utf-8 -*- -import types - from sfa.storage.model import * from sfa.storage.alchemy import * from sfa.trust.gid import create_uuid @@ -10,8 +8,9 @@ from sfa.trust.hierarchy import Hierarchy from sfa.util.xrn import Xrn from sfa.trust.certificate import Certificate, Keypair, convert_public_key + def fix_users(): - s=global_dbsession + s = global_dbsession hierarchy = Hierarchy() users = s.query(RegRecord).filter_by(type="user") for record in users: @@ -19,16 +18,16 @@ def fix_users(): if not record.gid: uuid = create_uuid() pkey = Keypair(create=True) - pub_key=getattr(record,'reg_keys',None) - print pub_key + pub_key = getattr(record, 'reg_keys', None) if len(pub_key) > 0: # use only first key in record - if pub_key and isinstance(pub_key, types.ListType): pub_key = pub_key[0] + if pub_key and isinstance(pub_key, list): + pub_key = pub_key[0] pub_key = pub_key.key pkey = convert_public_key(pub_key) - urn = Xrn (xrn=record.hrn, type='user').get_urn() - email=getattr(record,'email',None) - gid_object = hierarchy.create_gid(urn, uuid, pkey, email = email) + urn = Xrn(xrn=record.hrn, type='user').get_urn() + email = getattr(record, 'email', None) + gid_object = hierarchy.create_gid(urn, uuid, pkey, email=email) gid = gid_object.save_to_string(save_parents=True) record.gid = gid s.commit()