xenapi: Rename imageupload image

The imageupload driver concept has helped detangle some of the image managment
code in vm_utils.

It would be nice to extend that benefit to download as well, with an
additional benefit of being able to share more code between the upload and
download paths.

This is the first in a series of patches that aims to to do just that. The
first step is change the name so that it's not just 'imageupload' but
'image'es in general that the driver is managing.

DocImpact

Change-Id: Ia18b82568147a9a40b0da67d74bf20b12d08b9a9

etc/nova/nova.conf.sample

@@ -2341,7 +2341,7 @@
 
 # Object Store Driver used to handle image uploads. (string
 # value)
-#xenapi_image_upload_handler=nova.virt.xenapi.imageupload.glance.GlanceStore
+#xenapi_image_upload_handler=nova.virt.xenapi.image.glance.GlanceStore
 
 
 #

nova/tests/virt/xenapi/image/test_glance.py

@@ -20,7 +20,7 @@ import mox
 
 from nova import context
 from nova import test
-from nova.virt.xenapi.imageupload import glance
+from nova.virt.xenapi.image import glance
 from nova.virt.xenapi import vm_utils
 
 

nova/tests/virt/xenapi/test_xenapi.py

@@ -54,7 +54,7 @@ from nova.virt.xenapi import agent
 from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import host
-from nova.virt.xenapi.imageupload import glance
+from nova.virt.xenapi.image import glance
 from nova.virt.xenapi import pool
 from nova.virt.xenapi import pool_states
 from nova.virt.xenapi import vm_utils

nova/virt/xenapi/vmops.py

@@ -66,7 +66,7 @@ xenapi_vmops_opts = [
                default='nova.virt.xenapi.vif.XenAPIBridgeDriver',
                help='The XenAPI VIF driver using XenServer Network APIs.'),
     cfg.StrOpt('xenapi_image_upload_handler',
-                default='nova.virt.xenapi.imageupload.glance.GlanceStore',
+                default='nova.virt.xenapi.image.glance.GlanceStore',
                 help='Object Store Driver used to handle image uploads.'),
     ]