From eda8a1aaa2cf7cc31c7fda4723849feee3bc6766 Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Thu, 9 Jun 2011 14:43:24 +0000
Subject: Fixing the tests

---
 nova/image/glance.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'nova/image')

diff --git a/nova/image/glance.py b/nova/image/glance.py
index b68415844..f82c0f4a3 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -60,14 +60,22 @@ class GlanceImageService(service.BaseImageService):
     SERVICE_IMAGE_ATTRS = service.BaseImageService.BASE_IMAGE_ATTRS +\
                           GLANCE_ONLY_ATTRS
 
-    @property
-    def client(self):
+    _client = None
+
+    def _get_client(self):
         # NOTE(sirp): we want to load balance each request across glance
         # servers. Since GlanceImageService is a long-lived object, `client`
         # is made to choose a new server each time via this property.
+        if self._client is not None:
+            return self._client
         glance_host, glance_port = pick_glance_api_server()
         return GlanceClient(glance_host, glance_port)
 
+    def _set_client(self, client):
+        self._client = client
+
+    client = property(_get_client, _set_client)
+
     def index(self, context, filters=None, marker=None, limit=None):
         """Calls out to Glance for a list of images available."""
         # NOTE(sirp): We need to use `get_images_detailed` and not
-- 
cgit