openstack/nova
Code Issues Proposed changes

Revert hasattr() check on 'set_auth_token' for clients

Browse Source
This commit is contained in:
Kevin L. Mitchell
2011-08-01 18:59:29 +00:00
parent 1db6b5768a
commit 8e7a4e6147
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/image/glance.py
View File

@@ -85,8 +85,7 @@ class GlanceImageService(service.BaseImageService):
def _set_client_context(self, context):
"""Sets the client's auth token."""
if hasattr(self.client, 'set_auth_token'):
self.client.set_auth_token(context.auth_token)
self.client.set_auth_token(context.auth_token)
def index(self, context, filters=None, marker=None, limit=None):
"""Calls out to Glance for a list of images available."""

3
nova/virt/xenapi/vm_utils.py
View File

@@ -465,8 +465,7 @@ class VMHelper(HelperBase):
sr_ref = safe_find_sr(session)
glance_client, image_id = nova.image.get_glance_client(image)
if hasattr(glance_client, 'set_auth_token'):
glance_client.set_auth_token(getattr(context, 'auth_token', None))
glance_client.set_auth_token(getattr(context, 'auth_token', None))
meta, image_file = glance_client.get_image(image_id)
virtual_size = int(meta['size'])
vdi_size = virtual_size