Renaming service_image_id vars to image_id to reduce confusion.

Also some minor cleanup.

8 files changed, 21 insertions, 28 deletions

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index c61b5c6a6..fc26b6c1b 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -85,9 +85,8 @@ class Controller(common.OpenstackController):
         context = req.environ['nova.context']
 
         try:
-            (image_service, service_image_id) = nova.image.get_image_service(
-                id)
-            image = image_service.show(context, service_image_id)
+            (image_service, image_id) = nova.image.get_image_service(id)
+            image = image_service.show(context, image_id)
         except (exception.NotFound, exception.InvalidImageRef):
             explanation = _("Image not found.")
             raise faults.Fault(webob.exc.HTTPNotFound(explanation=explanation))
@@ -100,11 +99,9 @@ class Controller(common.OpenstackController):
         :param req: `wsgi.Request` object
         :param id: Image identifier (integer)
         """
-        image_id = id
         context = req.environ['nova.context']
-        (image_service, service_image_id) = nova.image.get_image_service(
-            image_id)
-        image_service.delete(context, service_image_id)
+        (image_service, image_id) = nova.image.get_image_service(id)
+        image_service.delete(context, image_id)
         return webob.exc.HTTPNoContent()
 
     def create(self, req):
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 181833a23..4a0b208e0 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -560,9 +560,8 @@ class Controller(common.OpenstackController):
         associated kernel and ramdisk image IDs.
         """
         context = req.environ['nova.context']
-        image_service, service_image_id = nova.image.get_image_service(
-            image_id)
-        image = image_service.show(context, service_image_id)
+        image_service, _ = nova.image.get_image_service(image_id)
+        image = image_service.show(context, image_id)
         # NOTE(sirp): extracted to a separate method to aid unit-testing, the
         # new method doesn't need a request obj or an ImageService stub
         kernel_id, ramdisk_id = self._do_get_kernel_ramdisk_from_image(
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 0fe9dbe4a..4d825ff53 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -131,10 +131,10 @@ class ViewBuilderV11(ViewBuilder):
 
     def _build_image(self, response, inst):
         if 'image_id' in dict(inst):
-            image_id = inst['image_id']
-            if str(image_id).isdigit():
-                image_id = int(image_id)
-            response['imageRef'] = image_id
+            image_ref = inst['image_id']
+            if str(image_ref).isdigit():
+                image_ref = int(image_ref)
+            response['imageRef'] = image_ref
 
     def _build_flavor(self, response, inst):
         if "instance_type" in dict(inst):
diff --git a/nova/compute/api.py b/nova/compute/api.py
index a9075ff8a..47f7a594f 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -157,9 +157,9 @@ class API(base.Base):
         self._check_metadata_properties_quota(context, metadata)
         self._check_injected_file_quota(context, injected_files)
 
-        (image_service, service_image_id) = nova.image.get_image_service(
+        (image_service, image_id) = nova.image.get_image_service(
             image_ref or image_id)
-        image = image_service.show(context, service_image_id)
+        image = image_service.show(context, image_id)
 
         os_type = None
         if 'properties' in image and 'os_type' in image['properties']:
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index b2b0325c2..f5cfd64e7 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -29,7 +29,6 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import test
-from nova import utils
 import nova.api.openstack
 from nova.api.openstack import servers
 import nova.compute.api
diff --git a/nova/utils.py b/nova/utils.py
index 954947589..361fc9873 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -35,7 +35,6 @@ import struct
 import sys
 import time
 import types
-from urlparse import urlparse
 from xml.sax import saxutils
 
 from eventlet import event
@@ -43,7 +42,6 @@ from eventlet import greenthread
 from eventlet import semaphore
 from eventlet.green import subprocess
 
-import nova
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/virt/images.py b/nova/virt/images.py
index f571a9949..61ea77ab0 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -23,7 +23,7 @@ Handling of VM disk images.
 
 from nova import context
 from nova import flags
-from nova import image
+import nova.image
 from nova import log as logging
 from nova import utils
 
@@ -32,15 +32,15 @@ FLAGS = flags.FLAGS
 LOG = logging.getLogger('nova.virt.images')
 
 
-def fetch(image_id, path, _user, _project):
+def fetch(image_ref, path, _user, _project):
     # TODO(vish): Improve context handling and add owner and auth data
     #             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, service_image_id) = image.get_image_service(image_id)
+    (image_service, image_id) = nova.image.get_image_service(image_ref)
     with open(path, "wb") as image_file:
         elevated = context.get_admin_context()
-        metadata = image_service.get(elevated, service_image_id, image_file)
+        metadata = image_service.get(elevated, image_id, image_file)
     return metadata
 
 
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 8c31f9e27..e67f08dbf 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -442,7 +442,7 @@ class LibvirtConnection(driver.ComputeDriver):
         virt_dom.detachDevice(xml)
 
     @exception.wrap_exception
-    def snapshot(self, instance, image_id):
+    def snapshot(self, instance, image_ref):
         """Create snapshot from a running VM instance.
 
         This command only works with qemu 0.14+, the qemu_img flag is
@@ -453,14 +453,14 @@ class LibvirtConnection(driver.ComputeDriver):
         virt_dom = self._lookup_by_name(instance['name'])
         elevated = context.get_admin_context()
 
-        (image_service, service_image_id) = nova.image.get_image_service(
+        (image_service, image_id) = nova.image.get_image_service(
             instance['image_id'])
-        base = image_service.show(elevated, service_image_id)
+        base = image_service.show(elevated, image_id)
 
         metadata = {'disk_format': base['disk_format'],
                     'container_format': base['container_format'],
                     'is_public': False,
-                    'name': '%s.%s' % (base['name'], image_id),
+                    'name': '%s.%s' % (base['name'], image_ref),
                     'properties': {'architecture': base['architecture'],
                                    'kernel_id': instance['kernel_id'],
                                    'image_location': 'snapshot',
@@ -503,7 +503,7 @@ class LibvirtConnection(driver.ComputeDriver):
         # Upload that image to the image service
         with open(out_path) as image_file:
             image_service.update(elevated,
-                                 image_id,
+                                 image_ref,
                                  metadata,
                                  image_file)