More image_id to image_ref stuff. Also fixed tests in test_servers.

3 files changed, 14 insertions, 12 deletions

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 76800795c..7593694bd 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -189,7 +189,7 @@ class Controller(common.OpenstackController):
             return faults.Fault(exc.HTTPBadRequest(msg))
 
         inst['instance_type'] = inst_type
-        inst['image_id'] = image_href
+        inst['image_ref'] = image_href
 
         builder = self._get_view_builder(req)
         server = builder.build(inst, is_detail=True)
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index ddd17ab93..dd1d68ff0 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -112,8 +112,8 @@ class ViewBuilderV10(ViewBuilder):
     """Model an Openstack API V1.0 server response."""
 
     def _build_image(self, response, inst):
-        if 'image_id' in dict(inst):
-            response['imageId'] = int(inst['image_id'])
+        if 'image_ref' in dict(inst):
+            response['imageId'] = int(inst['image_ref'])
 
     def _build_flavor(self, response, inst):
         if 'instance_type' in dict(inst):
@@ -130,8 +130,8 @@ class ViewBuilderV11(ViewBuilder):
         self.base_url = base_url
 
     def _build_image(self, response, inst):
-        if 'image_id' in dict(inst):
-            image_href = inst['image_id']
+        if 'image_ref' in dict(inst):
+            image_href = inst['image_ref']
             if str(image_href).isdigit():
                 image_href = int(image_href)
             response['imageRef'] = image_href
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index a6ab9c0c8..1ce0e8e84 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -98,7 +98,7 @@ def stub_instance(id, user_id=1, private_address=None, public_addresses=None,
         "admin_pass": "",
         "user_id": user_id,
         "project_id": "",
-        "image_id": "10",
+        "image_ref": "10",
         "kernel_id": "",
         "ramdisk_id": "",
         "launch_index": 0,
@@ -475,12 +475,13 @@ class ServersTest(test.TestCase):
         def image_id_from_hash(*args, **kwargs):
             return 2
 
-        def fake_image_service(*args):
-            return nova.image.fake.FakeImageService()
+        def fake_get_image_service(image_href):
+            image_id = int(str(image_href).split('/')[-1])
+            return (nova.image.fake.FakeImageService(), image_id)
 
-        FLAGS.image_service = 'nova.image.fake.FakeImageService'
-        self.stubs.Set(
-            nova.image.glance, 'GlanceImageService', fake_image_service)
+        self.stubs.Set(nova.image, 'get_default_image_service',
+            lambda: nova.image.fake.FakeImageService())
+        self.stubs.Set(nova.image, 'get_image_service', fake_get_image_service)
         self.stubs.Set(nova.db.api, 'project_get_network', project_get_network)
         self.stubs.Set(nova.db.api, 'instance_create', instance_create)
         self.stubs.Set(nova.rpc, 'cast', fake_method)
@@ -1685,6 +1686,8 @@ class TestServerInstanceCreation(test.TestCase):
         fakes.stub_out_auth(self.stubs)
         fakes.stub_out_key_pair_funcs(self.stubs)
         self.allow_admin = FLAGS.allow_admin_api
+        self.stubs.Set(nova.image, 'get_default_image_service',
+            lambda: nova.image.fake.FakeImageService())
 
     def tearDown(self):
         self.stubs.UnsetAll()
@@ -1714,7 +1717,6 @@ class TestServerInstanceCreation(test.TestCase):
             return stub_method
 
         compute_api = MockComputeAPI()
-        FLAGS.image_service = 'nova.image.fake.FakeImageService'
         self.stubs.Set(nova.compute, 'API', make_stub_method(compute_api))
         self.stubs.Set(nova.api.openstack.servers.Controller,
             '_get_kernel_ramdisk_from_image', make_stub_method((1, 1)))