removing xenapi_image_service flag

3 files changed, 26 insertions, 26 deletions

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 4cb7447d3..87e2e93b3 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -429,7 +429,7 @@ class XenAPIVMTestCase(test.TestCase):
         self.assertTrue(instance.architecture)
 
     def test_spawn_not_enough_memory(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self.assertRaises(Exception,
                           self._test_spawn,
                           1, 2, 3, "4")  # m1.xlarge
@@ -441,7 +441,7 @@ class XenAPIVMTestCase(test.TestCase):
 
         """
         vdi_recs_start = self._list_vdis()
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         stubs.stubout_fetch_image_glance_disk(self.stubs)
         self.assertRaises(xenapi_fake.Failure,
                           self._test_spawn, 1, 2, 3)
@@ -456,7 +456,7 @@ class XenAPIVMTestCase(test.TestCase):
 
         """
         vdi_recs_start = self._list_vdis()
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         stubs.stubout_create_vm(self.stubs)
         self.assertRaises(xenapi_fake.Failure,
                           self._test_spawn, 1, 2, 3)
@@ -465,21 +465,21 @@ class XenAPIVMTestCase(test.TestCase):
         self._check_vdis(vdi_recs_start, vdi_recs_end)
 
     def test_spawn_raw_objectstore(self):
-        FLAGS.xenapi_image_service = 'objectstore'
+        FLAGS.image_service = 'nova.image.s3.S3ImageService'
         self._test_spawn(1, None, None)
 
     def test_spawn_objectstore(self):
-        FLAGS.xenapi_image_service = 'objectstore'
+        FLAGS.image_service = 'nova.image.s3.S3ImageService'
         self._test_spawn(1, 2, 3)
 
     @stub_vm_utils_with_vdi_attached_here
     def test_spawn_raw_glance(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self._test_spawn(glance_stubs.FakeGlance.IMAGE_RAW, None, None)
         self.check_vm_params_for_linux()
 
     def test_spawn_vhd_glance_linux(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self._test_spawn(glance_stubs.FakeGlance.IMAGE_VHD, None, None,
                          os_type="linux", architecture="x86-64")
         self.check_vm_params_for_linux()
@@ -508,20 +508,20 @@ class XenAPIVMTestCase(test.TestCase):
         self.assertEqual(len(self.vm['VBDs']), 1)
 
     def test_spawn_vhd_glance_windows(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self._test_spawn(glance_stubs.FakeGlance.IMAGE_VHD, None, None,
                          os_type="windows", architecture="i386")
         self.check_vm_params_for_windows()
 
     def test_spawn_glance(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self._test_spawn(glance_stubs.FakeGlance.IMAGE_MACHINE,
                          glance_stubs.FakeGlance.IMAGE_KERNEL,
                          glance_stubs.FakeGlance.IMAGE_RAMDISK)
         self.check_vm_params_for_linux_with_external_kernel()
 
     def test_spawn_netinject_file(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         db_fakes.stub_out_db_instance_api(self.stubs, injected=True)
 
         self._tee_executed = False
@@ -547,7 +547,7 @@ class XenAPIVMTestCase(test.TestCase):
             # Capture the sudo tee .../etc/network/interfaces command
             (r'(sudo\s+)?tee.*interfaces', _tee_handler),
         ])
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self._test_spawn(glance_stubs.FakeGlance.IMAGE_MACHINE,
                          glance_stubs.FakeGlance.IMAGE_KERNEL,
                          glance_stubs.FakeGlance.IMAGE_RAMDISK,
@@ -555,7 +555,7 @@ class XenAPIVMTestCase(test.TestCase):
         self.assertTrue(self._tee_executed)
 
     def test_spawn_netinject_xenstore(self):
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         db_fakes.stub_out_db_instance_api(self.stubs, injected=True)
 
         self._tee_executed = False
@@ -601,7 +601,7 @@ class XenAPIVMTestCase(test.TestCase):
 
     @test.skip_test("Never gets an address, not sure why")
     def test_spawn_vlanmanager(self):
-        self.flags(xenapi_image_service='glance',
+        self.flags(image_service='nova.image.glance.GlanceImageService',
                    network_manager='nova.network.manager.VlanManager',
                    network_driver='nova.network.xenapi_net',
                    vlan_interface='fake0')
@@ -784,6 +784,7 @@ class XenAPIMigrateInstance(test.TestCase):
         conn.migrate_disk_and_power_off(instance, '127.0.0.1')
 
     def test_finish_resize(self):
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         instance = db.instance_create(self.context, self.values)
         stubs.stubout_session(self.stubs, stubs.FakeSessionForMigrationTests)
         stubs.stubout_loopingcall_start(self.stubs)
@@ -827,7 +828,7 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
 
     def test_instance_disk(self):
         """If a kernel is specified, the image type is DISK (aka machine)."""
-        FLAGS.xenapi_image_service = 'objectstore'
+        FLAGS.image_service = 'nova.image.s3.S3ImageService'
         self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_MACHINE
         self.fake_instance.kernel_id = glance_stubs.FakeGlance.IMAGE_KERNEL
         self.assert_disk_type(vm_utils.ImageType.DISK)
@@ -837,7 +838,7 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
         If the kernel isn't specified, and we're not using Glance, then
         DISK_RAW is assumed.
         """
-        FLAGS.xenapi_image_service = 'objectstore'
+        FLAGS.image_service = 'nova.image.s3.S3ImageService'
         self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_RAW
         self.fake_instance.kernel_id = None
         self.assert_disk_type(vm_utils.ImageType.DISK_RAW)
@@ -847,7 +848,7 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
         If we're using Glance, then defer to the image_type field, which in
         this case will be 'raw'.
         """
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_RAW
         self.fake_instance.kernel_id = None
         self.assert_disk_type(vm_utils.ImageType.DISK_RAW)
@@ -857,7 +858,7 @@ class XenAPIDetermineDiskImageTestCase(test.TestCase):
         If we're using Glance, then defer to the image_type field, which in
         this case will be 'vhd'.
         """
-        FLAGS.xenapi_image_service = 'glance'
+        FLAGS.image_service = 'nova.image.glance.GlanceImageService'
         self.fake_instance.image_ref = glance_stubs.FakeGlance.IMAGE_VHD
         self.fake_instance.kernel_id = None
         self.assert_disk_type(vm_utils.ImageType.DISK_VHD)
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 71107aff4..76a228c39 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -411,7 +411,10 @@ class VMHelper(HelperBase):
         """
         image_type is interpreted as an ImageType instance
         Related flags:
-            xenapi_image_service = ['glance', 'objectstore']
+            image_service = [
+                'nova.image.glance.GlanceImageService',
+                'nova.image.s3.S3ImageService',
+            ]
             glance_address = 'address for glance services'
             glance_port = 'port for glance services'
 
@@ -420,7 +423,7 @@ class VMHelper(HelperBase):
         """
         access = AuthManager().get_access_key(user, project)
 
-        if FLAGS.xenapi_image_service == 'glance':
+        if FLAGS.image_service == 'nova.image.glance.GlanceImageService':
             return cls._fetch_image_glance(session, instance_id, image,
                                            access, image_type)
         else:
@@ -600,9 +603,7 @@ class VMHelper(HelperBase):
             else:
                 return ImageType.DISK_RAW
 
-        # FIXME(sirp): can we unify the ImageService and xenapi_image_service
-        # abstractions?
-        if FLAGS.xenapi_image_service == 'glance':
+        if FLAGS.image_service == 'nova.image.glance.GlanceImageService':
             image_type = determine_from_glance()
         else:
             image_type = determine_from_instance()
@@ -678,11 +679,12 @@ class VMHelper(HelperBase):
 
             4. Glance (DISK): pv is assumed
         """
-        if FLAGS.xenapi_image_service == 'glance':
+        if FLAGS.image_service == 'nova.image.glance.GlanceImageService':
             # 2, 3, 4: Glance
             return cls._determine_is_pv_glance(
               session, vdi_ref, disk_image_type, os_type)
         else:
+            print FLAGS.image_service
             # 1. Objecstore
             return cls._determine_is_pv_objectstore(session, instance_id,
                                                     vdi_ref)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index ec8c44c1c..bcdb0ab84 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -101,9 +101,6 @@ flags.DEFINE_float('xenapi_task_poll_interval',
                    'The interval used for polling of remote tasks '
                    '(Async.VM.start, etc). Used only if '
                    'connection_type=xenapi.')
-flags.DEFINE_string('xenapi_image_service',
-                    'glance',
-                    'Where to get VM images: glance or objectstore.')
 flags.DEFINE_float('xenapi_vhd_coalesce_poll_interval',
                    5.0,
                    'The interval used for polling of coalescing vhds.'