diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-06-25 14:06:08 -0700 |
|---|---|---|
| committer | Brian Waldon <bcwaldon@gmail.com> | 2012-06-27 14:31:35 -0700 |
| commit | 3aaa0b103447d56f8d3b259c693cd9a3a8dcbe36 (patch) | |
| tree | 00a15f76716fd9e43ce7c24dfc8b45e38a1b4866 /nova/virt | |
| parent | 7e658bd45db6c14b4cd7e3a976caf769873d4ca1 (diff) | |
Cleanup of image service code
* Remove image_service flag
* Move nova.image.fake to nova.tests.image.fake
* Move nova.image.get_default_image_service to
nova.image.glance.get_default_image_service
* Move nova.image.get_image_service to
nova.image.glance.get_remote_image_service
* Related to bp integrate-python-glanceclient
Change-Id: Iea6db7898328a9060fb88586e042efbc0a4351fc
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/images.py | 6 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 6 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py index e89aed627..ffb2e8e36 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -25,7 +25,7 @@ import os from nova import exception from nova import flags -import nova.image +from nova.image import glance from nova import log as logging from nova.openstack.common import cfg from nova import utils @@ -48,8 +48,8 @@ def fetch(context, image_href, path, _user_id, _project_id): # when it is added to glance. Right now there is no # auth checking in glance, so we assume that access was # checked before we got here. - (image_service, image_id) = nova.image.get_image_service(context, - image_href) + (image_service, image_id) = glance.get_remote_image_service(context, + image_href) with utils.remove_path_on_error(path): with open(path, "wb") as image_file: metadata = image_service.get(context, image_id, image_file) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 4f81ed7b8..d0000186b 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -60,7 +60,7 @@ from nova import context as nova_context from nova import db from nova import exception from nova import flags -import nova.image +from nova.image import glance from nova import log as logging from nova.openstack.common import cfg from nova.openstack.common import excutils @@ -698,14 +698,14 @@ class LibvirtDriver(driver.ComputeDriver): except exception.InstanceNotFound: raise exception.InstanceNotRunning() - (image_service, image_id) = nova.image.get_image_service( + (image_service, image_id) = glance.get_remote_image_service( context, instance['image_ref']) try: base = image_service.show(context, image_id) except exception.ImageNotFound: base = {} - _image_service = nova.image.get_image_service(context, image_href) + _image_service = glance.get_remote_image_service(context, image_href) snapshot_image_service, snapshot_image_id = _image_service snapshot = snapshot_image_service.show(context, snapshot_image_id) diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 64a479fe1..76958c6d0 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -39,7 +39,6 @@ from nova.compute import power_state from nova import db from nova import exception from nova import flags -import nova.image from nova.image import glance from nova import log as logging from nova.openstack.common import cfg @@ -869,7 +868,8 @@ def _fetch_image_glance_disk(context, session, instance, image_id, image_type): else: sr_ref = safe_find_sr(session) - image_service, image_id = nova.image.get_image_service(context, image_id) + image_service, image_id = glance.get_remote_image_service( + context, image_id) meta = image_service.show(context, image_id) virtual_size = int(meta['size']) vdi_size = virtual_size |