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)
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
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
# 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
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')