from kamaki.clients.image import ImageClient
from kamaki.clients.pithos import PithosClient
-from image_creator.util import FatalError, progress
+from image_creator.util import FatalError
CONTAINER = "images"
-class Kamaki:
- def __init__(self, account, token):
+class Kamaki(object):
+ def __init__(self, account, token, output):
self.account = account
self.token = token
+ self.out = output
config = Config()
self.uploaded_object = None
- def upload(self, filename, size=None, remote_path=None):
-
+ def upload(self, file_obj, size=None, remote_path=None, hp=None, up=None):
+ """Upload a file to pithos"""
if remote_path is None:
remote_path = basename(filename)
- with open(filename) as f:
- try:
- self.pithos_client.create_container(self.container)
- except ClientError as e:
- if e.status != 202: # Ignore container already exists errors
- raise FatalError("Pithos client: %d %s" % \
- (e.status, e.message))
- try:
- hash_progress = progress("(1/2) Calculating block hashes:")
- upload_progress = progress("(2/2) Uploading missing blocks:")
- self.pithos_client.create_object(remote_path, f, size,
- hash_progress, upload_progress)
- self.uploaded_object = "pithos://%s/%s/%s" % \
- (self.account, self.container, remote_path)
- except ClientError as e:
+ try:
+ self.pithos_client.create_container(self.container)
+ except ClientError as e:
+ if e.status != 202: # Ignore container already exists errors
raise FatalError("Pithos client: %d %s" % \
- (e.status, e.message))
+ (e.status, e.message))
+ try:
+ hash_cb = self.out.progress_generator(hp) \
+ if hp is not None else None
+ upload_cb = self.out.progress_generator(up) \
+ if up is not None else None
+ self.pithos_client.create_object(remote_path, file_obj, size,
+ hash_cb, upload_cb)
+ return "pithos://%s/%s/%s" % \
+ (self.account, self.container, remote_path)
+ except ClientError as e:
+ raise FatalError("Pithos client: %d %s" % (e.status, e.message))
- def register(self, metadata):
- pass
+ def register(self, name, location, metadata):
+ """Register an image to ~okeanos"""
+ params = {'is_public': 'true', 'disk_format': 'diskdump'}
+ try:
+ self.image_client.register(name, location, params, metadata)
+ except ClientError as e:
+ raise FatalError("Image client: %d %s" % (e.status, e.message))
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :