openstack
/
nova
Code Issues Proposed changes

Merge "Tidy up nova.image.glance"

This commit is contained in:
Jenkins 2012-08-01 00:11:06 +00:00 committed by Gerrit Code Review
parent 2b029d576c 6e4539f397
commit c577144166
7 changed files with 16 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
nova/image/glance.py
View File

@ -87,7 +87,7 @@ class GlanceClientWrapper(object):
def __init__(self, context=None, host=None, port=None):
if host is not None:
self._create_static_client(context, host, port)
self.client = self._create_static_client(context, host, port)
else:
self.client = None
self.api_servers = None
@ -96,7 +96,7 @@ class GlanceClientWrapper(object):
"""Create a client that we'll use for every call."""
self.host = host
self.port = port
self.client = _create_glance_client(context, self.host, self.port)
return _create_glance_client(context, self.host, self.port)
def _create_onetime_client(self, context):
"""Create a client that will be used for one call."""
@ -110,17 +110,13 @@ class GlanceClientWrapper(object):
Call a glance client method. If we get a connection error,
retry the request according to FLAGS.glance_num_retries.
"""
retry_excs = (glance_exception.ClientConnectionError,
glance_exception.ServiceUnavailable)
num_attempts = 1 + FLAGS.glance_num_retries
for attempt in xrange(1, num_attempts + 1):
if self.client:
client = self.client
else:
client = self._create_onetime_client(context)
client = self.client or self._create_onetime_client(context)
try:
return getattr(client, method)(*args, **kwargs)
except retry_excs as e:
@ -136,16 +132,13 @@ class GlanceClientWrapper(object):
host=host, port=port, reason=str(e))
LOG.exception(error_msg, locals())
time.sleep(1)
# Not reached
class GlanceImageService(object):
"""Provides storage and retrieval of disk image objects within Glance."""
def __init__(self, client=None):
if client is None:
client = GlanceClientWrapper()
self._client = client
self._client = client or GlanceClientWrapper()
def detail(self, context, **kwargs):
"""Calls out to Glance for a list of detailed image information."""
@ -166,12 +159,10 @@ class GlanceImageService(object):
for param in accepted_params:
if param in params:
_params[param] = params.get(param)
return _params
def _get_images(self, context, **kwargs):
"""Get image entitites from images service"""
# ensure filters is a dict
kwargs['filters'] = kwargs.get('filters') or {}
# NOTE(vish): don't filter out private images
@ -242,23 +233,13 @@ class GlanceImageService(object):
:raises: AlreadyExists if the image already exist.
"""
# Translate Base -> Service
LOG.debug(_('Creating image in Glance. Metadata passed in %s'),
image_meta)
sent_service_image_meta = self._translate_to_glance(image_meta)
LOG.debug(_('Metadata after formatting for Glance %s'),
sent_service_image_meta)
recv_service_image_meta = self._client.call(context,
'add_image', sent_service_image_meta, data)
# Translate Service -> Base
base_image_meta = self._translate_from_glance(recv_service_image_meta)
LOG.debug(_('Metadata returned from Glance formatted for Base %s'),
base_image_meta)
return base_image_meta
def update(self, context, image_id, image_meta, data=None, features=None):
def update(self, context, image_id, image_meta, data=None):
"""Replace the contents of the given image with the new data.
:raises: ImageNotFound if the image does not exist.
@ -269,7 +250,7 @@ class GlanceImageService(object):
image_meta = self._translate_to_glance(image_meta)
try:
image_meta = self._client.call(context, 'update_image',
image_id, image_meta, data, features)
image_id, image_meta, data)
except Exception:
_reraise_translated_image_exception(image_id)
@ -291,18 +272,14 @@ class GlanceImageService(object):
raise exception.ImageNotFound(image_id=image_id)
return result
def delete_all(self):
"""Clears out all images."""
pass
@classmethod
def _translate_to_glance(cls, image_meta):
@staticmethod
def _translate_to_glance(image_meta):
image_meta = _convert_to_string(image_meta)
image_meta = _remove_read_only(image_meta)
return image_meta
@classmethod
def _translate_from_glance(cls, image_meta):
@staticmethod
def _translate_from_glance(image_meta):
image_meta = _limit_attributes(image_meta)
image_meta = _convert_timestamps_to_datetimes(image_meta)
image_meta = _convert_from_string(image_meta)
@ -312,10 +289,11 @@ class GlanceImageService(object):
def _is_image_available(context, image_meta):
"""Check image availability.
Under Glance, images are always available if the context has
an auth_token.
This check is needed in case Nova and Glance are deployed
without authentication turned on.
"""
# The presence of an auth token implies this is an authenticated
# request and we need not handle the noauth use-case.
if hasattr(context, 'auth_token') and context.auth_token:
return True

1
nova/tests/api/openstack/compute/test_server_actions.py
View File

@ -73,7 +73,6 @@ class ServerActionsControllerTest(test.TestCase):
nova.tests.image.fake.stub_out_image_service(self.stubs)
service_class = 'nova.image.glance.GlanceImageService'
self.service = importutils.import_object(service_class)
self.service.delete_all()
self.sent_to_glance = {}
fakes.stub_out_glance_add_image(self.stubs, self.sent_to_glance)
self.flags(allow_instance_snapshots=True,

2
nova/tests/glance/stubs.py
View File

@ -69,7 +69,7 @@ class StubGlanceClient(object):
return self.images[-1]
def update_image(self, image_id, metadata, data, features):
def update_image(self, image_id, metadata, data):
for i, image in enumerate(self.images):
if image['id'] == str(image_id):
if 'id' in metadata:

3
nova/tests/image/fake.py
View File

@ -221,9 +221,6 @@ class _FakeImageService(object):
if not removed:
raise exception.ImageNotFound(image_id=image_id)
def delete_all(self):
"""Clears out all images."""
self.images.clear()
_fakeImageService = _FakeImageService()

8
nova/tests/image/test_fake.py
View File

@ -108,14 +108,6 @@ class FakeImageServiceTestCase(test.TestCase):
self.context,
'34')
def test_delete_all(self):
self.image_service.create(self.context, {'id': '32', 'foo': 'bar'})
self.image_service.create(self.context, {'id': '33', 'foo': 'bar'})
self.image_service.create(self.context, {'id': '34', 'foo': 'bar'})
self.image_service.delete_all()
index = self.image_service.detail(self.context)
self.assertEquals(len(index), 0)
def test_create_then_get(self):
blob = 'some data'
s1 = StringIO.StringIO(blob)

1
nova/tests/image/test_glance.py
View File

@ -103,7 +103,6 @@ class TestGlanceImageService(test.TestCase):
client = glance_stubs.StubGlanceClient()
self.service = self._create_image_service(client)
self.context = context.RequestContext('fake', 'fake', auth_token=True)
self.service.delete_all()
def _create_image_service(self, client):
def _fake_create_glance_client(context, host, port):

2
nova/tests/test_xenapi.py
View File

@ -96,7 +96,7 @@ IMAGE_FIXTURES = {
def set_image_fixtures():
image_service = fake_image.FakeImageService()
image_service.delete_all()
image_service.images.clear()
for image_id, image_meta in IMAGE_FIXTURES.items():
image_meta = image_meta['image_meta']
image_meta['id'] = image_id