From 2e3b53c4bcd4926efe82d50fef5922548b88eff7 Mon Sep 17 00:00:00 2001
From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 25 Jun 2012 21:21:53 -0400
Subject: [PATCH] fix calls to glance

---
 sfa/openstack/image.py      | 2 +-
 sfa/openstack/nova_shell.py | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sfa/openstack/image.py b/sfa/openstack/image.py
index 2449e42d..4af0da43 100644
--- a/sfa/openstack/image.py
+++ b/sfa/openstack/image.py
@@ -50,7 +50,7 @@ class ImageManager:
     def get_available_disk_images(self):
         # get image records
         disk_images = []
-        for img in self.driver.shell.image_manager.detail():
+        for img in self.driver.shell.image_manager.get_images_detailed():
             image = Image(img)
             if image.container_format in ['ami', 'ovf']:
                 disk_images.append(image)
diff --git a/sfa/openstack/nova_shell.py b/sfa/openstack/nova_shell.py
index b9ae13c7..1d3c0e4c 100644
--- a/sfa/openstack/nova_shell.py
+++ b/sfa/openstack/nova_shell.py
@@ -1,8 +1,11 @@
 import sys
 import xmlrpclib
 import socket
+import gettext
 from urlparse import urlparse
 from sfa.util.sfalogging import logger
+from sfa.util.config import Config
+
 try:
     from nova import db
     from nova import flags
@@ -11,7 +14,7 @@ try:
     from nova.compute.manager import ComputeManager
     from nova.network.manager import NetworkManager
     from nova.scheduler.manager import SchedulerManager
-    from nova.image.glance import GlanceImageService
+    from sfa.openstack.client import GlanceClient
     has_nova = True
 except:
     has_nova = False
@@ -44,6 +47,8 @@ class NovaShell:
 
     # use the 'capability' auth mechanism for higher performance when the PLC db is local    
     def __init__ ( self, config ) :
+        if not config:
+            config = Config()
         self.auth_manager = None
         self.compute_manager = None
         self.network_manager = None
@@ -61,7 +66,7 @@ class NovaShell:
             self.network_manager = NetworkManager()
             self.scheduler_manager = SchedulerManager()
             self.db = InjectContext(db, context.get_admin_context())
-            self.image_manager = InjectContext(GlanceImageService(), context.get_admin_context())
+            self.image_manager = GlanceClient(config)
         else:
             logger.debug('nova access - REST')
             raise SfaNotImplemented('nova access - Rest')
-- 
2.45.2