openstack/nova
Code Issues Proposed changes

Fix to_dict() and elevated() to preserve auth_token; revert an accidental change from context.get_admin_context() to simply context

Browse Source
This commit is contained in:
Kevin L. Mitchell
2011-07-28 21:00:38 +00:00
parent 98cf87e65c
commit c0355038b4
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/context.py
View File

@@ -98,7 +98,8 @@ class RequestContext(object):
'read_deleted': self.read_deleted,
'remote_address': self.remote_address,
'timestamp': utils.isotime(self.timestamp),
'request_id': self.request_id}
'request_id': self.request_id,
'auth_token': self.auth_token}
@classmethod
def from_dict(cls, values):
@@ -112,7 +113,8 @@ class RequestContext(object):
read_deleted,
self.remote_address,
self.timestamp,
self.request_id)
self.request_id,
self.auth_token)
def get_admin_context(read_deleted=False):

4
nova/virt/xenapi/vmops.py
View File

@@ -209,8 +209,8 @@ class VMOps(object):
if instance.vm_mode != vm_mode:
# Update database with normalized (or determined) value
db.instance_update(context, instance['id'],
{'vm_mode': vm_mode})
db.instance_update(context.get_admin_context(),
instance['id'], {'vm_mode': vm_mode})
vm_ref = VMHelper.create_vm(self._session, instance,
kernel and kernel.get('file', None) or None,
ramdisk and ramdisk.get('file', None) or None,