← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/context.py

Update GlanceClient, GlanceImageService, and Glance Xen plugin to work with Glance keystone.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/context.py
32
32
 
33
33
    def __init__(self, user_id, project_id, is_admin=None, read_deleted=False,
34
34
                 roles=None, remote_address=None, timestamp=None,
35
 
                 request_id=None, auth_token=None):
 
35
                 request_id=None, auth_token=None, strategy='noauth'):
36
36
        self.user_id = user_id
37
37
        self.project_id = project_id
38
38
        self.roles = roles or []
50
50
            request_id = unicode(uuid.uuid4())
51
51
        self.request_id = request_id
52
52
        self.auth_token = auth_token
 
53
        self.strategy = strategy
53
54
 
54
55
    def to_dict(self):
55
56
        return {'user_id': self.user_id,
60
61
                'remote_address': self.remote_address,
61
62
                'timestamp': utils.strtime(self.timestamp),
62
63
                'request_id': self.request_id,
63
 
                'auth_token': self.auth_token}
 
64
                'auth_token': self.auth_token,
 
65
                'strategy': self.strategy}
64
66
 
65
67
    @classmethod
66
68
    def from_dict(cls, values):
77
79
                              remote_address=self.remote_address,
78
80
                              timestamp=self.timestamp,
79
81
                              request_id=self.request_id,
80
 
                              auth_token=self.auth_token)
 
82
                              auth_token=self.auth_token,
 
83
                              strategy=self.strategy)
81
84
 
82
85
 
83
86
def get_admin_context(read_deleted=False):