← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/auth/dbdriver.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/auth/dbdriver.py
37
37
    def __init__(self):
38
38
        """Imports the LDAP module"""
39
39
        pass
40
 
        db
41
40
 
42
41
    def __enter__(self):
43
42
        return self
83
82
            user_ref = db.user_create(context.get_admin_context(), values)
84
83
            return self._db_user_to_auth_user(user_ref)
85
84
        except exception.Duplicate, e:
86
 
            raise exception.Duplicate('User %s already exists' % name)
 
85
            raise exception.Duplicate(_('User %s already exists') % name)
87
86
 
88
87
    def _db_user_to_auth_user(self, user_ref):
89
88
        return {'id': user_ref['id'],
105
104
        """Create a project"""
106
105
        manager = db.user_get(context.get_admin_context(), manager_uid)
107
106
        if not manager:
108
 
            raise exception.NotFound("Project can't be created because "
109
 
                                     "manager %s doesn't exist" % manager_uid)
 
107
            raise exception.NotFound(_("Project can't be created because "
 
108
                                       "manager %s doesn't exist")
 
109
                                     % manager_uid)
110
110
 
111
111
        # description is a required attribute
112
112
        if description is None:
133
133
        try:
134
134
            project = db.project_create(context.get_admin_context(), values)
135
135
        except exception.Duplicate:
136
 
            raise exception.Duplicate("Project can't be created because "
137
 
                                      "project %s already exists" % name)
 
136
            raise exception.Duplicate(_("Project can't be created because "
 
137
                                        "project %s already exists") % name)
138
138
 
139
139
        for member in members:
140
140
            db.project_add_member(context.get_admin_context(),
155
155
        if manager_uid:
156
156
            manager = db.user_get(context.get_admin_context(), manager_uid)
157
157
            if not manager:
158
 
                raise exception.NotFound("Project can't be modified because "
159
 
                                          "manager %s doesn't exist" %
 
158
                raise exception.NotFound(_("Project can't be modified because "
 
159
                                           "manager %s doesn't exist") %
160
160
                                          manager_uid)
161
161
            values['project_manager'] = manager['id']
162
162
        if description:
243
243
    def _validate_user_and_project(self, user_id, project_id):
244
244
        user = db.user_get(context.get_admin_context(), user_id)
245
245
        if not user:
246
 
            raise exception.NotFound('User "%s" not found' % user_id)
 
246
            raise exception.NotFound(_('User "%s" not found') % user_id)
247
247
        project = db.project_get(context.get_admin_context(), project_id)
248
248
        if not project:
249
 
            raise exception.NotFound('Project "%s" not found' % project_id)
 
249
            raise exception.NotFound(_('Project "%s" not found') % project_id)
250
250
        return user, project