from kamaki.clients import ClientError
from kamaki.clients.image import ImageClient
from kamaki.clients.pithos import PithosClient
-from progress.bar import Bar
-from image_creator.util import FatalError, output, success
+from image_creator.util import FatalError
CONTAINER = "images"
-def progress(message):
-
- MSG_LENGTH = 30
-
- def progress_gen(n):
- msg = "%s:" % message
-
- progressbar = Bar(msg.ljust(MSG_LENGTH))
- progressbar.max = n
- for _ in range(n):
- yield
- progressbar.next()
- output("\r%s...\033[K" % message, False)
- success("done")
- yield
- return progress_gen
-
-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, 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)
+ path = basename(file_obj.name) if remote_path is None else remote_path
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_cb = progress(hp) if hp is not None else None
- upload_cb = progress(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))
+ raise e
+
+ 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(path, file_obj, size, hash_cb,
+ upload_cb)
+
+ return "pithos://%s/%s/%s" % (self.account, self.container, path)
def register(self, name, location, metadata):
- 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))
+ """Register an image to ~okeanos"""
+
+ # Convert all metadata to strings
+ str_metadata = {}
+ for (key, value) in metadata.iteritems():
+ str_metadata[str(key)]=str(value)
+
+ params = {'is_public': 'true', 'disk_format': 'diskdump'}
+ self.image_client.register(name, location, params, str_metadata)
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :