← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/context.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
Import upstream version 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/context.py
45
45
                 roles=None, remote_address=None, timestamp=None,
46
46
                 request_id=None, auth_token=None, overwrite=True,
47
47
                 quota_class=None, user_name=None, project_name=None,
48
 
                 service_catalog=None, **kwargs):
 
48
                 service_catalog=None, instance_lock_checked=False, **kwargs):
49
49
        """
50
50
        :param read_deleted: 'no' indicates deleted records are hidden, 'yes'
51
51
            indicates deleted records are visible, 'only' indicates that
81
81
        self.request_id = request_id
82
82
        self.auth_token = auth_token
83
83
        self.service_catalog = service_catalog
 
84
        self.instance_lock_checked = instance_lock_checked
84
85
 
85
86
        # NOTE(markmc): this attribute is currently only used by the
86
87
        # rs_limits turnstile pre-processor.
123
124
                'quota_class': self.quota_class,
124
125
                'user_name': self.user_name,
125
126
                'service_catalog': self.service_catalog,
126
 
                'project_name': self.project_name}
 
127
                'project_name': self.project_name,
 
128
                'instance_lock_checked': self.instance_lock_checked}
127
129
 
128
130
    @classmethod
129
131
    def from_dict(cls, values):