Revision e0fa2a89

b/snf-astakos-app/astakos/im/api/admin.py
109 109
    user_info = {
110 110
        'id': user.id,
111 111
        'username': user.username,
112
        'uuid': user.uuid,
112 113
        'uniq': user.email,
113 114
        'auth_token': user.auth_token,
114 115
        'auth_token_created': user.auth_token_created.isoformat(),
......
147 148
    user_info = {
148 149
        'id': user.id,
149 150
        'userid': user.username,
151
        'uuid': user.uuid,
150 152
        'email': [user.email],
151 153
        'name': user.realname,
152 154
        'auth_token': user.auth_token,
b/snf-astakos-app/astakos/im/endpoints/qh.py
76 76
            if not QUOTAHOLDER_URL:
77 77
                return ()
78 78

  
79
            c = get_client() 
79
            c = get_client()
80 80
            func = c.__dict__.get(func_name)
81 81
            if not func:
82 82
                return ()
......
108 108
            export_limit = None
109 109
            flags = 0
110 110
            args = (
111
                user.email, resource, key, quantity, capacity, import_limit,
111
                user.uuid, resource, key, quantity, capacity, import_limit,
112 112
                export_limit, flags)
113 113
            append(args)
114 114
    return data
......
193 193
    append = data.append
194 194
    for user in users:
195 195
        try:
196
            entity = user.email
196
            entity = user.uuid
197 197
        except AttributeError:
198 198
            continue
199 199
        else:
......
222 222

  
223 223
def register_users(users):
224 224
    users, copy = itertools.tee(users)
225
    rejected = create_entities(entities=users, field='email')
225
    rejected = create_entities(entities=users, field='uuid')
226 226
    created = (e for e in copy if unicode(e) not in rejected)
227 227
    return send_quota(created)
228 228

  

Also available in: Unified diff